diff --git a/applications/main/application.fam b/applications/main/application.fam
index e7f9b6845..46de8f65d 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -3,9 +3,9 @@ App(
     name="Basic applications for main menu",
     apptype=FlipperAppType.METAPACKAGE,
     provides=[
-        # "gpio",
+        "gpio",
         # "ibutton",
-        "infrared",
+        # "infrared",
         "lfrfid",
         "nfc",
         "subghz",
diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam
index fe18bd338..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",
     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 6f76ed429..9335e4c3b 100644
--- a/applications/main/infrared/application.fam
+++ b/applications/main/infrared/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="infrared",
     name="Infrared",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="infrared_app",
     cdefines=["APP_INFRARED"],
     requires=[
@@ -9,9 +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",
 )
 
 App(
diff --git a/applications/main/infrared/irIcon.png b/applications/main/infrared/irIcon.png
new file mode 100644
index 000000000..ccfcee9c8
Binary files /dev/null and b/applications/main/infrared/irIcon.png differ