diff --git a/applications/main/application.fam b/applications/main/application.fam
index e6fca441b..e03f70953 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -15,6 +15,23 @@ App(
         "archive",
         "clock",
         "unirfremix",
-        "spectrum_analyzer",
+    ],
+)
+
+App(
+    appid="main_apps_default",
+    name="Basic applications for main menu",
+    apptype=FlipperAppType.METAPACKAGE,
+    provides=[
+        "gpio",
+        "ibutton",
+        "infrared",
+        "lfrfid",
+        "nfc",
+        "subghz",
+        "bad_usb",
+        "u2f",
+        "fap_loader",
+        "archive",
     ],
 )
diff --git a/applications/main/spectrum_analyzer/application.fam b/applications/plugins/spectrum_analyzer/application.fam
similarity index 68%
rename from applications/main/spectrum_analyzer/application.fam
rename to applications/plugins/spectrum_analyzer/application.fam
index 563e3d614..5028c999b 100644
--- a/applications/main/spectrum_analyzer/application.fam
+++ b/applications/plugins/spectrum_analyzer/application.fam
@@ -1,11 +1,12 @@
 App(
     appid="spectrum_analyzer",
     name="Spectrum Analyzer",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="spectrum_analyzer_app",
     cdefines=["APP_SPECTRUM_ANALYZER"],
     requires=["gui"],
-    icon="A_SpectrumAnalyzer_14",
     stack_size=2 * 1024,
     order=12,
+    fap_icon="spectrum_10px.png",
+    fap_category="Tools",
 )
diff --git a/applications/plugins/spectrum_analyzer/spectrum_10px.png b/applications/plugins/spectrum_analyzer/spectrum_10px.png
new file mode 100644
index 000000000..743c2460b
Binary files /dev/null and b/applications/plugins/spectrum_analyzer/spectrum_10px.png differ
diff --git a/applications/main/spectrum_analyzer/spectrum_analyzer.c b/applications/plugins/spectrum_analyzer/spectrum_analyzer.c
similarity index 100%
rename from applications/main/spectrum_analyzer/spectrum_analyzer.c
rename to applications/plugins/spectrum_analyzer/spectrum_analyzer.c
diff --git a/applications/main/spectrum_analyzer/spectrum_analyzer.h b/applications/plugins/spectrum_analyzer/spectrum_analyzer.h
similarity index 100%
rename from applications/main/spectrum_analyzer/spectrum_analyzer.h
rename to applications/plugins/spectrum_analyzer/spectrum_analyzer.h
diff --git a/applications/main/spectrum_analyzer/spectrum_analyzer_worker.c b/applications/plugins/spectrum_analyzer/spectrum_analyzer_worker.c
similarity index 100%
rename from applications/main/spectrum_analyzer/spectrum_analyzer_worker.c
rename to applications/plugins/spectrum_analyzer/spectrum_analyzer_worker.c
diff --git a/applications/main/spectrum_analyzer/spectrum_analyzer_worker.h b/applications/plugins/spectrum_analyzer/spectrum_analyzer_worker.h
similarity index 100%
rename from applications/main/spectrum_analyzer/spectrum_analyzer_worker.h
rename to applications/plugins/spectrum_analyzer/spectrum_analyzer_worker.h
diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_0.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_0.png
deleted file mode 100644
index f2fc132ed..000000000
Binary files a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_0.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_1.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_1.png
deleted file mode 100644
index 7bb4f3895..000000000
Binary files a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_1.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_2.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_2.png
deleted file mode 100644
index 3a27b10b2..000000000
Binary files a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_2.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_3.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_3.png
deleted file mode 100644
index 72e9b7f83..000000000
Binary files a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_3.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_4.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_4.png
deleted file mode 100644
index 3a27b10b2..000000000
Binary files a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_4.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_5.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_5.png
deleted file mode 100644
index 7bb4f3895..000000000
Binary files a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_5.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_rate b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_rate
deleted file mode 100644
index bf0d87ab1..000000000
--- a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_rate
+++ /dev/null
@@ -1 +0,0 @@
-4
\ No newline at end of file
diff --git a/fbt_options.py b/fbt_options.py
index b0d0ebea5..f7a2cc3b1 100644
--- a/fbt_options.py
+++ b/fbt_options.py
@@ -82,7 +82,7 @@ FIRMWARE_APPS = {
         # Svc
         "basic_services",
         # Apps
-        "main_apps",
+        "main_apps_default",
         "system_apps",
         # Settings
         "settings_apps",