diff --git a/applications/main/bad_usb/bad_usb_app.c b/applications/main/bad_usb/bad_usb_app.c
index 1b249579..ea97c448 100644
--- a/applications/main/bad_usb/bad_usb_app.c
+++ b/applications/main/bad_usb/bad_usb_app.c
@@ -142,10 +142,6 @@ void bad_usb_app_free(BadUsbApp* app) {
         app->bad_usb_script = NULL;
     }
 
-    if(app->usb_if_prev) {
-        furi_check(furi_hal_usb_set_config(app->usb_if_prev, NULL));
-    }
-
     // Views
     view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewWork);
     bad_usb_free(app->bad_usb_view);
@@ -172,6 +168,10 @@ void bad_usb_app_free(BadUsbApp* app) {
     furi_string_free(app->file_path);
     furi_string_free(app->keyboard_layout);
 
+    if(app->usb_if_prev) {
+        furi_check(furi_hal_usb_set_config(app->usb_if_prev, NULL));
+    }
+
     free(app);
 }
 
diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_work.c b/applications/main/bad_usb/scenes/bad_usb_scene_work.c
index 187b83bd..6f2b8269 100644
--- a/applications/main/bad_usb/scenes/bad_usb_scene_work.c
+++ b/applications/main/bad_usb/scenes/bad_usb_scene_work.c
@@ -16,7 +16,9 @@ bool bad_usb_scene_work_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == InputKeyLeft) {
-            scene_manager_next_scene(app->scene_manager, BadUsbSceneConfig);
+            if(bad_usb_is_idle_state(app->bad_usb_view)) {
+                scene_manager_next_scene(app->scene_manager, BadUsbSceneConfig);
+            }
             consumed = true;
         } else if(event.event == InputKeyOk) {
             bad_usb_script_toggle(app->bad_usb_script);
diff --git a/applications/main/bad_usb/views/bad_usb_view.c b/applications/main/bad_usb/views/bad_usb_view.c
index bb9dc3b7..9ee9dc34 100644
--- a/applications/main/bad_usb/views/bad_usb_view.c
+++ b/applications/main/bad_usb/views/bad_usb_view.c
@@ -48,17 +48,13 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) {
     if((model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone) ||
        (model->state.state == BadUsbStateNotConnected)) {
         elements_button_center(canvas, "Run");
+        elements_button_left(canvas, "Config");
     } else if((model->state.state == BadUsbStateRunning) || (model->state.state == BadUsbStateDelay)) {
         elements_button_center(canvas, "Stop");
     } else if(model->state.state == BadUsbStateWillRun) {
         elements_button_center(canvas, "Cancel");
     }
 
-    if((model->state.state == BadUsbStateNotConnected) ||
-       (model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone)) {
-        elements_button_left(canvas, "Config");
-    }
-
     if(model->state.state == BadUsbStateNotConnected) {
         canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
         canvas_set_font(canvas, FontPrimary);
@@ -203,6 +199,7 @@ void bad_usb_set_layout(BadUsb* bad_usb, const char* layout) {
         { strlcpy(model->layout, layout, MAX_NAME_LEN); },
         true);
 }
+
 void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st) {
     furi_assert(st);
     with_view_model(
@@ -214,3 +211,19 @@ void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st) {
         },
         true);
 }
+
+bool bad_usb_is_idle_state(BadUsb* bad_usb) {
+    bool is_idle = false;
+    with_view_model(
+        bad_usb->view,
+        BadUsbModel * model,
+        {
+            if((model->state.state == BadUsbStateIdle) ||
+               (model->state.state == BadUsbStateDone) ||
+               (model->state.state == BadUsbStateNotConnected)) {
+                is_idle = true;
+            }
+        },
+        false);
+    return is_idle;
+}
diff --git a/applications/main/bad_usb/views/bad_usb_view.h b/applications/main/bad_usb/views/bad_usb_view.h
index 8447fb05..2fc01688 100644
--- a/applications/main/bad_usb/views/bad_usb_view.h
+++ b/applications/main/bad_usb/views/bad_usb_view.h
@@ -19,3 +19,5 @@ void bad_usb_set_file_name(BadUsb* bad_usb, const char* name);
 void bad_usb_set_layout(BadUsb* bad_usb, const char* layout);
 
 void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st);
