diff --git a/applications/main/bad_kb/application.fam b/applications/main/bad_kb/application.fam
index 873767b66..0665c5661 100644
--- a/applications/main/bad_kb/application.fam
+++ b/applications/main/bad_kb/application.fam
@@ -7,5 +7,4 @@ App(
     icon="A_BadKb_14",
     order=70,
     fap_icon="icon.png",
-    fap_category="USB",
 )
diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam
index 6eef678cf..c87fb5dbd 100644
--- a/applications/main/gpio/application.fam
+++ b/applications/main/gpio/application.fam
@@ -7,5 +7,4 @@ App(
     icon="A_GPIO_14",
     order=50,
     fap_icon="icon.png",
-    fap_category="GPIO",
 )
diff --git a/applications/main/ibutton/application.fam b/applications/main/ibutton/application.fam
index 5df50fcf2..9ac40b46a 100644
--- a/applications/main/ibutton/application.fam
+++ b/applications/main/ibutton/application.fam
@@ -8,7 +8,6 @@ App(
     stack_size=2 * 1024,
     order=60,
     fap_icon="icon.png",
-    fap_category="iButton",
 )
 
 App(
diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam
index d669e4298..6c770f9e9 100644
--- a/applications/main/infrared/application.fam
+++ b/applications/main/infrared/application.fam
@@ -8,7 +8,6 @@ App(
     stack_size=3 * 1024,
     order=40,
     fap_icon="icon.png",
-    fap_category="Infrared",
 )
 
 App(
diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam
index 88af98631..285badba7 100644
--- a/applications/main/lfrfid/application.fam
+++ b/applications/main/lfrfid/application.fam
@@ -8,7 +8,6 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="icon.png",
-    fap_category="RFID",
 )
 
 App(
diff --git a/applications/main/nfc/application.fam b/applications/main/nfc/application.fam
index 0e7f74379..a22d64af5 100644
--- a/applications/main/nfc/application.fam
+++ b/applications/main/nfc/application.fam
@@ -8,7 +8,6 @@ App(
     stack_size=5 * 1024,
     order=30,
     fap_icon="icon.png",
-    fap_category="NFC",
 )
 
 App(
diff --git a/applications/main/subghz/application.fam b/applications/main/subghz/application.fam
index 6492690a3..7da1b9081 100644
--- a/applications/main/subghz/application.fam
+++ b/applications/main/subghz/application.fam
@@ -21,7 +21,6 @@ App(
     order=10,
     fap_libs=["hwdrivers"],
     fap_icon="icon.png",
-    fap_category="Sub-GHz",
 )
 
 App(
diff --git a/applications/main/u2f/application.fam b/applications/main/u2f/application.fam
index 042634c6a..3bab607cd 100644
--- a/applications/main/u2f/application.fam
+++ b/applications/main/u2f/application.fam
@@ -6,6 +6,5 @@ App(
     stack_size=2 * 1024,
     icon="A_U2F_14",
     order=80,
-    fap_category="USB",
     fap_icon="icon.png",
 )
diff --git a/applications/main/xtreme_app/application.fam b/applications/main/xtreme_app/application.fam
index bd2ec5149..0fd447773 100644
--- a/applications/main/xtreme_app/application.fam
+++ b/applications/main/xtreme_app/application.fam
@@ -6,6 +6,5 @@ App(
     stack_size=2 * 1024,
     icon="A_Xtreme_14",
     order=90,
-    # fap_icon="",
-    # fap_category="",
+    fap_icon="icon.png",
 )
diff --git a/applications/main/xtreme_app/icon.png b/applications/main/xtreme_app/icon.png
new file mode 100644
index 000000000..606a6d13c
Binary files /dev/null and b/applications/main/xtreme_app/icon.png differ
diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
index a0beb1402..65143af0b 100644
--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -179,7 +179,7 @@ class AppBuilder:
                         deployable = False
                 app_artifacts.dist_entries.append((deployable, fal_path))
         else:
-            fap_path = f"apps/{self.app.fap_category}/{app_artifacts.compact.name}"
+            fap_path = f"apps/{'assets' if self.app.apptype == FlipperAppType.MENUEXTERNAL else self.app.fap_category}/{app_artifacts.compact.name}"
             app_artifacts.dist_entries.append(
                 (self.app.is_default_deployable, fap_path)
             )