diff --git a/applications/plugins/spi_mem_manager/application.fam b/applications/plugins/spi_mem_manager/application.fam
index 09d801876..21e70980a 100644
--- a/applications/plugins/spi_mem_manager/application.fam
+++ b/applications/plugins/spi_mem_manager/application.fam
@@ -1,13 +1,13 @@
 App(
     appid="spi_mem_manager",
-    name="SPI Mem Manager",
+    name="[SPI] Mem Manager",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="spi_mem_app",
     requires=["gui"],
     stack_size=1 * 2048,
     order=30,
     fap_icon="images/Dip8_10px.png",
-    fap_category="Tools",
+    fap_category="GPIO",
     fap_icon_assets="images",
     fap_private_libs=[
         Lib(
diff --git a/applications/plugins/swd_probe/application.fam b/applications/plugins/swd_probe/application.fam
index 9720e485f..de2708e41 100644
--- a/applications/plugins/swd_probe/application.fam
+++ b/applications/plugins/swd_probe/application.fam
@@ -1,6 +1,6 @@
 App(
     appid="swd_probe",
-    name="SWD Probe",
+    name="[SWD] Probe",
     apptype=FlipperAppType.PLUGIN,
     entry_point="swd_probe_app_main",
     cdefines=["APP_SWD_PROBE"],
@@ -8,6 +8,6 @@ App(
     stack_size=2 * 1024,
     order=10,
     fap_icon="icons/app.png",
-    fap_category="Tools",
+    fap_category="GPIO",
     fap_icon_assets="icons",
 )