+
+bool bad_usb_is_idle_state(BadUsb* bad_usb);
diff --git a/applications/plugins/dap_link/application.fam b/applications/plugins/dap_link/application.fam
index 3b99d5ef..711e4833 100644
--- a/applications/plugins/dap_link/application.fam
+++ b/applications/plugins/dap_link/application.fam
@@ -10,7 +10,7 @@ App(
     stack_size=4 * 1024,
     order=20,
     fap_icon="dap_link.png",
-    fap_category="Tools",
+    fap_category="GPIO",
     fap_private_libs=[
         Lib(
             name="free-dap",
diff --git a/applications/plugins/hid_app/application.fam b/applications/plugins/hid_app/application.fam
index b8c13e35..b6e4e3bf 100644
--- a/applications/plugins/hid_app/application.fam
+++ b/applications/plugins/hid_app/application.fam
@@ -1,10 +1,10 @@
 App(
     appid="hid_usb",
-    name="USB Remote",
+    name="Remote",
     apptype=FlipperAppType.PLUGIN,
     entry_point="hid_usb_app",
     stack_size=1 * 1024,
-    fap_category="Tools",
+    fap_category="USB",
     fap_icon="hid_usb_10px.png",
     fap_icon_assets="assets",
     fap_icon_assets_symbol="hid",
@@ -13,11 +13,11 @@ App(
 
 App(
     appid="hid_ble",
-    name="Bluetooth Remote",
+    name="Remote",
     apptype=FlipperAppType.PLUGIN,
     entry_point="hid_ble_app",
     stack_size=1 * 1024,
-    fap_category="Tools",
+    fap_category="Bluetooth",
     fap_icon="hid_ble_10px.png",
     fap_icon_assets="assets",
     fap_icon_assets_symbol="hid",
diff --git a/applications/plugins/music_player/application.fam b/applications/plugins/music_player/application.fam
index a3698898..c51abf19 100644
--- a/applications/plugins/music_player/application.fam
+++ b/applications/plugins/music_player/application.fam
@@ -12,7 +12,7 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="icons/music_10px.png",
-    fap_category="Misc",
+    fap_category="Media",
     fap_icon_assets="icons",
 )
 
diff --git a/applications/plugins/nfc_magic/application.fam b/applications/plugins/nfc_magic/application.fam
index bf42681c..a89b45d0 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/125_10px.png",
-    fap_category="Tools",
+    fap_category="NFC",
     fap_private_libs=[
         Lib(
             name="magic",
diff --git a/applications/plugins/signal_generator/application.fam b/applications/plugins/signal_generator/application.fam
index de915733..60f8deff 100644
--- a/applications/plugins/signal_generator/application.fam
+++ b/applications/plugins/signal_generator/application.fam
@@ -8,6 +8,6 @@ App(
     stack_size=1 * 1024,
     order=50,
     fap_icon="signal_gen_10px.png",
-    fap_category="Tools",
+    fap_category="GPIO",
     fap_icon_assets="icons",
 )
diff --git a/applications/plugins/spi_mem_manager/application.fam b/applications/plugins/spi_mem_manager/application.fam
index 09d80187..c1b10bfe 100644
--- a/applications/plugins/spi_mem_manager/application.fam
+++ b/applications/plugins/spi_mem_manager/application.fam
@@ -7,7 +7,7 @@ App(
     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/weather_station/application.fam b/applications/plugins/weather_station/application.fam
index 769b6dd2..935f9257 100644
--- a/applications/plugins/weather_station/application.fam
+++ b/applications/plugins/weather_station/application.fam
@@ -9,6 +9,6 @@ App(
     stack_size=4 * 1024,
     order=50,
     fap_icon="weather_station_10px.png",
-    fap_category="Tools",
+    fap_category="Sub-GHz",
     fap_icon_assets="images",
 )