diff --git a/applications/services/bt/bt_cli.c b/applications/services/bt/bt_cli.c
index 288463efe..8f94e1963 100644
--- a/applications/services/bt/bt_cli.c
+++ b/applications/services/bt/bt_cli.c
@@ -4,8 +4,8 @@
 #include <lib/toolbox/args.h>
 
 #include <ble/ble.h>
-#include "bt_settings.h"
 #include "bt_service/bt.h"
+#include "bt_service/bt_settings_api_i.h"
 #include <profiles/serial_profile.h>
 
 static void bt_cli_command_hci_info(Cli* cli, FuriString* args, void* context) {
diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c
index 65b1eade0..3e4e9c97e 100644
--- a/applications/services/desktop/animations/animation_manager.c
+++ b/applications/services/desktop/animations/animation_manager.c
@@ -6,7 +6,6 @@
 #include <power/power_service/power.h>
 #include <storage/storage.h>
 #include <assets_icons.h>
-#include <assets_dolphin_internal.h>
 
 #include "views/bubble_animation_view.h"
 #include "views/one_shot_animation_view.h"
diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 7327ced14..4a331b512 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -235,8 +235,6 @@ static void desktop_apply_settings(Desktop* desktop) {
 
     desktop_clock_reconfigure(desktop);
 
-    view_port_enabled_set(desktop->dummy_mode_icon_viewport, desktop->settings.dummy_mode);
-
     if(!desktop->app_running && !desktop->locked) {
         desktop_auto_lock_arm(desktop);
     }
diff --git a/applications/services/desktop/desktop_keybinds.c b/applications/services/desktop/desktop_keybinds.c
index 903944f7e..c7416523d 100644
--- a/applications/services/desktop/desktop_keybinds.c
+++ b/applications/services/desktop/desktop_keybinds.c
@@ -107,7 +107,7 @@ static FuriString*
 void desktop_keybinds_load(Desktop* desktop, DesktopKeybinds* keybinds) {
     for(DesktopKeybindType type = 0; type < DesktopKeybindTypeMAX; type++) {
         for(DesktopKeybindKey key = 0; key < DesktopKeybindKeyMAX; key++) {
-            keybinds[type][key] = furi_string_alloc_set(desktop_keybinds_defaults[type][key]);
+            *keybinds[type][key] = furi_string_alloc_set(desktop_keybinds_defaults[type][key]);
         }
     }
 
@@ -120,8 +120,8 @@ void desktop_keybinds_load(Desktop* desktop, DesktopKeybinds* keybinds) {
                 furi_string_printf(
                     keybind_name, "%s%s", desktop_keybind_types[type], desktop_keybind_keys[type]);
                 if(!flipper_format_read_string(
-                       file, furi_string_get_cstr(keybind_name), keybinds[type][key])) {
-                    furi_string_set(keybinds[type][key], desktop_keybinds_defaults[type][key]);
+                       file, furi_string_get_cstr(keybind_name), *keybinds[type][key])) {
+                    furi_string_set(*keybinds[type][key], desktop_keybinds_defaults[type][key]);
                     goto fail;
                 }
             }
@@ -147,7 +147,7 @@ void desktop_keybinds_save(Desktop* desktop, const DesktopKeybinds* keybinds) {
                 if(!flipper_format_write_string_cstr(
                        file,
                        furi_string_get_cstr(keybind_name),
-                       furi_string_get_cstr(keybinds[type][key]))) {
+                       furi_string_get_cstr(*keybinds[type][key]))) {
                     goto fail;
                 }
             }
@@ -164,7 +164,7 @@ void desktop_keybinds_save(Desktop* desktop, const DesktopKeybinds* keybinds) {
 void desktop_keybinds_free(DesktopKeybinds* keybinds) {
     for(DesktopKeybindType type = 0; type < DesktopKeybindTypeMAX; type++) {
         for(DesktopKeybindKey key = 0; key < DesktopKeybindKeyMAX; key++) {
-            furi_string_free(keybinds[type][key]);
+            furi_string_free(*keybinds[type][key]);
         }
     }
 }
diff --git a/applications/services/desktop/desktop_settings.h b/applications/services/desktop/desktop_settings.h
index 4ca923bee..9ef6ede28 100644
--- a/applications/services/desktop/desktop_settings.h
+++ b/applications/services/desktop/desktop_settings.h
@@ -4,7 +4,7 @@
 
 typedef struct {
     uint32_t auto_lock_delay_ms;
-    bool auto_lock_with_pin;
+    uint8_t auto_lock_with_pin;
     uint8_t display_clock;
 } DesktopSettings;
 
diff --git a/applications/services/desktop/scenes/desktop_scene_locked.c b/applications/services/desktop/scenes/desktop_scene_locked.c
index 2e21ba3e0..eb20eebe1 100644
--- a/applications/services/desktop/scenes/desktop_scene_locked.c
+++ b/applications/services/desktop/scenes/desktop_scene_locked.c
@@ -13,6 +13,8 @@
 #include "desktop_scene.h"
 #include "desktop_scene_locked.h"
 
+#include <momentum/settings.h>
+
 #define WRONG_PIN_HEADER_TIMEOUT 3000
 #define INPUT_PIN_VIEW_TIMEOUT   15000
 
diff --git a/applications/services/dolphin/dolphin.c b/applications/services/dolphin/dolphin.c
index 47b878180..4057c5323 100644
--- a/applications/services/dolphin/dolphin.c
+++ b/applications/services/dolphin/dolphin.c
@@ -207,7 +207,7 @@ static void dolphin_reset_butthurt_timer(Dolphin* dolphin) {
     if(period_ticks > 0) {
         furi_event_loop_timer_start(dolphin->butthurt_timer, period_ticks);
     } else {
-        furi_eventloop_timer_stop(dolphin->butthurt_timer);
+        furi_event_loop_timer_stop(dolphin->butthurt_timer);
     }
 }
 
diff --git a/applications/services/dolphin/helpers/dolphin_state.h b/applications/services/dolphin/helpers/dolphin_state.h
index 9eeef7fb0..ab27ab082 100644
--- a/applications/services/dolphin/helpers/dolphin_state.h
+++ b/applications/services/dolphin/helpers/dolphin_state.h
@@ -2,6 +2,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <stddef.h>
 
 #include "dolphin_deed.h"
 
diff --git a/applications/services/power/power_settings.h b/applications/services/power/power_settings.h
index df16f72af..e797a5b44 100644
--- a/applications/services/power/power_settings.h
+++ b/applications/services/power/power_settings.h
@@ -3,7 +3,7 @@
 
 #define POWER_SETTINGS_VER (1)
 
-#define POWER_SETTINGS_PATH  CFG_PATH("power.settings")
+#define POWER_SETTINGS_PATH  INT_PATH(".power.settings")
 #define POWER_SETTINGS_MAGIC (0x21)
 
 #ifdef __cplusplus