diff --git a/applications/debug/uart_echo/application.fam b/applications/debug/uart_echo/application.fam
index 8863a1a94..956aa17af 100644
--- a/applications/debug/uart_echo/application.fam
+++ b/applications/debug/uart_echo/application.fam
@@ -1,11 +1,12 @@
 App(
     appid="uart_echo",
     name="UART Echo",
-    apptype=FlipperAppType.DEBUG,
+    apptype=FlipperAppType.PLUGIN,
     entry_point="uart_echo_app",
     cdefines=["APP_UART_ECHO"],
     requires=["gui"],
     stack_size=2 * 1024,
     order=70,
-    fap_category="Debug",
+    fap_icon="../../../assets/icons/Archive/keyboard_10px.png",
+    fap_category="Misc",
 )
diff --git a/applications/debug/usb_mouse/application.fam b/applications/debug/usb_mouse/application.fam
index 5c4340045..9c2f19da6 100644
--- a/applications/debug/usb_mouse/application.fam
+++ b/applications/debug/usb_mouse/application.fam
@@ -1,11 +1,12 @@
 App(
     appid="usb_mouse",
-    name="USB Mouse Demo",
-    apptype=FlipperAppType.DEBUG,
+    name="USB Mouse",
+    apptype=FlipperAppType.PLUGIN,
     entry_point="usb_mouse_app",
     cdefines=["APP_USB_MOUSE"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=60,
-    fap_category="Debug",
+    fap_icon="../../plugins/mousejacker/mouse_10px.png",
+    fap_category="Misc",
 )