diff --git a/applications/main/bad_usb/gpioIcon.png b/applications/main/bad_usb/gpioIcon.png
deleted file mode 100644
index 5b2f4293c..000000000
Binary files a/applications/main/bad_usb/gpioIcon.png and /dev/null differ
diff --git a/assets/icons/Archive/125_10px.png b/applications/main/lfrfid/125_10px.png
similarity index 100%
rename from assets/icons/Archive/125_10px.png
rename to applications/main/lfrfid/125_10px.png
diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam
index 4a1498181..7385fccf4 100644
--- a/applications/main/lfrfid/application.fam
+++ b/applications/main/lfrfid/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="lfrfid",
     name="125 kHz RFID",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="lfrfid_app",
     cdefines=["APP_LF_RFID"],
     requires=[
@@ -11,9 +11,12 @@ App(
     provides=[
         "lfrfid_start",
     ],
-    icon="A_125khz_14",
+    # icon="A_125khz_14",
     stack_size=2 * 1024,
     order=20,
+    fap_category="Main",
+    fap_icon="125_10px.png",
+    fap_icon_assets="images",
 )
 
 App(
diff --git a/applications/main/lfrfid/images/125_10px.png b/applications/main/lfrfid/images/125_10px.png
new file mode 100644
index 000000000..ce01284a2
Binary files /dev/null and b/applications/main/lfrfid/images/125_10px.png differ
diff --git a/applications/main/lfrfid/images/ButtonRight_4x7.png b/applications/main/lfrfid/images/ButtonRight_4x7.png
new file mode 100644
index 000000000..8e1c74c1c
Binary files /dev/null and b/applications/main/lfrfid/images/ButtonRight_4x7.png differ
diff --git a/applications/main/lfrfid/images/DolphinCommon_56x48.png b/applications/main/lfrfid/images/DolphinCommon_56x48.png
new file mode 100644
index 000000000..089aaed83
Binary files /dev/null and b/applications/main/lfrfid/images/DolphinCommon_56x48.png differ
diff --git a/applications/main/lfrfid/images/DolphinMafia_115x62.png b/applications/main/lfrfid/images/DolphinMafia_115x62.png
new file mode 100644
index 000000000..53dffb4fa
Binary files /dev/null and b/applications/main/lfrfid/images/DolphinMafia_115x62.png differ
diff --git a/applications/main/lfrfid/images/DolphinNice_96x59.png b/applications/main/lfrfid/images/DolphinNice_96x59.png
new file mode 100644
index 000000000..b111196c7
Binary files /dev/null and b/applications/main/lfrfid/images/DolphinNice_96x59.png differ
diff --git a/applications/main/lfrfid/images/NFC_manual_60x50.png b/applications/main/lfrfid/images/NFC_manual_60x50.png
new file mode 100644
index 000000000..787c0bcfe
Binary files /dev/null and b/applications/main/lfrfid/images/NFC_manual_60x50.png differ
diff --git a/applications/main/lfrfid/images/RFIDDolphinReceive_97x61.png b/applications/main/lfrfid/images/RFIDDolphinReceive_97x61.png
new file mode 100644
index 000000000..ff967599c
Binary files /dev/null and b/applications/main/lfrfid/images/RFIDDolphinReceive_97x61.png differ
diff --git a/applications/main/lfrfid/images/RFIDDolphinSend_97x61.png b/applications/main/lfrfid/images/RFIDDolphinSend_97x61.png
new file mode 100644
index 000000000..343b9f734
Binary files /dev/null and b/applications/main/lfrfid/images/RFIDDolphinSend_97x61.png differ
diff --git a/applications/main/lfrfid/images/RFIDDolphinSuccess_108x57.png b/applications/main/lfrfid/images/RFIDDolphinSuccess_108x57.png
new file mode 100644
index 000000000..341999109
Binary files /dev/null and b/applications/main/lfrfid/images/RFIDDolphinSuccess_108x57.png differ
diff --git a/applications/main/lfrfid/images/RFIDSmallChip_14x14.png b/applications/main/lfrfid/images/RFIDSmallChip_14x14.png
new file mode 100644
index 000000000..24219a548
Binary files /dev/null and b/applications/main/lfrfid/images/RFIDSmallChip_14x14.png differ
diff --git a/applications/main/lfrfid/images/SDQuestion_35x43.png b/applications/main/lfrfid/images/SDQuestion_35x43.png
new file mode 100644
index 000000000..9b9c9a58e
Binary files /dev/null and b/applications/main/lfrfid/images/SDQuestion_35x43.png differ
diff --git a/applications/main/lfrfid/lfrfid_i.h b/applications/main/lfrfid/lfrfid_i.h
index 72b061930..2e3044d27 100644
--- a/applications/main/lfrfid/lfrfid_i.h
+++ b/applications/main/lfrfid/lfrfid_i.h
@@ -5,7 +5,7 @@
 
 #include <gui/gui.h>
 #include <gui/view.h>
-#include <assets_icons.h>
+#include <lfrfid_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <cli/cli.h>
diff --git a/applications/main/lfrfid/views/lfrfid_view_read.c b/applications/main/lfrfid/views/lfrfid_view_read.c
index 094afb617..e179ca577 100644
--- a/applications/main/lfrfid/views/lfrfid_view_read.c
+++ b/applications/main/lfrfid/views/lfrfid_view_read.c
@@ -1,6 +1,6 @@
 #include "lfrfid_view_read.h"
 #include <gui/elements.h>
-#include <assets_icons.h>
+#include <lfrfid_icons.h>
 
 #define TEMP_STR_LEN 128