diff --git a/applications/main/clock_app/application.fam b/applications/main/clock_app/application.fam
index 9016973c5..47f152b1d 100644
--- a/applications/main/clock_app/application.fam
+++ b/applications/main/clock_app/application.fam
@@ -1,12 +1,11 @@
 App(
     appid="clock",
     name="Clock",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     entry_point="clock_app",
-    cdefines=["APP_CLOCK"],
-    requires=["gui"],
     icon="A_Clock_14",
     stack_size=2 * 1024,
     order=81,
+    fap_icon="icon.png",
+    fap_category="Tools",
 )
-
diff --git a/applications/main/clock_app/icon.png b/applications/main/clock_app/icon.png
new file mode 100644
index 000000000..8a5406e6c
Binary files /dev/null and b/applications/main/clock_app/icon.png differ
diff --git a/applications/main/subghz_remote/application.fam b/applications/main/subghz_remote/application.fam
index 804ac0b7c..f8980c0a7 100644
--- a/applications/main/subghz_remote/application.fam
+++ b/applications/main/subghz_remote/application.fam
@@ -1,17 +1,11 @@
 App(
     appid="subghz_remote",
     name="Sub-GHz Remote",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     entry_point="subghz_remote_app",
-    cdefines=[
-        "APP_SUBGHZREMOTE",
-        "SUBREM_LIGHT",
-    ],
-    requires=[
-        "gui",
-        "dialogs",
-    ],
     icon="A_SubGHzRemote_14",
     stack_size=2 * 1024,
     order=11,
-)
\ No newline at end of file
+    fap_icon="icon.png",
+    fap_category="Sub-Ghz",
+)
diff --git a/applications/main/subghz_remote/icon.png b/applications/main/subghz_remote/icon.png
new file mode 100644
index 000000000..c6b410f4c
Binary files /dev/null and b/applications/main/subghz_remote/icon.png differ
diff --git a/applications/main/subghz_remote/subghz_remote_app_i.h b/applications/main/subghz_remote/subghz_remote_app_i.h
index 1ced74d11..a0f25667c 100644
--- a/applications/main/subghz_remote/subghz_remote_app_i.h
+++ b/applications/main/subghz_remote/subghz_remote_app_i.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#define SUBREM_LIGHT 1
+#define APP_SUBGHZREMOTE 1
+
 #include "helpers/subrem_types.h"
 #include "helpers/subrem_presets.h"
 #include "scenes/subrem_scene.h"