diff --git a/apps/settings/main_controller_prompt_beta.cpp b/apps/settings/main_controller_prompt_beta.cpp
index 0f48e7940..6b1825ddd 100644
--- a/apps/settings/main_controller_prompt_beta.cpp
+++ b/apps/settings/main_controller_prompt_beta.cpp
@@ -1,7 +1,8 @@
-#include "main_controller.h"
-#include "../exam_mode_configuration.h"
 #include <apps/i18n.h>
 
+#include "../exam_mode_configuration.h"
+#include "main_controller.h"
+
 using namespace Shared;
 
 namespace Settings {
diff --git a/apps/settings/main_controller_prompt_none.cpp b/apps/settings/main_controller_prompt_none.cpp
index 46511e360..1911c2af4 100644
--- a/apps/settings/main_controller_prompt_none.cpp
+++ b/apps/settings/main_controller_prompt_none.cpp
@@ -17,7 +17,6 @@ constexpr SettingsMessageTree s_modelMenu[] =
 #ifdef HAS_CODE
      SettingsMessageTree(I18n::Message::CodeApp, s_codeChildren),
 #endif
-     //SettingsMessageTree(I18n::Message::UsbSetting, s_usbProtectionChildren),
      SettingsMessageTree(I18n::Message::ExternalApps, s_externalChildren),
      SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren),
      SettingsMessageTree(I18n::Message::About, s_modelAboutChildren)};
diff --git a/apps/settings/main_controller_prompt_update.cpp b/apps/settings/main_controller_prompt_update.cpp
index 2deed3c3e..c5104c8d4 100644
--- a/apps/settings/main_controller_prompt_update.cpp
+++ b/apps/settings/main_controller_prompt_update.cpp
@@ -1,11 +1,12 @@
-#include "main_controller.h"
-#include "../exam_mode_configuration.h"
 #include <apps/i18n.h>
 
-namespace Settings {
+#include "../exam_mode_configuration.h"
+#include "main_controller.h"
 
 using namespace Shared;
 
+namespace Settings {
+
 constexpr SettingsMessageTree s_modelMenu[] =
   {SettingsMessageTree(I18n::Message::MathOptions, s_modelMathOptionsChildren),
     SettingsMessageTree(I18n::Message::BrightnessSettings, s_brightnessChildren),
@@ -17,8 +18,8 @@ constexpr SettingsMessageTree s_modelMenu[] =
     SettingsMessageTree(I18n::Message::CodeApp, s_codeChildren),
 #endif
     SettingsMessageTree(I18n::Message::UpdatePopUp),
-    SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren),
     SettingsMessageTree(I18n::Message::ExternalApps, s_externalChildren),
+    SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren),
     SettingsMessageTree(I18n::Message::About, s_modelAboutChildren)};
 
 constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu);