diff --git a/applications/main/application.fam b/applications/main/application.fam
index 8c290037b..e47c0f2a1 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -14,6 +14,7 @@ App(
         "ibutton",
         "bad_kb",
         "u2f",
+        "xtreme_app",
         "archive",
     ],
 )
diff --git a/applications/settings/xtreme_app/application.fam b/applications/main/xtreme_app/application.fam
similarity index 75%
rename from applications/settings/xtreme_app/application.fam
rename to applications/main/xtreme_app/application.fam
index e1b7fc964..10ec953c9 100644
--- a/applications/settings/xtreme_app/application.fam
+++ b/applications/main/xtreme_app/application.fam
@@ -1,12 +1,13 @@
 App(
     appid="xtreme_app",
     name="Xtreme FW",
-    apptype=FlipperAppType.SETTINGS,
+    apptype=FlipperAppType.APP,
     entry_point="xtreme_app",
-    stack_size=2 * 1024,
     requires=[
         "gui",
         "xtreme",
     ],
+    stack_size=2 * 1024,
+    icon="A_Plugins_14",
     order=90,
 )
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene.c b/applications/main/xtreme_app/scenes/xtreme_app_scene.c
similarity index 100%
rename from applications/settings/xtreme_app/scenes/xtreme_app_scene.c
rename to applications/main/xtreme_app/scenes/xtreme_app_scene.c
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene.h b/applications/main/xtreme_app/scenes/xtreme_app_scene.h
similarity index 100%
rename from applications/settings/xtreme_app/scenes/xtreme_app_scene.h
rename to applications/main/xtreme_app/scenes/xtreme_app_scene.h
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_config.h b/applications/main/xtreme_app/scenes/xtreme_app_scene_config.h
similarity index 100%
rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_config.h
rename to applications/main/xtreme_app/scenes/xtreme_app_scene_config.h
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_dolphin.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_dolphin.c
similarity index 100%
rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_dolphin.c
rename to applications/main/xtreme_app/scenes/xtreme_app_scene_dolphin.c
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_graphics.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_graphics.c
similarity index 100%
rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_graphics.c
rename to applications/main/xtreme_app/scenes/xtreme_app_scene_graphics.c
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_misc.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c
similarity index 100%
rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_misc.c
rename to applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_misc_rename.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_rename.c
similarity index 100%
rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_misc_rename.c
rename to applications/main/xtreme_app/scenes/xtreme_app_scene_misc_rename.c
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_protocols.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c
similarity index 100%
rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_protocols.c
rename to applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_start.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_start.c
similarity index 100%
rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_start.c
rename to applications/main/xtreme_app/scenes/xtreme_app_scene_start.c
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_statusbar.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_statusbar.c
similarity index 100%
rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_statusbar.c
rename to applications/main/xtreme_app/scenes/xtreme_app_scene_statusbar.c
diff --git a/applications/settings/xtreme_app/xtreme_app.c b/applications/main/xtreme_app/xtreme_app.c
similarity index 100%
rename from applications/settings/xtreme_app/xtreme_app.c
rename to applications/main/xtreme_app/xtreme_app.c
diff --git a/applications/settings/xtreme_app/xtreme_app.h b/applications/main/xtreme_app/xtreme_app.h
similarity index 100%
rename from applications/settings/xtreme_app/xtreme_app.h
rename to applications/main/xtreme_app/xtreme_app.h
diff --git a/applications/settings/application.fam b/applications/settings/application.fam
index 49695b4b3..cc4b9703d 100644
--- a/applications/settings/application.fam
+++ b/applications/settings/application.fam
@@ -5,7 +5,6 @@ App(
     provides=[
         "passport",
         "system_settings",
-        "xtreme_app",
         "about",
     ],
 )