diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fd8ece62a6..50a8ad0d9b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -418,6 +418,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingChimes.cpp
         displayapp/screens/settings/SettingShakeThreshold.cpp
         displayapp/screens/settings/SettingBluetooth.cpp
+        displayapp/screens/settings/SettingOTA.cpp
 
         ## Watch faces
         displayapp/screens/WatchFaceAnalog.cpp
diff --git a/src/components/ble/DfuService.cpp b/src/components/ble/DfuService.cpp
index b3f2ff105d..3a851c0903 100644
--- a/src/components/ble/DfuService.cpp
+++ b/src/components/ble/DfuService.cpp
@@ -1,6 +1,8 @@
 #include "components/ble/DfuService.h"
 #include <cstring>
 #include "components/ble/BleController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/settings/Settings.h"
 #include "drivers/SpiNorFlash.h"
 #include "systemtask/SystemTask.h"
 #include <nrf_log.h>
@@ -78,6 +80,18 @@ void DfuService::Init() {
 }
 
 int DfuService::OnServiceData(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt* context) {
+#ifndef PINETIME_IS_RECOVERY
+  if (systemTask.GetSettings().GetDfuAndFsMode() == Pinetime::Controllers::Settings::DfuAndFsMode::Disabled) {
+    Pinetime::Controllers::NotificationManager::Notification notif;
+    memcpy(notif.message.data(), denyAlert, denyAlertLength);
+    notif.size = denyAlertLength;
+    notif.category = Pinetime::Controllers::NotificationManager::Categories::SimpleAlert;
+    systemTask.GetNotificationManager().Push(std::move(notif));
+    systemTask.PushMessage(Pinetime::System::Messages::OnNewNotification);
+    return BLE_ATT_ERR_INSUFFICIENT_AUTHOR;
+  }
+#endif
+
   if (bleController.IsFirmwareUpdating()) {
     xTimerStart(timeoutTimer, 0);
   }
diff --git a/src/components/ble/DfuService.h b/src/components/ble/DfuService.h
index b56911b905..5dcca4e952 100644
--- a/src/components/ble/DfuService.h
+++ b/src/components/ble/DfuService.h
@@ -20,6 +20,8 @@ namespace Pinetime {
 
   namespace Controllers {
     class Ble;
+    class Settings;
+    class NotificationManager;
 
     class DfuService {
     public:
@@ -83,6 +85,9 @@ namespace Pinetime {
       DfuImage dfuImage;
       NotificationManager notificationManager;
 
+      static constexpr const char denyAlert[] = "InfiniTime\0Firmware update attempted, but disabled in settings.";
+      static constexpr const uint8_t denyAlertLength = sizeof(denyAlert); // for this to work denyAlert MUST be array
+
       static constexpr uint16_t dfuServiceId {0x1530};
       static constexpr uint16_t packetCharacteristicId {0x1532};
       static constexpr uint16_t controlPointCharacteristicId {0x1531};
diff --git a/src/components/ble/FSService.cpp b/src/components/ble/FSService.cpp
index fda6b392c0..721ed297c5 100644
--- a/src/components/ble/FSService.cpp
+++ b/src/components/ble/FSService.cpp
@@ -1,6 +1,8 @@
 #include <nrf_log.h>
 #include "FSService.h"
 #include "components/ble/BleController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/settings/Settings.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;
@@ -49,6 +51,18 @@ void FSService::Init() {
 }
 
 int FSService::OnFSServiceRequested(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt* context) {
+#ifndef PINETIME_IS_RECOVERY
+  if (systemTask.GetSettings().GetDfuAndFsMode() == Pinetime::Controllers::Settings::DfuAndFsMode::Disabled) {
+    Pinetime::Controllers::NotificationManager::Notification notif;
+    memcpy(notif.message.data(), denyAlert, denyAlertLength);
+    notif.size = denyAlertLength;
+    notif.category = Pinetime::Controllers::NotificationManager::Categories::SimpleAlert;
+    systemTask.GetNotificationManager().Push(std::move(notif));
+    systemTask.PushMessage(Pinetime::System::Messages::OnNewNotification);
+    return BLE_ATT_ERR_INSUFFICIENT_AUTHOR;
+  }
+#endif
+
   if (attributeHandle == versionCharacteristicHandle) {
     NRF_LOG_INFO("FS_S : handle = %d", versionCharacteristicHandle);
     int res = os_mbuf_append(context->om, &fsVersion, sizeof(fsVersion));
diff --git a/src/components/ble/FSService.h b/src/components/ble/FSService.h
index b2299623a7..b43bc9e479 100644
--- a/src/components/ble/FSService.h
+++ b/src/components/ble/FSService.h
@@ -14,6 +14,8 @@ namespace Pinetime {
 
   namespace Controllers {
     class Ble;
+    class Settings;
+    class NotificationManager;
 
     class FSService {
     public:
@@ -26,6 +28,10 @@ namespace Pinetime {
     private:
       Pinetime::System::SystemTask& systemTask;
       Pinetime::Controllers::FS& fs;
+
+      static constexpr const char denyAlert[] = "InfiniTime\0File access attempted, but disabled in settings.";
+      static constexpr const uint8_t denyAlertLength = sizeof(denyAlert); // for this to work denyAlert MUST be array
+
       static constexpr uint16_t FSServiceId {0xFEBB};
       static constexpr uint16_t fsVersionId {0x0100};
       static constexpr uint16_t fsTransferId {0x0200};
diff --git a/src/components/ble/ImmediateAlertService.cpp b/src/components/ble/ImmediateAlertService.cpp
index b9de615aa0..e25e018f92 100644
--- a/src/components/ble/ImmediateAlertService.cpp
+++ b/src/components/ble/ImmediateAlertService.cpp
@@ -63,7 +63,8 @@ int ImmediateAlertService::OnAlertLevelChanged(uint16_t attributeHandle, ble_gat
       auto* alertString = ToString(alertLevel);
 
       NotificationManager::Notification notif;
-      std::memcpy(notif.message.data(), alertString, strlen(alertString));
+      std::memcpy(notif.message.data(), alertString, strlen(alertString) + 1);
+      notif.size = strlen(alertString) + 1;
       notif.category = Pinetime::Controllers::NotificationManager::Categories::SimpleAlert;
       notificationManager.Push(std::move(notif));
 
diff --git a/src/components/settings/Settings.cpp b/src/components/settings/Settings.cpp
index 1ae00a2dbc..bf12da6db2 100644
--- a/src/components/settings/Settings.cpp
+++ b/src/components/settings/Settings.cpp
@@ -34,6 +34,9 @@ void Settings::LoadSettingsFromFile() {
   if (bufferSettings.version == settingsVersion) {
     settings = bufferSettings;
   }
+  if (settings.dfuAndFsMode == DfuAndFsMode::EnabledTillReboot) {
+    settings.dfuAndFsMode = DfuAndFsMode::Disabled;
+  }
 }
 
 void Settings::SaveSettingsToFile() {
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 063120774a..b83c73b568 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -36,6 +36,7 @@ namespace Pinetime {
       };
       enum class PTSGaugeStyle : uint8_t { Full, Half, Numeric };
       enum class PTSWeather : uint8_t { On, Off };
+      enum class DfuAndFsMode : uint8_t { Disabled, Enabled, EnabledTillReboot };
 
       struct PineTimeStyle {
         Colors ColorTime = Colors::Teal;
@@ -283,10 +284,21 @@ namespace Pinetime {
         return bleRadioEnabled;
       };
 
+      void SetDfuAndFsMode(DfuAndFsMode mode) {
+        if (mode != settings.dfuAndFsMode) {
+          settingsChanged = true;
+        }
+        settings.dfuAndFsMode = mode;
+      };
+
+      DfuAndFsMode GetDfuAndFsMode() const {
+        return settings.dfuAndFsMode;
+      };
+
     private:
       Pinetime::Controllers::FS& fs;
 
-      static constexpr uint32_t settingsVersion = 0x0007;
+      static constexpr uint32_t settingsVersion = 0x0008;
 
       struct SettingsData {
         uint32_t version = settingsVersion;
@@ -308,6 +320,8 @@ namespace Pinetime {
         uint16_t shakeWakeThreshold = 150;
 
         Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
+
+        DfuAndFsMode dfuAndFsMode = DfuAndFsMode::Disabled;
       };
 
       SettingsData settings;
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 3fd34b3a8c..a1bd3bf5e9 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -49,6 +49,7 @@
 #include "displayapp/screens/settings/SettingChimes.h"
 #include "displayapp/screens/settings/SettingShakeThreshold.h"
 #include "displayapp/screens/settings/SettingBluetooth.h"
+#include "displayapp/screens/settings/SettingOTA.h"
 
 #include "libs/lv_conf.h"
 #include "UserApps.h"
@@ -524,6 +525,9 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
     case Apps::SettingBluetooth:
       currentScreen = std::make_unique<Screens::SettingBluetooth>(this, settingsController);
       break;
+    case Apps::SettingOTA:
+      currentScreen = std::make_unique<Screens::SettingOTA>(this, settingsController);
+      break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(batteryController);
       break;
diff --git a/src/displayapp/apps/Apps.h.in b/src/displayapp/apps/Apps.h.in
index 2104a267c0..045249f471 100644
--- a/src/displayapp/apps/Apps.h.in
+++ b/src/displayapp/apps/Apps.h.in
@@ -42,6 +42,7 @@ namespace Pinetime {
       SettingChimes,
       SettingShakeThreshold,
       SettingBluetooth,
+      SettingOTA,
       Error
     };
 
diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json
index 41c383c0d4..f597e15510 100644
--- a/src/displayapp/fonts/fonts.json
+++ b/src/displayapp/fonts/fonts.json
@@ -7,7 +7,7 @@
          },
          {
             "file": "FontAwesome5-Solid+Brands+Regular.woff",
-            "range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743"
+            "range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743, 0xf3ed"
          }
       ],
       "bpp": 1,
diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h
index bd958b285f..3c95bcc4ca 100644
--- a/src/displayapp/screens/Symbols.h
+++ b/src/displayapp/screens/Symbols.h
@@ -8,6 +8,7 @@ namespace Pinetime {
         static constexpr const char* batteryHalf = "\xEF\x89\x82";
         static constexpr const char* heartBeat = "\xEF\x88\x9E";
         static constexpr const char* bluetooth = "\xEF\x8A\x94";
+        static constexpr const char* shieldAlt = "\xEF\x8F\xAD";
         static constexpr const char* plug = "\xEF\x87\xA6";
         static constexpr const char* shoe = "\xEF\x95\x8B";
         static constexpr const char* clock = "\xEF\x80\x97";
diff --git a/src/displayapp/screens/settings/SettingOTA.cpp b/src/displayapp/screens/settings/SettingOTA.cpp
new file mode 100644
index 0000000000..ad123dec51
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingOTA.cpp
@@ -0,0 +1,58 @@
+#include "displayapp/screens/settings/SettingOTA.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/Messages.h"
+#include "displayapp/screens/Styles.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  struct Option {
+    const char* name;
+    Pinetime::Controllers::Settings::DfuAndFsMode mode;
+  };
+
+  constexpr std::array<Option, 3> options = {{
+    {"Enabled", Pinetime::Controllers::Settings::DfuAndFsMode::Enabled},
+    {"Disabled", Pinetime::Controllers::Settings::DfuAndFsMode::Disabled},
+    {"Till reboot", Pinetime::Controllers::Settings::DfuAndFsMode::EnabledTillReboot},
+  }};
+
+  std::array<CheckboxList::Item, CheckboxList::MaxItems> CreateOptionArray() {
+    std::array<Pinetime::Applications::Screens::CheckboxList::Item, CheckboxList::MaxItems> optionArray;
+    for (size_t i = 0; i < CheckboxList::MaxItems; i++) {
+      if (i >= options.size()) {
+        optionArray[i].name = "";
+        optionArray[i].enabled = false;
+      } else {
+        optionArray[i].name = options[i].name;
+        optionArray[i].enabled = true;
+      }
+    }
+    return optionArray;
+  };
+}
+
+SettingOTA::SettingOTA(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+  : app {app},
+    settingsController {settingsController},
+    checkboxList(
+      0,
+      1,
+      "Firmware & files",
+      Symbols::shieldAlt,
+      settingsController.GetDfuAndFsMode() == Pinetime::Controllers::Settings::DfuAndFsMode::Enabled             ? 0
+      : settingsController.GetDfuAndFsMode() == Pinetime::Controllers::Settings::DfuAndFsMode::EnabledTillReboot ? 2
+                                                                                                                 : 1,
+      [&settings = settingsController](uint32_t index) {
+        settings.SetDfuAndFsMode(options[index].mode);
+      },
+      CreateOptionArray()) {
+}
+
+SettingOTA::~SettingOTA() {
+  lv_obj_clean(lv_scr_act());
+  settingsController.SaveSettings();
+}
diff --git a/src/displayapp/screens/settings/SettingOTA.h b/src/displayapp/screens/settings/SettingOTA.h
new file mode 100644
index 0000000000..13c9a33dd1
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingOTA.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <array>
+#include <cstdint>
+#include <lvgl/lvgl.h>
+
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/CheckboxList.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingOTA : public Screen {
+      public:
+        SettingOTA(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+        ~SettingOTA() override;
+
+      private:
+        DisplayApp* app;
+        Pinetime::Controllers::Settings& settingsController;
+        CheckboxList checkboxList;
+      };
+    }
+  }
+}
diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h
index a21b4ccd85..1f356f23f5 100644
--- a/src/displayapp/screens/settings/Settings.h
+++ b/src/displayapp/screens/settings/Settings.h
@@ -45,8 +45,9 @@ namespace Pinetime {
           {Symbols::clock, "Chimes", Apps::SettingChimes},
           {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
           {Symbols::check, "Firmware", Apps::FirmwareValidation},
-          {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth},
+          {Symbols::shieldAlt, "Over-the-air", Apps::SettingOTA},
 
+          {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth},
           {Symbols::list, "About", Apps::SysInfo},
 
           // {Symbols::none, "None", Apps::None},
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index 79f1cf444f..8714ed7800 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -90,6 +90,14 @@ namespace Pinetime {
         return nimbleController;
       };
 
+      Pinetime::Controllers::NotificationManager& GetNotificationManager() {
+        return notificationManager;
+      };
+
+      Pinetime::Controllers::Settings& GetSettings() {
+        return settingsController;
+      };
+
       bool IsSleeping() const {
         return state == SystemTaskState::Sleeping || state == SystemTaskState::WakingUp;
       }