diff --git a/applications/plugins/metronome/application.fam b/applications/plugins/metronome/application.fam
index 32588d06e..a3435fd77 100644
--- a/applications/plugins/metronome/application.fam
+++ b/applications/plugins/metronome/application.fam
@@ -8,7 +8,7 @@ App(
         "gui",
     ],
     fap_icon="metronome_icon.png",
-    fap_category="Music",
+    fap_category="Media",
     fap_icon_assets="images",
     stack_size=2 * 1024,
     order=20,
diff --git a/applications/plugins/morse_code/application.fam b/applications/plugins/morse_code/application.fam
index 47a986233..16a52fbd5 100644
--- a/applications/plugins/morse_code/application.fam
+++ b/applications/plugins/morse_code/application.fam
@@ -10,6 +10,6 @@ App(
     stack_size=1 * 1024,
     order=20,
     fap_icon="morse_code_10px.png",
-    fap_category="Music"
+    fap_category="Media"
 
 )
\ No newline at end of file
diff --git a/applications/plugins/music_player/application.fam b/applications/plugins/music_player/application.fam
index 74f6f6d5d..b8bd75198 100644
--- a/applications/plugins/music_player/application.fam
+++ b/applications/plugins/music_player/application.fam
@@ -13,7 +13,7 @@ App(
     order=20,
     fap_icon="icons/music_10px.png",
     fap_icon_assets="icons",
-    fap_category="Music",
+    fap_category="Media",
 )
 
 App(
diff --git a/applications/plugins/nfc_magic/application.fam b/applications/plugins/nfc_magic/application.fam
index 717387d58..db0af81d4 100644
--- a/applications/plugins/nfc_magic/application.fam
+++ b/applications/plugins/nfc_magic/application.fam
@@ -11,7 +11,7 @@ App(
     stack_size=4 * 1024,
     order=30,
     fap_icon="../../../assets/icons/Archive/Nfc_10px.png",
-    fap_category="NFC",
+    fap_category="Tools",
     fap_private_libs=[
         Lib(
             name="magic",
diff --git a/applications/plugins/playlist/application.fam b/applications/plugins/playlist/application.fam
index fda109dab..06357e24b 100644
--- a/applications/plugins/playlist/application.fam
+++ b/applications/plugins/playlist/application.fam
@@ -8,6 +8,6 @@ App(
     stack_size=2 * 1024,
     order=14,
     fap_icon="playlist_10px.png",
-    fap_category="Tools",
+    fap_category="Sub-GHz",
     fap_icon_assets="images",
 )
diff --git a/applications/plugins/pocsag_pager/application.fam b/applications/plugins/pocsag_pager/application.fam
index aafb6a5a3..86f8d528b 100644
--- a/applications/plugins/pocsag_pager/application.fam
+++ b/applications/plugins/pocsag_pager/application.fam
@@ -8,6 +8,6 @@ App(
     stack_size=4 * 1024,
     order=50,
     fap_icon="pocsag_pager_10px.png",
-    fap_category="Tools",
+    fap_category="Sub-GHz",
     fap_icon_assets="images",
 )
diff --git a/applications/plugins/protoview/application.fam b/applications/plugins/protoview/application.fam
index 6cd31372e..234a00bc6 100644
--- a/applications/plugins/protoview/application.fam
+++ b/applications/plugins/protoview/application.fam
@@ -8,5 +8,5 @@ App(
     stack_size=8*1024,
     order=50,
     fap_icon="appicon.png",
-    fap_category="Tools",
+    fap_category="Sub-GHz",
 )
diff --git a/applications/plugins/spectrum_analyzer/application.fam b/applications/plugins/spectrum_analyzer/application.fam
index 04bb946ee..344c2244f 100644
--- a/applications/plugins/spectrum_analyzer/application.fam
+++ b/applications/plugins/spectrum_analyzer/application.fam
@@ -8,5 +8,5 @@ App(
     stack_size=2 * 1024,
     order=12,
     fap_icon="spectrum_10px.png",
-    fap_category="Tools",
+    fap_category="Sub-GHz",
 )
diff --git a/applications/plugins/subbrute b/applications/plugins/subbrute
index 819b53293..7cdb9e138 160000
--- a/applications/plugins/subbrute
+++ b/applications/plugins/subbrute
@@ -1 +1 @@
-Subproject commit 819b532937b8920504cd54385e25389c199285f9
+Subproject commit 7cdb9e1386778ad7351f7e3b3389980afaeafea3
diff --git a/applications/plugins/swd_probe/application.fam b/applications/plugins/swd_probe/application.fam
index 64140d130..c24813ed9 100644
--- a/applications/plugins/swd_probe/application.fam
+++ b/applications/plugins/swd_probe/application.fam
@@ -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"
 )
diff --git a/applications/plugins/wav_player/application.fam b/applications/plugins/wav_player/application.fam
index 4040ed159..6ab832d03 100644
--- a/applications/plugins/wav_player/application.fam
+++ b/applications/plugins/wav_player/application.fam
@@ -7,6 +7,6 @@ App(
     stack_size=4 * 1024,
     order=46,
     fap_icon="wav_10px.png",
-    fap_category="Music",
+    fap_category="Media",
     fap_icon_assets="images",
 )