diff --git a/applications/main/application.fam b/applications/main/application.fam
index f8898ce880b..0f7e5d44de1 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -11,7 +11,8 @@ App(
         "lfrfid",
         "nfc",
         "subghz",
-        "bad_usb",
+        #"bad_usb",
+        "bad_usb_loader",
         # "u2f",
         "u2f_loader",
         "fap_loader",
diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c
index 0cf59e30a47..a72a24e3108 100644
--- a/applications/main/archive/scenes/archive_scene_browser.c
+++ b/applications/main/archive/scenes/archive_scene_browser.c
@@ -63,6 +63,14 @@ static void archive_run_in_app(ArchiveBrowserView* browser, ArchiveFile_t* selec
             char* result =
                 malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1);
 
+            strcpy(result, tmpType);
+            strcat(result, furi_string_get_cstr(selected->path));
+            status = loader_start(loader, "Applications", result);
+        } else if(strcmp(flipper_app_name[selected->type], "Bad USB") == 0) {
+            char* tmpType = "/ext/apps/Main/bad_usb.fap¯";
+            char* result =
+                malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1);
+
             strcpy(result, tmpType);
             strcat(result, furi_string_get_cstr(selected->path));
             status = loader_start(loader, "Applications", result);
diff --git a/applications/main/bad_usb/application.fam b/applications/main/bad_usb/application.fam
index 4da34f0de1b..1f6c3a3fb50 100644
--- a/applications/main/bad_usb/application.fam
+++ b/applications/main/bad_usb/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="bad_usb",
     name="Bad USB",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="bad_usb_app",
     cdefines=["APP_BAD_USB"],
     requires=[
@@ -11,4 +11,7 @@ App(
     stack_size=2 * 1024,
     icon="A_BadUsb_14",
     order=70,
+    fap_category="Main",
+    fap_icon="badusb_10px.png",
+    fap_icon_assets="images",
 )
diff --git a/applications/main/bad_usb/badusb_10px.png b/applications/main/bad_usb/badusb_10px.png
new file mode 100644
index 00000000000..037474aa3bc
Binary files /dev/null and b/applications/main/bad_usb/badusb_10px.png differ
diff --git a/applications/main/bad_usb/images/ActiveConnection_50x64.png b/applications/main/bad_usb/images/ActiveConnection_50x64.png
new file mode 100644
index 00000000000..1d7686dddf8
Binary files /dev/null and b/applications/main/bad_usb/images/ActiveConnection_50x64.png differ
diff --git a/applications/main/bad_usb/images/Clock_18x18.png b/applications/main/bad_usb/images/Clock_18x18.png
new file mode 100644
index 00000000000..ab06d008eeb
Binary files /dev/null and b/applications/main/bad_usb/images/Clock_18x18.png differ
diff --git a/applications/main/bad_usb/images/Error_18x18.png b/applications/main/bad_usb/images/Error_18x18.png
new file mode 100644
index 00000000000..16a5a74d966
Binary files /dev/null and b/applications/main/bad_usb/images/Error_18x18.png differ
diff --git a/applications/main/bad_usb/images/EviSmile1_18x21.png b/applications/main/bad_usb/images/EviSmile1_18x21.png
new file mode 100644
index 00000000000..987af32587c
Binary files /dev/null and b/applications/main/bad_usb/images/EviSmile1_18x21.png differ
diff --git a/applications/main/bad_usb/images/EviSmile2_18x21.png b/applications/main/bad_usb/images/EviSmile2_18x21.png
new file mode 100644
index 00000000000..7e28c9f018a
Binary files /dev/null and b/applications/main/bad_usb/images/EviSmile2_18x21.png differ
diff --git a/applications/main/bad_usb/images/EviWaiting1_18x21.png b/applications/main/bad_usb/images/EviWaiting1_18x21.png
new file mode 100644
index 00000000000..d39d2173329
Binary files /dev/null and b/applications/main/bad_usb/images/EviWaiting1_18x21.png differ
diff --git a/applications/main/bad_usb/images/EviWaiting2_18x21.png b/applications/main/bad_usb/images/EviWaiting2_18x21.png
new file mode 100644
index 00000000000..15ca088fd73
Binary files /dev/null and b/applications/main/bad_usb/images/EviWaiting2_18x21.png differ
diff --git a/applications/main/bad_usb/images/Percent_10x14.png b/applications/main/bad_usb/images/Percent_10x14.png
new file mode 100644
index 00000000000..677911fd44d
Binary files /dev/null and b/applications/main/bad_usb/images/Percent_10x14.png differ
diff --git a/applications/main/bad_usb/images/SDQuestion_35x43.png b/applications/main/bad_usb/images/SDQuestion_35x43.png
new file mode 100644
index 00000000000..9b9c9a58e32
Binary files /dev/null and b/applications/main/bad_usb/images/SDQuestion_35x43.png differ
diff --git a/applications/main/bad_usb/images/Smile_18x18.png b/applications/main/bad_usb/images/Smile_18x18.png
new file mode 100644
index 00000000000..d2aae0dc37f
Binary files /dev/null and b/applications/main/bad_usb/images/Smile_18x18.png differ
diff --git a/applications/main/bad_usb/images/UsbTree_48x22.png b/applications/main/bad_usb/images/UsbTree_48x22.png
new file mode 100644
index 00000000000..cc41b5b9a91
Binary files /dev/null and b/applications/main/bad_usb/images/UsbTree_48x22.png differ
diff --git a/applications/main/bad_usb/images/badusb_10px.png b/applications/main/bad_usb/images/badusb_10px.png
new file mode 100644
index 00000000000..037474aa3bc
Binary files /dev/null and b/applications/main/bad_usb/images/badusb_10px.png differ
diff --git a/applications/main/bad_usb/images/keyboard_10px.png b/applications/main/bad_usb/images/keyboard_10px.png
new file mode 100644
index 00000000000..74a10e6db2e
Binary files /dev/null and b/applications/main/bad_usb/images/keyboard_10px.png differ
diff --git a/applications/main/bad_usb_loader/application.fam b/applications/main/bad_usb_loader/application.fam
new file mode 100644
index 00000000000..de6aa451472
--- /dev/null
+++ b/applications/main/bad_usb_loader/application.fam
@@ -0,0 +1,14 @@
+App(
+    appid="bad_usb_loader",
+    name="Bad USB",
+    apptype=FlipperAppType.APP,
+    entry_point="bad_usb_loader_app",
+    requires=[
+        "gui",
+        "dialogs",
+    ],
+    stack_size=int(2 * 1024),
+    icon="A_BadUsb_14",
+    order=80,
+	link="/ext/apps/Main/bad_usb.fap",
+)
diff --git a/applications/main/bad_usb_loader/bad_usb_loader_app.c b/applications/main/bad_usb_loader/bad_usb_loader_app.c
new file mode 100644
index 00000000000..cede52b554e
--- /dev/null
+++ b/applications/main/bad_usb_loader/bad_usb_loader_app.c
@@ -0,0 +1,9 @@
+#include <applications/services/loader/loader_i.h>
+
+#define TAG "bad_usb_loader_app"
+
+int32_t bad_usb_loader_app(void* p) {
+    UNUSED(p);
+
+    return 0;
+}
\ No newline at end of file
diff --git a/applications/plugins/unirfremix/application.fam b/applications/main/unirfremix/application.fam
similarity index 100%
rename from applications/plugins/unirfremix/application.fam
rename to applications/main/unirfremix/application.fam
diff --git a/applications/plugins/unirfremix/images/ButtonDown_7x4.png b/applications/main/unirfremix/images/ButtonDown_7x4.png
similarity index 100%
rename from applications/plugins/unirfremix/images/ButtonDown_7x4.png
rename to applications/main/unirfremix/images/ButtonDown_7x4.png
diff --git a/applications/plugins/unirfremix/images/ButtonLeft_4x7.png b/applications/main/unirfremix/images/ButtonLeft_4x7.png
similarity index 100%
rename from applications/plugins/unirfremix/images/ButtonLeft_4x7.png
rename to applications/main/unirfremix/images/ButtonLeft_4x7.png
diff --git a/applications/plugins/unirfremix/images/ButtonRight_4x7.png b/applications/main/unirfremix/images/ButtonRight_4x7.png
similarity index 100%
rename from applications/plugins/unirfremix/images/ButtonRight_4x7.png
rename to applications/main/unirfremix/images/ButtonRight_4x7.png
diff --git a/applications/plugins/unirfremix/images/ButtonUp_7x4.png b/applications/main/unirfremix/images/ButtonUp_7x4.png
similarity index 100%
rename from applications/plugins/unirfremix/images/ButtonUp_7x4.png
rename to applications/main/unirfremix/images/ButtonUp_7x4.png
diff --git a/applications/plugins/unirfremix/images/Ok_btn_9x9.png b/applications/main/unirfremix/images/Ok_btn_9x9.png
similarity index 100%
rename from applications/plugins/unirfremix/images/Ok_btn_9x9.png
rename to applications/main/unirfremix/images/Ok_btn_9x9.png
diff --git a/applications/plugins/unirfremix/images/Pin_arrow_down_7x9.png b/applications/main/unirfremix/images/Pin_arrow_down_7x9.png
similarity index 100%
rename from applications/plugins/unirfremix/images/Pin_arrow_down_7x9.png
rename to applications/main/unirfremix/images/Pin_arrow_down_7x9.png
diff --git a/applications/plugins/unirfremix/images/Pin_arrow_left_9x7.png b/applications/main/unirfremix/images/Pin_arrow_left_9x7.png
similarity index 100%
rename from applications/plugins/unirfremix/images/Pin_arrow_left_9x7.png
rename to applications/main/unirfremix/images/Pin_arrow_left_9x7.png
diff --git a/applications/plugins/unirfremix/images/Pin_arrow_right_9x7.png b/applications/main/unirfremix/images/Pin_arrow_right_9x7.png
similarity index 100%
rename from applications/plugins/unirfremix/images/Pin_arrow_right_9x7.png
rename to applications/main/unirfremix/images/Pin_arrow_right_9x7.png
diff --git a/applications/plugins/unirfremix/images/Pin_arrow_up_7x9.png b/applications/main/unirfremix/images/Pin_arrow_up_7x9.png
similarity index 100%
rename from applications/plugins/unirfremix/images/Pin_arrow_up_7x9.png
rename to applications/main/unirfremix/images/Pin_arrow_up_7x9.png
diff --git a/applications/plugins/unirfremix/images/Pin_cell_13x13.png b/applications/main/unirfremix/images/Pin_cell_13x13.png
similarity index 100%
rename from applications/plugins/unirfremix/images/Pin_cell_13x13.png
rename to applications/main/unirfremix/images/Pin_cell_13x13.png
diff --git a/applications/plugins/unirfremix/images/Pin_star_7x7.png b/applications/main/unirfremix/images/Pin_star_7x7.png
similarity index 100%
rename from applications/plugins/unirfremix/images/Pin_star_7x7.png
rename to applications/main/unirfremix/images/Pin_star_7x7.png
diff --git a/applications/plugins/unirfremix/images/back_10px.png b/applications/main/unirfremix/images/back_10px.png
similarity index 100%
rename from applications/plugins/unirfremix/images/back_10px.png
rename to applications/main/unirfremix/images/back_10px.png
diff --git a/applications/plugins/unirfremix/images/sub1_10px.png b/applications/main/unirfremix/images/sub1_10px.png
similarity index 100%
rename from applications/plugins/unirfremix/images/sub1_10px.png
rename to applications/main/unirfremix/images/sub1_10px.png
diff --git a/applications/plugins/unirfremix/unirfIcon.png b/applications/main/unirfremix/unirfIcon.png
similarity index 100%
rename from applications/plugins/unirfremix/unirfIcon.png
rename to applications/main/unirfremix/unirfIcon.png
diff --git a/applications/plugins/unirfremix/unirfremix_app.c b/applications/main/unirfremix/unirfremix_app.c
similarity index 100%
rename from applications/plugins/unirfremix/unirfremix_app.c
rename to applications/main/unirfremix/unirfremix_app.c