diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam
index 17a2e98c9..1d7deb6f1 100644
--- a/applications/main/gpio/application.fam
+++ b/applications/main/gpio/application.fam
@@ -1,13 +1,13 @@
 App(
     appid="gpio",
     name="GPIO",
-    apptype=FlipperAppType.EXTERNAL,
+    apptype=FlipperAppType.APP,
     entry_point="gpio_app",
     cdefines=["APP_GPIO"],
     requires=["gui"],
     stack_size=1 * 1024,
-    # icon="A_GPIO_14",
+    icon="A_GPIO_14",
     order=50,
-    fap_icon="gpioIcon.png",
-    fap_category="Main",
+    # fap_icon="gpioIcon.png",
+    # fap_category="Main",
 )
diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam
index 9335e4c3b..897afdeb8 100644
--- a/applications/main/infrared/application.fam
+++ b/applications/main/infrared/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="infrared",
     name="Infrared",
-    apptype=FlipperAppType.EXTERNAL,
+    apptype=FlipperAppType.APP,
     entry_point="infrared_app",
     cdefines=["APP_INFRARED"],
     requires=[
@@ -9,11 +9,11 @@ App(
         "dialogs",
     ],
     provides=["infrared_start"],
-    # icon="A_Infrared_14",
+    icon="A_Infrared_14",
     stack_size=3 * 1024,
     order=40,
-    fap_icon="irIcon.png",
-    fap_category="Main",
+    # fap_icon="irIcon.png",
+    # fap_category="Main",
 )
 
 App(
diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam
index 0a7cfb73c..4a1498181 100644
--- a/applications/main/lfrfid/application.fam
+++ b/applications/main/lfrfid/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="lfrfid",
     name="125 kHz RFID",
-    apptype=FlipperAppType.EXTERNAL,
+    apptype=FlipperAppType.APP,
     entry_point="lfrfid_app",
     cdefines=["APP_LF_RFID"],
     requires=[
@@ -11,12 +11,9 @@ App(
     provides=[
         "lfrfid_start",
     ],
-    # icon="A_125khz_14",
+    icon="A_125khz_14",
     stack_size=2 * 1024,
     order=20,
-    fap_category="Main",
-    fap_icon="gpioIcon.png",
-
 )
 
 App(
diff --git a/applications/main/lfrfid/gpioIcon.png b/applications/main/lfrfid/gpioIcon.png
deleted file mode 100644
index 5b2f4293c..000000000
Binary files a/applications/main/lfrfid/gpioIcon.png and /dev/null differ
diff --git a/applications/main/subghz/application.fam b/applications/main/subghz/application.fam
index 3c6e7951e..7d31ecae5 100644
--- a/applications/main/subghz/application.fam
+++ b/applications/main/subghz/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="subghz",
     name="Sub-GHz",
-    apptype=FlipperAppType.EXTERNAL,
+    apptype=FlipperAppType.APP,
     entry_point="subghz_app",
     cdefines=["APP_SUBGHZ"],
     requires=[
@@ -10,12 +10,9 @@ App(
         "dialogs",
     ],
     provides=["subghz_start"],
-    # icon="A_Sub1ghz_14",
+    icon="A_Sub1ghz_14",
     stack_size=2 * 1024,
     order=10,
-    fap_category="Main",
-    fap_icon="gpioIcon.png",
-
 )
 
 App(
diff --git a/applications/main/subghz/gpioIcon.png b/applications/main/subghz/gpioIcon.png
deleted file mode 100644
index 5b2f4293c..000000000
Binary files a/applications/main/subghz/gpioIcon.png and /dev/null differ