diff --git a/applications/main/application.fam b/applications/main/application.fam
index 83b1f62e8..e7f9b6845 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -3,7 +3,7 @@ App(
     name="Basic applications for main menu",
     apptype=FlipperAppType.METAPACKAGE,
     provides=[
-        "gpio",
+        # "gpio",
         # "ibutton",
         "infrared",
         "lfrfid",
@@ -14,7 +14,7 @@ App(
         "fap_loader",
         "archive",
         # "Clock",
-        # "SubGHz_Remote",
+        "SubGHz_Remote",
         # "Spectrum_Analyzer",
     ],
 )
diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam
index 64f8db5b0..fe18bd338 100644
--- a/applications/main/gpio/application.fam
+++ b/applications/main/gpio/application.fam
@@ -1,11 +1,13 @@
 App(
     appid="gpio",
     name="GPIO",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     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",
 )
diff --git a/applications/main/gpio/gpioIcon.png b/applications/main/gpio/gpioIcon.png
new file mode 100644
index 000000000..5b2f4293c
Binary files /dev/null and b/applications/main/gpio/gpioIcon.png differ
diff --git a/applications/main/unirfremix/application.fam b/applications/main/unirfremix/application.fam
index acd4658ff..b7b1e59e5 100644
--- a/applications/main/unirfremix/application.fam
+++ b/applications/main/unirfremix/application.fam
@@ -1,13 +1,13 @@
 App(
     appid="SubGHz_Remote",
     name="Sub-GHz Remote",
-    apptype=FlipperAppType.EXTERNAL,
+    apptype=FlipperAppType.APP,
     entry_point="unirfremix_app",
     cdefines=["APP_UNIRFREMIX"],
     requires=["storage", "gui", "dialogs", "subghz"],
-    # icon="A_UniRFRemix_14",
+    icon="A_UniRFRemix_14",
     stack_size=4 * 1024,
     order=11,
-    fap_icon="unirfIcon.png",
-    fap_category="Main",
+    # fap_icon="unirfIcon.png",
+    # fap_category="Main",
 )
diff --git a/applications/services/desktop/scenes/desktop_scene_main.c b/applications/services/desktop/scenes/desktop_scene_main.c
index 32f74093a..a182b7f77 100644
--- a/applications/services/desktop/scenes/desktop_scene_main.c
+++ b/applications/services/desktop/scenes/desktop_scene_main.c
@@ -233,11 +233,12 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
             break;
         }
         case DesktopMainEventOpenSubRemote: {
-            LoaderStatus status = loader_start(
-                desktop->loader, "Applications", EXT_PATH("/apps/Main/SubGHz_Remote.fap"));
-            if(status != LoaderStatusOk) {
-                FURI_LOG_E(TAG, "loader_start failed: %d", status);
-            }
+            loader_start(desktop->loader, FLIPPER_APPS[1].name, NULL);
+            // LoaderStatus status = loader_start(
+                // desktop->loader, "Applications", EXT_PATH("/apps/Main/SubGHz_Remote.fap"));
+            // if(status != LoaderStatusOk) {
+                // FURI_LOG_E(TAG, "loader_start failed: %d", status);
+            // }
             consumed = true;
             break;
         }