diff --git a/applications/main/bad_usb/application.fam b/applications/main/bad_usb/application.fam
index 4da34f0de..87b957b57 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=[
@@ -9,6 +9,10 @@ App(
         "dialogs",
     ],
     stack_size=2 * 1024,
-    icon="A_BadUsb_14",
+    # icon="A_BadUsb_14",
     order=70,
+    fap_category="Main",
+    fap_icon="gpioIcon.png",
+    fap_icon_assets="images",
+
 )
diff --git a/applications/main/bad_usb/bad_usb_app_i.h b/applications/main/bad_usb/bad_usb_app_i.h
index b3fbb1679..d06cc3259 100644
--- a/applications/main/bad_usb/bad_usb_app_i.h
+++ b/applications/main/bad_usb/bad_usb_app_i.h
@@ -3,6 +3,7 @@
 #include "bad_usb_app.h"
 #include "scenes/bad_usb_scene.h"
 #include "bad_usb_script.h"
+#include "bad_usb_icons.h"
 
 #include <gui/gui.h>
 #include <assets_icons.h>
diff --git a/applications/main/bad_usb/gpioIcon.png b/applications/main/bad_usb/gpioIcon.png
new file mode 100644
index 000000000..5b2f4293c
Binary files /dev/null and b/applications/main/bad_usb/gpioIcon.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 000000000..1d7686ddd
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 000000000..ab06d008e
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 000000000..16a5a74d9
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 000000000..987af3258
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 000000000..7e28c9f01
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 000000000..d39d21733
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 000000000..15ca088fd
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 000000000..677911fd4
Binary files /dev/null and b/applications/main/bad_usb/images/Percent_10x14.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 000000000..d2aae0dc3
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 000000000..cc41b5b9a
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 000000000..037474aa3
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 000000000..74a10e6db
Binary files /dev/null and b/applications/main/bad_usb/images/keyboard_10px.png differ
diff --git a/applications/main/bad_usb/views/bad_usb_view.c b/applications/main/bad_usb/views/bad_usb_view.c
index 01369b30d..1f244479e 100644
--- a/applications/main/bad_usb/views/bad_usb_view.c
+++ b/applications/main/bad_usb/views/bad_usb_view.c
@@ -2,7 +2,7 @@
 #include "../bad_usb_script.h"
 #include <toolbox/path.h>
 #include <gui/elements.h>
-#include <assets_icons.h>
+#include <bad_usb_icons.h>
 
 #define MAX_NAME_LEN 64