diff --git a/applications/debug/battery_test_app/application.fam b/applications/debug/battery_test_app/application.fam
index f97d10279..b388445cc 100644
--- a/applications/debug/battery_test_app/application.fam
+++ b/applications/debug/battery_test_app/application.fam
@@ -11,5 +11,4 @@ App(
     stack_size=1 * 1024,
     order=130,
     fap_category="Debug",
-    fap_libs=["assets"],
 )
diff --git a/applications/external/.mass_storage/application.fam b/applications/external/.mass_storage/application.fam
index 251deed80..5cc57b2b5 100644
--- a/applications/external/.mass_storage/application.fam
+++ b/applications/external/.mass_storage/application.fam
@@ -9,5 +9,4 @@ App(
     order=2,
     # fap_icon="",
     fap_category="Misc",
-    fap_libs=["assets"],
 )
diff --git a/applications/external/bpmtapper/application.fam b/applications/external/bpmtapper/application.fam
index 7f9cb79ce..8691a1e75 100644
--- a/applications/external/bpmtapper/application.fam
+++ b/applications/external/bpmtapper/application.fam
@@ -8,6 +8,5 @@ App(
     stack_size=2 * 1024,
     fap_icon="bpm_10px.png",
     fap_category="Media",
-    fap_icon_assets="icons",
     order=15,
 )
diff --git a/applications/external/bpmtapper/bpm.c b/applications/external/bpmtapper/bpm.c
index 397b1a3b5..8353019df 100644
--- a/applications/external/bpmtapper/bpm.c
+++ b/applications/external/bpmtapper/bpm.c
@@ -4,7 +4,7 @@
 #include <gui/gui.h>
 #include <input/input.h>
 #include <stdlib.h>
-#include "bpm_tapper_icons.h"
+#include "assets_icons.h"
 
 typedef enum {
     EventTypeTick,
diff --git a/applications/external/bpmtapper/icons/DolphinCommon_56x48.png b/applications/external/bpmtapper/icons/DolphinCommon_56x48.png
deleted file mode 100644
index 089aaed83..000000000
Binary files a/applications/external/bpmtapper/icons/DolphinCommon_56x48.png and /dev/null differ
diff --git a/applications/external/brainfuck/brainfuck_i.h b/applications/external/brainfuck/brainfuck_i.h
index d3d27dcbd..293654c3e 100644
--- a/applications/external/brainfuck/brainfuck_i.h
+++ b/applications/external/brainfuck/brainfuck_i.h
@@ -30,6 +30,7 @@ typedef unsigned char byte;
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
 #include <brainfuck_icons.h>
+#include <assets_icons.h>
 
 #include <storage/storage.h>
 #include <stream/stream.h>
diff --git a/applications/external/brainfuck/icons/ButtonRightSmall_3x5.png b/applications/external/brainfuck/icons/ButtonRightSmall_3x5.png
deleted file mode 100644
index b9d5f87db..000000000
Binary files a/applications/external/brainfuck/icons/ButtonRightSmall_3x5.png and /dev/null differ
diff --git a/applications/external/brainfuck/icons/KeySaveSelected_24x11.png b/applications/external/brainfuck/icons/KeySaveSelected_24x11.png
deleted file mode 100644
index eeb3569d3..000000000
Binary files a/applications/external/brainfuck/icons/KeySaveSelected_24x11.png and /dev/null differ
diff --git a/applications/external/brainfuck/icons/KeySave_24x11.png b/applications/external/brainfuck/icons/KeySave_24x11.png
deleted file mode 100644
index e7dba987a..000000000
Binary files a/applications/external/brainfuck/icons/KeySave_24x11.png and /dev/null differ
diff --git a/applications/external/counter/application.fam b/applications/external/counter/application.fam
index b287965bf..0db32b7ca 100644
--- a/applications/external/counter/application.fam
+++ b/applications/external/counter/application.fam
@@ -7,6 +7,5 @@ App(
         "gui",
     ],
     fap_category="Misc",
-    fap_icon="icons/counter_icon.png",
-    fap_icon_assets="icons",
+    fap_icon="counter_icon.png",
 )
diff --git a/applications/external/counter/counter.c b/applications/external/counter/counter.c
index 22fa8cd80..67b45170b 100644
--- a/applications/external/counter/counter.c
+++ b/applications/external/counter/counter.c
@@ -2,7 +2,6 @@
 #include <gui/gui.h>
 #include <input/input.h>
 #include <stdlib.h>
-#include <counter_icons.h>
 
 #define MAX_COUNT 99
 #define BOXTIME 2
diff --git a/applications/external/counter/icons/counter_icon.png b/applications/external/counter/counter_icon.png
similarity index 100%
rename from applications/external/counter/icons/counter_icon.png
rename to applications/external/counter/counter_icon.png
diff --git a/applications/external/dap_link/dap_link.c b/applications/external/dap_link/dap_link.c
index eafb435e7..52d222138 100644
--- a/applications/external/dap_link/dap_link.c
+++ b/applications/external/dap_link/dap_link.c
@@ -15,6 +15,7 @@
 #include "usb/dap_v2_usb.h"
 #include <dialogs/dialogs.h>
 #include "dap_link_icons.h"
+#include "assets_icons.h"
 
 /***************************************************************************/
 /****************************** DAP COMMON *********************************/
@@ -524,4 +525,4 @@ int32_t dap_link_app(void* p) {
     dap_app_free(app);
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/applications/external/dap_link/icons/ActiveConnection_50x64.png b/applications/external/dap_link/icons/ActiveConnection_50x64.png
deleted file mode 100644
index 1d7686ddd..000000000
Binary files a/applications/external/dap_link/icons/ActiveConnection_50x64.png and /dev/null differ
diff --git a/applications/external/esp32cam_morseflasher/application.fam b/applications/external/esp32cam_morseflasher/application.fam
index 037e63c81..af60d8de7 100644
--- a/applications/external/esp32cam_morseflasher/application.fam
+++ b/applications/external/esp32cam_morseflasher/application.fam
@@ -7,7 +7,6 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=90,
-    fap_icon_assets="assets",
     fap_icon="icon.png",
     fap_category="GPIO",
     fap_description="ESP32-CAM app to stream a message in morse using the powerful flashlight. [Unplug the USB cable to test with Mayhem]",
diff --git a/applications/external/esp32cam_morseflasher/assets/KeyBackspaceSelected_16x9.png b/applications/external/esp32cam_morseflasher/assets/KeyBackspaceSelected_16x9.png
deleted file mode 100644
index 7cc0759a8..000000000
Binary files a/applications/external/esp32cam_morseflasher/assets/KeyBackspaceSelected_16x9.png and /dev/null differ
diff --git a/applications/external/esp32cam_morseflasher/assets/KeyBackspace_16x9.png b/applications/external/esp32cam_morseflasher/assets/KeyBackspace_16x9.png
deleted file mode 100644
index 9946232d9..000000000
Binary files a/applications/external/esp32cam_morseflasher/assets/KeyBackspace_16x9.png and /dev/null differ
diff --git a/applications/external/esp32cam_morseflasher/assets/KeySaveSelected_24x11.png b/applications/external/esp32cam_morseflasher/assets/KeySaveSelected_24x11.png
deleted file mode 100644
index eeb3569d3..000000000
Binary files a/applications/external/esp32cam_morseflasher/assets/KeySaveSelected_24x11.png and /dev/null differ
diff --git a/applications/external/esp32cam_morseflasher/assets/KeySave_24x11.png b/applications/external/esp32cam_morseflasher/assets/KeySave_24x11.png
deleted file mode 100644
index e7dba987a..000000000
Binary files a/applications/external/esp32cam_morseflasher/assets/KeySave_24x11.png and /dev/null differ
diff --git a/applications/external/esp32cam_morseflasher/assets/WarningDolphin_45x42.png b/applications/external/esp32cam_morseflasher/assets/WarningDolphin_45x42.png
deleted file mode 100644
index d766ffbb4..000000000
Binary files a/applications/external/esp32cam_morseflasher/assets/WarningDolphin_45x42.png and /dev/null differ
diff --git a/applications/external/esp32cam_morseflasher/uart_text_input.c b/applications/external/esp32cam_morseflasher/uart_text_input.c
index 5b2b1033d..9a1099468 100644
--- a/applications/external/esp32cam_morseflasher/uart_text_input.c
+++ b/applications/external/esp32cam_morseflasher/uart_text_input.c
@@ -1,6 +1,6 @@
 #include "uart_text_input.h"
 #include <gui/elements.h>
-#include "mayhem_morseflash_icons.h"
+#include "assets_icons.h"
 #include <furi.h>
 
 struct UART_TextInput {
diff --git a/applications/external/etch_a_sketch/application.fam b/applications/external/etch_a_sketch/application.fam
index 9d9b1c1f1..99e97e7d0 100644
--- a/applications/external/etch_a_sketch/application.fam
+++ b/applications/external/etch_a_sketch/application.fam
@@ -9,5 +9,4 @@ App(
     order=175,
     fap_icon="etch-a-sketch-icon.png",
     fap_category="Media",
-    fap_libs=["assets"],
 )
diff --git a/applications/external/flipbip/icons/Auth_62x31.png b/applications/external/flipbip/icons/Auth_62x31.png
deleted file mode 100644
index 40f094ac9..000000000
Binary files a/applications/external/flipbip/icons/Auth_62x31.png and /dev/null differ
diff --git a/applications/external/flipbip/icons/ButtonCenter_7x7.png b/applications/external/flipbip/icons/ButtonCenter_7x7.png
deleted file mode 100644
index a66461b22..000000000
Binary files a/applications/external/flipbip/icons/ButtonCenter_7x7.png and /dev/null differ
diff --git a/applications/external/flipbip/icons/ButtonLeftSmall_3x5.png b/applications/external/flipbip/icons/ButtonLeftSmall_3x5.png
deleted file mode 100644
index 51411acaf..000000000
Binary files a/applications/external/flipbip/icons/ButtonLeftSmall_3x5.png and /dev/null differ
diff --git a/applications/external/flipbip/icons/ButtonLeft_4x7.png b/applications/external/flipbip/icons/ButtonLeft_4x7.png
deleted file mode 100644
index 0b4655d43..000000000
Binary files a/applications/external/flipbip/icons/ButtonLeft_4x7.png and /dev/null differ
diff --git a/applications/external/flipbip/icons/ButtonRightSmall_3x5.png b/applications/external/flipbip/icons/ButtonRightSmall_3x5.png
deleted file mode 100644
index b9d5f87db..000000000
Binary files a/applications/external/flipbip/icons/ButtonRightSmall_3x5.png and /dev/null differ
diff --git a/applications/external/flipbip/icons/ButtonRight_4x7.png b/applications/external/flipbip/icons/ButtonRight_4x7.png
deleted file mode 100644
index 8e1c74c1c..000000000
Binary files a/applications/external/flipbip/icons/ButtonRight_4x7.png and /dev/null differ
diff --git a/applications/external/flipbip/icons/Keychain_39x36.png b/applications/external/flipbip/icons/Keychain_39x36.png
deleted file mode 100644
index d15850b5b..000000000
Binary files a/applications/external/flipbip/icons/Keychain_39x36.png and /dev/null differ
diff --git a/applications/external/flipbip/views/flipbip_scene_1.c b/applications/external/flipbip/views/flipbip_scene_1.c
index 361e9c5b4..3437a1149 100644
--- a/applications/external/flipbip/views/flipbip_scene_1.c
+++ b/applications/external/flipbip/views/flipbip_scene_1.c
@@ -7,6 +7,7 @@
 #include <storage/storage.h>
 #include <string.h>
 #include "flipbip_icons.h"
+#include "assets_icons.h"
 #include "../helpers/flipbip_haptic.h"
 #include "../helpers/flipbip_led.h"
 #include "../helpers/flipbip_string.h"
diff --git a/applications/external/flipbip/views/flipbip_startscreen.c b/applications/external/flipbip/views/flipbip_startscreen.c
index 76b060e95..f2b69c084 100644
--- a/applications/external/flipbip/views/flipbip_startscreen.c
+++ b/applications/external/flipbip/views/flipbip_startscreen.c
@@ -4,6 +4,7 @@
 #include <input/input.h>
 #include <gui/elements.h>
 #include "flipbip_icons.h"
+#include "assets_icons.h"
 
 struct FlipBipStartscreen {
     View* view;
diff --git a/applications/external/flipper_i2ctools/images/ButtonDown_7x4.png b/applications/external/flipper_i2ctools/images/ButtonDown_7x4.png
deleted file mode 100644
index 2954bb6a6..000000000
Binary files a/applications/external/flipper_i2ctools/images/ButtonDown_7x4.png and /dev/null differ
diff --git a/applications/external/flipper_i2ctools/images/ButtonLeft_4x7.png b/applications/external/flipper_i2ctools/images/ButtonLeft_4x7.png
deleted file mode 100644
index 0b4655d43..000000000
Binary files a/applications/external/flipper_i2ctools/images/ButtonLeft_4x7.png and /dev/null differ
diff --git a/applications/external/flipper_i2ctools/images/ButtonRight_4x7.png b/applications/external/flipper_i2ctools/images/ButtonRight_4x7.png
deleted file mode 100644
index 8e1c74c1c..000000000
Binary files a/applications/external/flipper_i2ctools/images/ButtonRight_4x7.png and /dev/null differ
diff --git a/applications/external/flipper_i2ctools/images/ButtonUp_7x4.png b/applications/external/flipper_i2ctools/images/ButtonUp_7x4.png
deleted file mode 100644
index 1be79328b..000000000
Binary files a/applications/external/flipper_i2ctools/images/ButtonUp_7x4.png and /dev/null differ
diff --git a/applications/external/flipper_i2ctools/images/Ok_btn_9x9.png b/applications/external/flipper_i2ctools/images/Ok_btn_9x9.png
deleted file mode 100644
index 9a1539da2..000000000
Binary files a/applications/external/flipper_i2ctools/images/Ok_btn_9x9.png and /dev/null differ
diff --git a/applications/external/flipper_i2ctools/views/main_view.h b/applications/external/flipper_i2ctools/views/main_view.h
index f0ce5e8ad..34fad74fa 100644
--- a/applications/external/flipper_i2ctools/views/main_view.h
+++ b/applications/external/flipper_i2ctools/views/main_view.h
@@ -2,6 +2,7 @@
 #include <furi_hal.h>
 #include <gui/gui.h>
 #include <i2c_tools_icons.h>
+#include <assets_icons.h>
 #define APP_NAME "I2C Tools"
 
 #define SCAN_MENU_TEXT "Scan"
@@ -35,4 +36,4 @@ typedef struct {
 void draw_main_view(Canvas* canvas, i2cMainView* main_view);
 
 i2cMainView* i2c_main_view_alloc();
-void i2c_main_view_free(i2cMainView* main_view);
\ No newline at end of file
+void i2c_main_view_free(i2cMainView* main_view);
diff --git a/applications/external/flipper_i2ctools/views/scanner_view.h b/applications/external/flipper_i2ctools/views/scanner_view.h
index 52f30a7bf..a38d9a917 100644
--- a/applications/external/flipper_i2ctools/views/scanner_view.h
+++ b/applications/external/flipper_i2ctools/views/scanner_view.h
@@ -2,8 +2,9 @@
 #include <furi_hal.h>
 #include <gui/gui.h>
 #include <i2c_tools_icons.h>
+#include <assets_icons.h>
 #include "../i2cscanner.h"
 
 #define SCAN_TEXT "SCAN"
 
-void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner);
\ No newline at end of file
+void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner);
diff --git a/applications/external/flipper_i2ctools/views/sender_view.h b/applications/external/flipper_i2ctools/views/sender_view.h
index c4fdd98a2..9b2e75a5c 100644
--- a/applications/external/flipper_i2ctools/views/sender_view.h
+++ b/applications/external/flipper_i2ctools/views/sender_view.h
@@ -2,8 +2,9 @@
 #include <furi_hal.h>
 #include <gui/gui.h>
 #include <i2c_tools_icons.h>
+#include <assets_icons.h>
 #include "../i2csender.h"
 
 #define SEND_TEXT "SEND"
 
-void draw_sender_view(Canvas* canvas, i2cSender* i2c_sender);
\ No newline at end of file
+void draw_sender_view(Canvas* canvas, i2cSender* i2c_sender);
diff --git a/applications/external/flipper_i2ctools/views/sniffer_view.h b/applications/external/flipper_i2ctools/views/sniffer_view.h
index 8f2140bba..b827294f8 100644
--- a/applications/external/flipper_i2ctools/views/sniffer_view.h
+++ b/applications/external/flipper_i2ctools/views/sniffer_view.h
@@ -2,8 +2,9 @@
 #include <furi_hal.h>
 #include <gui/gui.h>
 #include <i2c_tools_icons.h>
+#include <assets_icons.h>
 #include "../i2csniffer.h"
 
 #define SNIFF_TEXT "SNIFF"
 
-void draw_sniffer_view(Canvas* canvas, i2cSniffer* i2c_sniffer);
\ No newline at end of file
+void draw_sniffer_view(Canvas* canvas, i2cSniffer* i2c_sniffer);
diff --git a/applications/external/gpioreader_b/application.fam b/applications/external/gpioreader_b/application.fam
index aa26060aa..c3a417774 100644
--- a/applications/external/gpioreader_b/application.fam
+++ b/applications/external/gpioreader_b/application.fam
@@ -7,7 +7,6 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=50,
-    fap_libs=["assets"],
     fap_category="GPIO",
     fap_icon="icon.png",
 )
diff --git a/applications/external/hex_editor/hex_editor.c b/applications/external/hex_editor/hex_editor.c
index 5e5dc807c..5e411a400 100644
--- a/applications/external/hex_editor/hex_editor.c
+++ b/applications/external/hex_editor/hex_editor.c
@@ -12,7 +12,7 @@
 #include <toolbox/stream/file_stream.h>
 
 #include <hex_editor_icons.h>
-// #include <assets_icons.h>
+#include <assets_icons.h>
 
 #define TAG "HexEditor"
 
@@ -354,4 +354,4 @@ int32_t hex_editor_app(void* p) {
     hex_editor_free(hex_editor);
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/applications/external/hex_editor/icons/Pin_arrow_up_7x9.png b/applications/external/hex_editor/icons/Pin_arrow_up_7x9.png
deleted file mode 100644
index a91a6fd5e..000000000
Binary files a/applications/external/hex_editor/icons/Pin_arrow_up_7x9.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Ble_connected_15x15.png b/applications/external/hid_app/assets/Ble_connected_15x15.png
deleted file mode 100644
index 64dab9b53..000000000
Binary files a/applications/external/hid_app/assets/Ble_connected_15x15.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Ble_disconnected_15x15.png b/applications/external/hid_app/assets/Ble_disconnected_15x15.png
deleted file mode 100644
index bd54646d8..000000000
Binary files a/applications/external/hid_app/assets/Ble_disconnected_15x15.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/ButtonDown_7x4.png b/applications/external/hid_app/assets/ButtonDown_7x4.png
deleted file mode 100644
index 2954bb6a6..000000000
Binary files a/applications/external/hid_app/assets/ButtonDown_7x4.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/ButtonLeft_4x7.png b/applications/external/hid_app/assets/ButtonLeft_4x7.png
deleted file mode 100644
index 0b4655d43..000000000
Binary files a/applications/external/hid_app/assets/ButtonLeft_4x7.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/ButtonRight_4x7.png b/applications/external/hid_app/assets/ButtonRight_4x7.png
deleted file mode 100644
index 8e1c74c1c..000000000
Binary files a/applications/external/hid_app/assets/ButtonRight_4x7.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/ButtonUp_7x4.png b/applications/external/hid_app/assets/ButtonUp_7x4.png
deleted file mode 100644
index 1be79328b..000000000
Binary files a/applications/external/hid_app/assets/ButtonUp_7x4.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Button_18x18.png b/applications/external/hid_app/assets/Button_18x18.png
deleted file mode 100644
index 30a5b4fab..000000000
Binary files a/applications/external/hid_app/assets/Button_18x18.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Circles_47x47.png b/applications/external/hid_app/assets/Circles_47x47.png
deleted file mode 100644
index 6a16ebf7b..000000000
Binary files a/applications/external/hid_app/assets/Circles_47x47.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Left_mouse_icon_9x9.png b/applications/external/hid_app/assets/Left_mouse_icon_9x9.png
deleted file mode 100644
index c533d8572..000000000
Binary files a/applications/external/hid_app/assets/Left_mouse_icon_9x9.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Ok_btn_9x9.png b/applications/external/hid_app/assets/Ok_btn_9x9.png
deleted file mode 100644
index 9a1539da2..000000000
Binary files a/applications/external/hid_app/assets/Ok_btn_9x9.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Ok_btn_pressed_13x13.png b/applications/external/hid_app/assets/Ok_btn_pressed_13x13.png
deleted file mode 100644
index 6b46ba3a8..000000000
Binary files a/applications/external/hid_app/assets/Ok_btn_pressed_13x13.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Pin_arrow_up_7x9.png b/applications/external/hid_app/assets/Pin_arrow_up_7x9.png
deleted file mode 100644
index a91a6fd5e..000000000
Binary files a/applications/external/hid_app/assets/Pin_arrow_up_7x9.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Pin_back_arrow_10x8.png b/applications/external/hid_app/assets/Pin_back_arrow_10x8.png
deleted file mode 100644
index 3bafabd14..000000000
Binary files a/applications/external/hid_app/assets/Pin_back_arrow_10x8.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Pressed_Button_13x13.png b/applications/external/hid_app/assets/Pressed_Button_13x13.png
deleted file mode 100644
index 823926b84..000000000
Binary files a/applications/external/hid_app/assets/Pressed_Button_13x13.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Right_mouse_icon_9x9.png b/applications/external/hid_app/assets/Right_mouse_icon_9x9.png
deleted file mode 100644
index 446d7176c..000000000
Binary files a/applications/external/hid_app/assets/Right_mouse_icon_9x9.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Space_65x18.png b/applications/external/hid_app/assets/Space_65x18.png
deleted file mode 100644
index b60ae5097..000000000
Binary files a/applications/external/hid_app/assets/Space_65x18.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Voldwn_6x6.png b/applications/external/hid_app/assets/Voldwn_6x6.png
deleted file mode 100644
index ce487b546..000000000
Binary files a/applications/external/hid_app/assets/Voldwn_6x6.png and /dev/null differ
diff --git a/applications/external/hid_app/assets/Volup_8x6.png b/applications/external/hid_app/assets/Volup_8x6.png
deleted file mode 100644
index ee9045f7f..000000000
Binary files a/applications/external/hid_app/assets/Volup_8x6.png and /dev/null differ
diff --git a/applications/external/hid_app/hid.h b/applications/external/hid_app/hid.h
index c21d3e265..2b5a8059b 100644
--- a/applications/external/hid_app/hid.h
+++ b/applications/external/hid_app/hid.h
@@ -25,6 +25,9 @@
 #include "views/hid_tikshorts.h"
 #include "views/hid_mouse_clicker.h"
 
+#include "hid_icons.h"
+#include <assets_icons.h>
+
 #include "hid_path.h"
 
 typedef enum {
diff --git a/applications/external/hid_app/views/hid_keyboard.c b/applications/external/hid_app/views/hid_keyboard.c
index 9d29ccf5e..9b8c87b13 100644
--- a/applications/external/hid_app/views/hid_keyboard.c
+++ b/applications/external/hid_app/views/hid_keyboard.c
@@ -3,7 +3,6 @@
 #include <gui/elements.h>
 #include <gui/icon_i.h>
 #include "../hid.h"
-#include "hid_icons.h"
 
 #define TAG "HidKeyboard"
 
diff --git a/applications/external/hid_app/views/hid_keynote.c b/applications/external/hid_app/views/hid_keynote.c
index 7d0e125d7..e3d5f7a99 100644
--- a/applications/external/hid_app/views/hid_keynote.c
+++ b/applications/external/hid_app/views/hid_keynote.c
@@ -2,8 +2,6 @@
 #include <gui/elements.h>
 #include "../hid.h"
 
-#include "hid_icons.h"
-
 #define TAG "HidKeynote"
 
 struct HidKeynote {
diff --git a/applications/external/hid_app/views/hid_media.c b/applications/external/hid_app/views/hid_media.c
index 0028ac596..98f88819f 100644
--- a/applications/external/hid_app/views/hid_media.c
+++ b/applications/external/hid_app/views/hid_media.c
@@ -5,8 +5,6 @@
 #include <gui/elements.h>
 #include "../hid.h"
 
-#include "hid_icons.h"
-
 #define TAG "HidMedia"
 
 struct HidMedia {
diff --git a/applications/external/hid_app/views/hid_mouse.c b/applications/external/hid_app/views/hid_mouse.c
index 75df53dd1..e93ea3fc1 100644
--- a/applications/external/hid_app/views/hid_mouse.c
+++ b/applications/external/hid_app/views/hid_mouse.c
@@ -2,8 +2,6 @@
 #include <gui/elements.h>
 #include "../hid.h"
 
-#include "hid_icons.h"
-
 #define TAG "HidMouse"
 
 struct HidMouse {
diff --git a/applications/external/hid_app/views/hid_mouse_clicker.c b/applications/external/hid_app/views/hid_mouse_clicker.c
index d85affc43..6777034ff 100644
--- a/applications/external/hid_app/views/hid_mouse_clicker.c
+++ b/applications/external/hid_app/views/hid_mouse_clicker.c
@@ -2,8 +2,6 @@
 #include <gui/elements.h>
 #include "../hid.h"
 
-#include "hid_icons.h"
-
 #define TAG "HidMouseClicker"
 #define DEFAULT_CLICK_RATE 1
 #define MAXIMUM_CLICK_RATE 60
diff --git a/applications/external/hid_app/views/hid_mouse_jiggler.c b/applications/external/hid_app/views/hid_mouse_jiggler.c
index 09c14c668..c2ff93f60 100644
--- a/applications/external/hid_app/views/hid_mouse_jiggler.c
+++ b/applications/external/hid_app/views/hid_mouse_jiggler.c
@@ -2,8 +2,6 @@
 #include <gui/elements.h>
 #include "../hid.h"
 
-#include "hid_icons.h"
-
 #define TAG "HidMouseJiggler"
 
 struct HidMouseJiggler {
diff --git a/applications/external/hid_app/views/hid_numpad.c b/applications/external/hid_app/views/hid_numpad.c
index bd4788b83..b342bb38d 100644
--- a/applications/external/hid_app/views/hid_numpad.c
+++ b/applications/external/hid_app/views/hid_numpad.c
@@ -3,7 +3,6 @@
 #include <gui/elements.h>
 #include <gui/icon_i.h>
 #include "../hid.h"
-#include "hid_icons.h"
 
 #define TAG "HidNumpad"
 
diff --git a/applications/external/hid_app/views/hid_tikshorts.c b/applications/external/hid_app/views/hid_tikshorts.c
index 0e156fdf0..b494245cf 100644
--- a/applications/external/hid_app/views/hid_tikshorts.c
+++ b/applications/external/hid_app/views/hid_tikshorts.c
@@ -2,8 +2,6 @@
 #include "../hid.h"
 #include <gui/elements.h>
 
-#include "hid_icons.h"
-
 #define TAG "HidTikShorts"
 
 struct HidTikShorts {
diff --git a/applications/external/ir_remote/application.fam b/applications/external/ir_remote/application.fam
index 1107ae45d..e0af447c5 100644
--- a/applications/external/ir_remote/application.fam
+++ b/applications/external/ir_remote/application.fam
@@ -10,5 +10,4 @@ App(
     ],
     fap_category="Tools",
     fap_icon="ir_10px.png",
-    fap_icon_assets="images",
 )
diff --git a/applications/external/ir_remote/images/ButtonDown_7x4.png b/applications/external/ir_remote/images/ButtonDown_7x4.png
deleted file mode 100644
index 2954bb6a6..000000000
Binary files a/applications/external/ir_remote/images/ButtonDown_7x4.png and /dev/null differ
diff --git a/applications/external/ir_remote/images/ButtonLeft_4x7.png b/applications/external/ir_remote/images/ButtonLeft_4x7.png
deleted file mode 100644
index 0b4655d43..000000000
Binary files a/applications/external/ir_remote/images/ButtonLeft_4x7.png and /dev/null differ
diff --git a/applications/external/ir_remote/images/ButtonRight_4x7.png b/applications/external/ir_remote/images/ButtonRight_4x7.png
deleted file mode 100644
index 8e1c74c1c..000000000
Binary files a/applications/external/ir_remote/images/ButtonRight_4x7.png and /dev/null differ
diff --git a/applications/external/ir_remote/images/ButtonUp_7x4.png b/applications/external/ir_remote/images/ButtonUp_7x4.png
deleted file mode 100644
index 1be79328b..000000000
Binary files a/applications/external/ir_remote/images/ButtonUp_7x4.png and /dev/null differ
diff --git a/applications/external/ir_remote/images/Ok_btn_9x9.png b/applications/external/ir_remote/images/Ok_btn_9x9.png
deleted file mode 100644
index 9a1539da2..000000000
Binary files a/applications/external/ir_remote/images/Ok_btn_9x9.png and /dev/null differ
diff --git a/applications/external/ir_remote/images/back_10px.png b/applications/external/ir_remote/images/back_10px.png
deleted file mode 100644
index f9c615a99..000000000
Binary files a/applications/external/ir_remote/images/back_10px.png and /dev/null differ
diff --git a/applications/external/ir_remote/images/sub1_10px.png b/applications/external/ir_remote/images/sub1_10px.png
deleted file mode 100644
index 5a25fdf4e..000000000
Binary files a/applications/external/ir_remote/images/sub1_10px.png and /dev/null differ
diff --git a/applications/external/ir_remote/infrared_remote_app.c b/applications/external/ir_remote/infrared_remote_app.c
index 01e022755..8fc39cf59 100644
--- a/applications/external/ir_remote/infrared_remote_app.c
+++ b/applications/external/ir_remote/infrared_remote_app.c
@@ -6,7 +6,7 @@
 #include <gui/gui.h>
 #include <input/input.h>
 #include <dialogs/dialogs.h>
-#include <ir_remote_icons.h>
+#include <assets_icons.h>
 #include <dolphin/dolphin.h>
 
 #include <notification/notification.h>
diff --git a/applications/external/metronome/application.fam b/applications/external/metronome/application.fam
index 8acd4b3b0..6c964078e 100644
--- a/applications/external/metronome/application.fam
+++ b/applications/external/metronome/application.fam
@@ -8,7 +8,6 @@ App(
     ],
     fap_icon="metronome_icon.png",
     fap_category="Media",
-    fap_icon_assets="images",
     stack_size=2 * 1024,
     order=20,
 )
diff --git a/applications/external/metronome/gui_extensions.c b/applications/external/metronome/gui_extensions.c
index f33c5f651..18494098e 100644
--- a/applications/external/metronome/gui_extensions.c
+++ b/applications/external/metronome/gui_extensions.c
@@ -1,6 +1,6 @@
 #include <gui/canvas.h>
 #include <gui/icon_i.h>
-#include <metronome_icons.h>
+#include <assets_icons.h>
 
 //lib can only do bottom left/right
 void elements_button_top_left(Canvas* canvas, const char* str) {
diff --git a/applications/external/metronome/images/ButtonUp_7x4.png b/applications/external/metronome/images/ButtonUp_7x4.png
deleted file mode 100644
index 1be79328b..000000000
Binary files a/applications/external/metronome/images/ButtonUp_7x4.png and /dev/null differ
diff --git a/applications/external/mfkey32/application.fam b/applications/external/mfkey32/application.fam
index 75fa40bf6..33d932ce9 100644
--- a/applications/external/mfkey32/application.fam
+++ b/applications/external/mfkey32/application.fam
@@ -9,7 +9,7 @@ App(
         "storage",
     ],
     stack_size=1 * 1024,
-    fap_icon="mfkey.png",
+    fap_icon="images/mfkey.png",
     fap_category="NFC",
     fap_author="noproto",
     fap_icon_assets="images",
diff --git a/applications/external/mfkey32/mfkey.png b/applications/external/mfkey32/mfkey.png
deleted file mode 100644
index 52ab29efb..000000000
Binary files a/applications/external/mfkey32/mfkey.png and /dev/null differ
diff --git a/applications/external/mifare_fuzzer/application.fam b/applications/external/mifare_fuzzer/application.fam
index 13e1a72c9..a186559f2 100644
--- a/applications/external/mifare_fuzzer/application.fam
+++ b/applications/external/mifare_fuzzer/application.fam
@@ -9,7 +9,6 @@ App(
     ],
     stack_size=4 * 1024,
     order=30,
-    fap_icon="images/mifare_fuzzer_10px.png",
+    fap_icon="mifare_fuzzer_10px.png",
     fap_category="NFC",
-    fap_icon_assets="images",
 )
diff --git a/applications/external/mifare_fuzzer/images/mifare_fuzzer_10px.png b/applications/external/mifare_fuzzer/mifare_fuzzer_10px.png
similarity index 100%
rename from applications/external/mifare_fuzzer/images/mifare_fuzzer_10px.png
rename to applications/external/mifare_fuzzer/mifare_fuzzer_10px.png
diff --git a/applications/external/mousejacker/application.fam b/applications/external/mousejacker/application.fam
index 3b8ae7104..4047f3bcb 100644
--- a/applications/external/mousejacker/application.fam
+++ b/applications/external/mousejacker/application.fam
@@ -11,7 +11,6 @@ App(
     order=60,
     fap_icon="mouse_10px.png",
     fap_category="GPIO",
-    fap_icon_assets="images",
     fap_private_libs=[
         Lib(
             name="nrf24",
diff --git a/applications/external/mousejacker/images/badusb_10px.png b/applications/external/mousejacker/images/badusb_10px.png
deleted file mode 100644
index 037474aa3..000000000
Binary files a/applications/external/mousejacker/images/badusb_10px.png and /dev/null differ
diff --git a/applications/external/mousejacker/images/sub1_10px.png b/applications/external/mousejacker/images/sub1_10px.png
deleted file mode 100644
index 5a25fdf4e..000000000
Binary files a/applications/external/mousejacker/images/sub1_10px.png and /dev/null differ
diff --git a/applications/external/mousejacker/mousejacker.c b/applications/external/mousejacker/mousejacker.c
index 1727940f3..92ec1df07 100644
--- a/applications/external/mousejacker/mousejacker.c
+++ b/applications/external/mousejacker/mousejacker.c
@@ -10,7 +10,7 @@
 #include <furi_hal_resources.h>
 #include <nrf24.h>
 #include "mousejacker_ducky.h"
-#include <nrf24_mouse_jacker_icons.h>
+#include <assets_icons.h>
 #include <dolphin/dolphin.h>
 
 #define TAG "mousejacker"
@@ -112,7 +112,7 @@ static bool open_ducky_script(Stream* stream, PluginState* plugin_state) {
 
     DialogsFileBrowserOptions browser_options;
     dialog_file_browser_set_basic_options(
-        &browser_options, MOUSEJACKER_APP_PATH_EXTENSION, &I_badusb_10px);
+        &browser_options, MOUSEJACKER_APP_PATH_EXTENSION, &I_badkb_10px);
     browser_options.hide_ext = false;
 
     bool ret = dialog_file_browser_show(dialogs, path, path, &browser_options);
diff --git a/applications/external/multi_fuzzer/application.fam b/applications/external/multi_fuzzer/application.fam
index 6cd7969e1..9a765fd08 100644
--- a/applications/external/multi_fuzzer/application.fam
+++ b/applications/external/multi_fuzzer/application.fam
@@ -11,7 +11,7 @@ App(
         "notification",
     ],
     stack_size=2 * 1024,
-    fap_icon="icons/ibutt_10px.png",
+    fap_icon="ibutt_10px.png",
     fap_category="Tools",
     fap_private_libs=[
         Lib(
diff --git a/applications/external/multi_fuzzer/fuzzer_i.h b/applications/external/multi_fuzzer/fuzzer_i.h
index 5b58e59d8..c8308adbd 100644
--- a/applications/external/multi_fuzzer/fuzzer_i.h
+++ b/applications/external/multi_fuzzer/fuzzer_i.h
@@ -21,6 +21,7 @@
 
 #include <flipper_format/flipper_format_i.h>
 #include "fuzzer_icons.h"
+#include <assets_icons.h>
 
 #define FUZZ_TIME_DELAY_MAX (80)
 
@@ -52,4 +53,4 @@ typedef struct {
 
     FuzzerWorker* worker;
     FuzzerPayload* payload;
-} PacsFuzzerApp;
\ No newline at end of file
+} PacsFuzzerApp;
diff --git a/applications/external/multi_fuzzer/icons/ibutt_10px.png b/applications/external/multi_fuzzer/ibutt_10px.png
similarity index 100%
rename from applications/external/multi_fuzzer/icons/ibutt_10px.png
rename to applications/external/multi_fuzzer/ibutt_10px.png
diff --git a/applications/external/multi_fuzzer/icons/125_10px.png b/applications/external/multi_fuzzer/icons/125_10px.png
deleted file mode 100644
index ce01284a2..000000000
Binary files a/applications/external/multi_fuzzer/icons/125_10px.png and /dev/null differ
diff --git a/applications/external/multi_fuzzer/icons/ButtonLeft_4x7.png b/applications/external/multi_fuzzer/icons/ButtonLeft_4x7.png
deleted file mode 100644
index 0b4655d43..000000000
Binary files a/applications/external/multi_fuzzer/icons/ButtonLeft_4x7.png and /dev/null differ
diff --git a/applications/external/multi_fuzzer/icons/ButtonRight_4x7.png b/applications/external/multi_fuzzer/icons/ButtonRight_4x7.png
deleted file mode 100644
index 8e1c74c1c..000000000
Binary files a/applications/external/multi_fuzzer/icons/ButtonRight_4x7.png and /dev/null differ
diff --git a/applications/external/multi_fuzzer/icons/Ok_btn_9x9.png b/applications/external/multi_fuzzer/icons/Ok_btn_9x9.png
deleted file mode 100644
index 9a1539da2..000000000
Binary files a/applications/external/multi_fuzzer/icons/Ok_btn_9x9.png and /dev/null differ
diff --git a/applications/external/multi_fuzzer/icons/Pin_arrow_up_7x9.png b/applications/external/multi_fuzzer/icons/Pin_arrow_up_7x9.png
deleted file mode 100644
index a91a6fd5e..000000000
Binary files a/applications/external/multi_fuzzer/icons/Pin_arrow_up_7x9.png and /dev/null differ
diff --git a/applications/external/multi_fuzzer/icons/Pin_back_arrow_10x8.png b/applications/external/multi_fuzzer/icons/Pin_back_arrow_10x8.png
deleted file mode 100644
index 3bafabd14..000000000
Binary files a/applications/external/multi_fuzzer/icons/Pin_back_arrow_10x8.png and /dev/null differ
diff --git a/applications/external/music_beeper/application.fam b/applications/external/music_beeper/application.fam
index bdd2980bc..a5af4f37c 100644
--- a/applications/external/music_beeper/application.fam
+++ b/applications/external/music_beeper/application.fam
@@ -12,7 +12,6 @@ App(
     stack_size=2 * 1024,
     order=45,
     fap_icon="music_10px.png",
-    fap_icon_assets="icons",
     fap_category="Media",
 )
 
diff --git a/applications/external/music_beeper/music_beeper.c b/applications/external/music_beeper/music_beeper.c
index f3b4828d3..ed3021fa4 100644
--- a/applications/external/music_beeper/music_beeper.c
+++ b/applications/external/music_beeper/music_beeper.c
@@ -3,7 +3,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 
-#include <music_beeper_icons.h>
+#include <assets_icons.h>
 #include <gui/gui.h>
 #include <dialogs/dialogs.h>
 #include <storage/storage.h>
diff --git a/applications/external/music_player/application.fam b/applications/external/music_player/application.fam
index 496d7dcc8..c1379b8c5 100644
--- a/applications/external/music_player/application.fam
+++ b/applications/external/music_player/application.fam
@@ -10,9 +10,8 @@ App(
     provides=["music_player_start"],
     stack_size=2 * 1024,
     order=45,
-    fap_icon="icons/music_10px.png",
+    fap_icon="music_10px.png",
     fap_category="Media",
-    fap_icon_assets="icons",
 )
 
 App(
diff --git a/applications/external/music_beeper/icons/music_10px.png b/applications/external/music_player/music_10px.png
similarity index 100%
rename from applications/external/music_beeper/icons/music_10px.png
rename to applications/external/music_player/music_10px.png
diff --git a/applications/external/music_player/music_player.c b/applications/external/music_player/music_player.c
index 28127a575..9ef84d601 100644
--- a/applications/external/music_player/music_player.c
+++ b/applications/external/music_player/music_player.c
@@ -3,7 +3,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 
-#include <music_player_icons.h>
+#include <assets_icons.h>
 #include <gui/gui.h>
 #include <dialogs/dialogs.h>
 #include <storage/storage.h>
diff --git a/applications/external/nfc_magic/assets/DolphinCommon_56x48.png b/applications/external/nfc_magic/assets/DolphinCommon_56x48.png
deleted file mode 100644
index 089aaed83..000000000
Binary files a/applications/external/nfc_magic/assets/DolphinCommon_56x48.png and /dev/null differ
diff --git a/applications/external/nfc_magic/assets/DolphinNice_96x59.png b/applications/external/nfc_magic/assets/DolphinNice_96x59.png
deleted file mode 100644
index a299d3630..000000000
Binary files a/applications/external/nfc_magic/assets/DolphinNice_96x59.png and /dev/null differ
diff --git a/applications/external/nfc_magic/assets/NFC_manual_60x50.png b/applications/external/nfc_magic/assets/NFC_manual_60x50.png
deleted file mode 100644
index 787c0bcfe..000000000
Binary files a/applications/external/nfc_magic/assets/NFC_manual_60x50.png and /dev/null differ
diff --git a/applications/external/nfc_magic/nfc_magic_i.h b/applications/external/nfc_magic/nfc_magic_i.h
index 88bc5706f..f0c18db1a 100644
--- a/applications/external/nfc_magic/nfc_magic_i.h
+++ b/applications/external/nfc_magic/nfc_magic_i.h
@@ -30,6 +30,7 @@
 
 #include <lib/nfc/nfc_device.h>
 #include "nfc_magic_icons.h"
+#include <assets_icons.h>
 
 #define NFC_APP_FOLDER ANY_PATH("nfc")
 
diff --git a/applications/external/ocarina/application.fam b/applications/external/ocarina/application.fam
index e5d27c1bb..e6ba5b787 100644
--- a/applications/external/ocarina/application.fam
+++ b/applications/external/ocarina/application.fam
@@ -7,7 +7,6 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=30,
-    fap_icon="icons/music_10px.png",
+    fap_icon="music_10px.png",
     fap_category="Media",
-    fap_icon_assets="icons",
 )
diff --git a/applications/external/ocarina/icons/music_10px.png b/applications/external/ocarina/icons/music_10px.png
deleted file mode 100644
index d41eb0db8..000000000
Binary files a/applications/external/ocarina/icons/music_10px.png and /dev/null differ
diff --git a/applications/external/music_player/icons/music_10px.png b/applications/external/ocarina/music_10px.png
similarity index 100%
rename from applications/external/music_player/icons/music_10px.png
rename to applications/external/ocarina/music_10px.png
diff --git a/applications/external/passgen/icons/Ok_btn_9x9.png b/applications/external/passgen/icons/Ok_btn_9x9.png
deleted file mode 100644
index 9a1539da2..000000000
Binary files a/applications/external/passgen/icons/Ok_btn_9x9.png and /dev/null differ
diff --git a/applications/external/passgen/icons/Pin_back_arrow_10x8.png b/applications/external/passgen/icons/Pin_back_arrow_10x8.png
deleted file mode 100644
index 3bafabd14..000000000
Binary files a/applications/external/passgen/icons/Pin_back_arrow_10x8.png and /dev/null differ
diff --git a/applications/external/passgen/passgen.c b/applications/external/passgen/passgen.c
index 12cdc10fb..be6656f7a 100644
--- a/applications/external/passgen/passgen.c
+++ b/applications/external/passgen/passgen.c
@@ -5,6 +5,7 @@
 #include <notification/notification_messages.h>
 #include <stdlib.h>
 #include <passgen_icons.h>
+#include <assets_icons.h>
 
 #define PASSGEN_MAX_LENGTH 16
 #define PASSGEN_CHARACTERS_LENGTH (26 * 4)
diff --git a/applications/external/picopass/application.fam b/applications/external/picopass/application.fam
index c5087b804..b14427f2e 100644
--- a/applications/external/picopass/application.fam
+++ b/applications/external/picopass/application.fam
@@ -18,5 +18,4 @@ App(
             name="loclass",
         ),
     ],
-    fap_icon_assets="icons",
 )
diff --git a/applications/external/picopass/icons/DolphinMafia_115x62.png b/applications/external/picopass/icons/DolphinMafia_115x62.png
deleted file mode 100644
index 66fdb40ff..000000000
Binary files a/applications/external/picopass/icons/DolphinMafia_115x62.png and /dev/null differ
diff --git a/applications/external/picopass/icons/DolphinNice_96x59.png b/applications/external/picopass/icons/DolphinNice_96x59.png
deleted file mode 100644
index a299d3630..000000000
Binary files a/applications/external/picopass/icons/DolphinNice_96x59.png and /dev/null differ
diff --git a/applications/external/picopass/icons/Nfc_10px.png b/applications/external/picopass/icons/Nfc_10px.png
deleted file mode 100644
index 6bc027111..000000000
Binary files a/applications/external/picopass/icons/Nfc_10px.png and /dev/null differ
diff --git a/applications/external/picopass/icons/RFIDDolphinReceive_97x61.png b/applications/external/picopass/icons/RFIDDolphinReceive_97x61.png
deleted file mode 100644
index e1f5f9f80..000000000
Binary files a/applications/external/picopass/icons/RFIDDolphinReceive_97x61.png and /dev/null differ
diff --git a/applications/external/picopass/icons/RFIDDolphinSend_97x61.png b/applications/external/picopass/icons/RFIDDolphinSend_97x61.png
deleted file mode 100644
index 380a970d9..000000000
Binary files a/applications/external/picopass/icons/RFIDDolphinSend_97x61.png and /dev/null differ
diff --git a/applications/external/picopass/picopass_device.c b/applications/external/picopass/picopass_device.c
index 92fc86c73..a050e4a2c 100644
--- a/applications/external/picopass/picopass_device.c
+++ b/applications/external/picopass/picopass_device.c
@@ -2,7 +2,7 @@
 
 #include <toolbox/path.h>
 #include <flipper_format/flipper_format.h>
-#include <picopass_icons.h>
+#include <assets_icons.h>
 
 #define TAG "PicopassDevice"
 
diff --git a/applications/external/picopass/picopass_i.h b/applications/external/picopass/picopass_i.h
index 651ccc010..88c2140ee 100644
--- a/applications/external/picopass/picopass_i.h
+++ b/applications/external/picopass/picopass_i.h
@@ -26,7 +26,7 @@
 
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
-#include <picopass_icons.h>
+#include <assets_icons.h>
 
 #define PICOPASS_TEXT_STORE_SIZE 128
 
diff --git a/applications/external/pocsag_pager/images/Fishing_123x52.png b/applications/external/pocsag_pager/images/Fishing_123x52.png
deleted file mode 100644
index 1e365de8f..000000000
Binary files a/applications/external/pocsag_pager/images/Fishing_123x52.png and /dev/null differ
diff --git a/applications/external/pocsag_pager/images/Lock_7x8.png b/applications/external/pocsag_pager/images/Lock_7x8.png
deleted file mode 100644
index f7c9ca2c7..000000000
Binary files a/applications/external/pocsag_pager/images/Lock_7x8.png and /dev/null differ
diff --git a/applications/external/pocsag_pager/images/Pin_back_arrow_10x8.png b/applications/external/pocsag_pager/images/Pin_back_arrow_10x8.png
deleted file mode 100644
index 3bafabd14..000000000
Binary files a/applications/external/pocsag_pager/images/Pin_back_arrow_10x8.png and /dev/null differ
diff --git a/applications/external/pocsag_pager/images/Quest_7x8.png b/applications/external/pocsag_pager/images/Quest_7x8.png
deleted file mode 100644
index 6825247fb..000000000
Binary files a/applications/external/pocsag_pager/images/Quest_7x8.png and /dev/null differ
diff --git a/applications/external/pocsag_pager/images/Scanning_123x52.png b/applications/external/pocsag_pager/images/Scanning_123x52.png
deleted file mode 100644
index ec785948d..000000000
Binary files a/applications/external/pocsag_pager/images/Scanning_123x52.png and /dev/null differ
diff --git a/applications/external/pocsag_pager/images/Unlock_7x8.png b/applications/external/pocsag_pager/images/Unlock_7x8.png
deleted file mode 100644
index 9d82b4daf..000000000
Binary files a/applications/external/pocsag_pager/images/Unlock_7x8.png and /dev/null differ
diff --git a/applications/external/pocsag_pager/images/WarningDolphin_45x42.png b/applications/external/pocsag_pager/images/WarningDolphin_45x42.png
deleted file mode 100644
index d766ffbb4..000000000
Binary files a/applications/external/pocsag_pager/images/WarningDolphin_45x42.png and /dev/null differ
diff --git a/applications/external/pocsag_pager/views/pocsag_pager_receiver.c b/applications/external/pocsag_pager/views/pocsag_pager_receiver.c
index 64939a956..fd4461cee 100644
--- a/applications/external/pocsag_pager/views/pocsag_pager_receiver.c
+++ b/applications/external/pocsag_pager/views/pocsag_pager_receiver.c
@@ -1,6 +1,7 @@
 #include "pocsag_pager_receiver.h"
 #include "../pocsag_pager_app_i.h"
 #include <pocsag_pager_icons.h>
+#include <assets_icons.h>
 #include <math.h>
 
 #include <input/input.h>
diff --git a/applications/external/pocsag_pager/views/pocsag_pager_receiver_info.c b/applications/external/pocsag_pager/views/pocsag_pager_receiver_info.c
index 4811f3902..91ee69ab5 100644
--- a/applications/external/pocsag_pager/views/pocsag_pager_receiver_info.c
+++ b/applications/external/pocsag_pager/views/pocsag_pager_receiver_info.c
@@ -1,6 +1,7 @@
 #include "pocsag_pager_receiver.h"
 #include "../pocsag_pager_app_i.h"
 #include "pocsag_pager_icons.h"
+#include <assets_icons.h>
 #include "../protocols/pcsg_generic.h"
 #include <input/input.h>
 #include <gui/elements.h>
diff --git a/applications/external/sam/application.fam b/applications/external/sam/application.fam
index fa614304e..8a6d70c07 100644
--- a/applications/external/sam/application.fam
+++ b/applications/external/sam/application.fam
@@ -11,7 +11,6 @@ App(
     order=20,
     fap_icon="music_10px.png",
     fap_category="Media",
-    fap_icon_assets="icons",
 )
 App(
     appid="sam_yes",
@@ -26,7 +25,6 @@ App(
     order=20,
     fap_icon="music_10px.png",
     fap_category="Media",
-    fap_icon_assets="icons",
 )
 App(
     appid="sam_no",
@@ -41,7 +39,6 @@ App(
     order=20,
     fap_icon="music_10px.png",
     fap_category="Media",
-    fap_icon_assets="icons",
 )
 App(
     appid="sam_wtf",
@@ -56,5 +53,4 @@ App(
     order=20,
     fap_icon="music_10px.png",
     fap_category="Media",
-    fap_icon_assets="icons",
 )
diff --git a/applications/external/sam/icons/music_10px.png b/applications/external/sam/icons/music_10px.png
deleted file mode 100644
index d41eb0db8..000000000
Binary files a/applications/external/sam/icons/music_10px.png and /dev/null differ
diff --git a/applications/external/signal_generator/application.fam b/applications/external/signal_generator/application.fam
index 002651da4..a7b93b817 100644
--- a/applications/external/signal_generator/application.fam
+++ b/applications/external/signal_generator/application.fam
@@ -8,5 +8,4 @@ App(
     order=50,
     fap_icon="signal_gen_10px.png",
     fap_category="GPIO",
-    fap_icon_assets="icons",
 )
diff --git a/applications/external/signal_generator/icons/SmallArrowDown_3x5.png b/applications/external/signal_generator/icons/SmallArrowDown_3x5.png
deleted file mode 100644
index 1912e5d24..000000000
Binary files a/applications/external/signal_generator/icons/SmallArrowDown_3x5.png and /dev/null differ
diff --git a/applications/external/signal_generator/icons/SmallArrowUp_3x5.png b/applications/external/signal_generator/icons/SmallArrowUp_3x5.png
deleted file mode 100644
index 9c6242078..000000000
Binary files a/applications/external/signal_generator/icons/SmallArrowUp_3x5.png and /dev/null differ
diff --git a/applications/external/signal_generator/views/signal_gen_pwm.c b/applications/external/signal_generator/views/signal_gen_pwm.c
index d625ed5a9..84dc63f92 100644
--- a/applications/external/signal_generator/views/signal_gen_pwm.c
+++ b/applications/external/signal_generator/views/signal_gen_pwm.c
@@ -1,7 +1,7 @@
 #include "../signal_gen_app_i.h"
 #include <furi_hal.h>
 #include <gui/elements.h>
-#include <signal_generator_icons.h>
+#include <assets_icons.h>
 
 typedef enum {
     LineIndexChannel,
diff --git a/applications/external/simonsays/images/Connected_62x31.png b/applications/external/simonsays/images/Connected_62x31.png
deleted file mode 100644
index eeaf660b1..000000000
Binary files a/applications/external/simonsays/images/Connected_62x31.png and /dev/null differ
diff --git a/applications/external/simonsays/images/Cry_dolph_55x52.png b/applications/external/simonsays/images/Cry_dolph_55x52.png
deleted file mode 100644
index 86d9db1b4..000000000
Binary files a/applications/external/simonsays/images/Cry_dolph_55x52.png and /dev/null differ
diff --git a/applications/external/simonsays/images/DolphinMafia_115x62.png b/applications/external/simonsays/images/DolphinMafia_115x62.png
deleted file mode 100644
index 66fdb40ff..000000000
Binary files a/applications/external/simonsays/images/DolphinMafia_115x62.png and /dev/null differ
diff --git a/applications/external/simonsays/images/DolphinWait_61x59.png b/applications/external/simonsays/images/DolphinWait_61x59.png
deleted file mode 100644
index 423e07919..000000000
Binary files a/applications/external/simonsays/images/DolphinWait_61x59.png and /dev/null differ
diff --git a/applications/external/simonsays/images/WarningDolphin_45x42.png b/applications/external/simonsays/images/WarningDolphin_45x42.png
deleted file mode 100644
index d766ffbb4..000000000
Binary files a/applications/external/simonsays/images/WarningDolphin_45x42.png and /dev/null differ
diff --git a/applications/external/simonsays/simon_says.c b/applications/external/simonsays/simon_says.c
index f537cb364..ad6a68129 100644
--- a/applications/external/simonsays/simon_says.c
+++ b/applications/external/simonsays/simon_says.c
@@ -13,6 +13,7 @@
 
 /* generated by fbt from .png files in images folder */
 #include <simon_says_icons.h>
+#include <assets_icons.h>
 
 #define TAG "Simon" // Used for logging
 #define DEBUG_MSG 1
diff --git a/applications/external/spi_mem_manager/images/DolphinMafia_115x62.png b/applications/external/spi_mem_manager/images/DolphinMafia_115x62.png
deleted file mode 100644
index 66fdb40ff..000000000
Binary files a/applications/external/spi_mem_manager/images/DolphinMafia_115x62.png and /dev/null differ
diff --git a/applications/external/spi_mem_manager/images/DolphinNice_96x59.png b/applications/external/spi_mem_manager/images/DolphinNice_96x59.png
deleted file mode 100644
index a299d3630..000000000
Binary files a/applications/external/spi_mem_manager/images/DolphinNice_96x59.png and /dev/null differ
diff --git a/applications/external/spi_mem_manager/images/SDQuestion_35x43.png b/applications/external/spi_mem_manager/images/SDQuestion_35x43.png
deleted file mode 100644
index 9b9c9a58e..000000000
Binary files a/applications/external/spi_mem_manager/images/SDQuestion_35x43.png and /dev/null differ
diff --git a/applications/external/spi_mem_manager/spi_mem_app_i.h b/applications/external/spi_mem_manager/spi_mem_app_i.h
index 285ca66d2..ea7cad8cb 100644
--- a/applications/external/spi_mem_manager/spi_mem_app_i.h
+++ b/applications/external/spi_mem_manager/spi_mem_app_i.h
@@ -19,6 +19,7 @@
 #include "scenes/spi_mem_scene.h"
 #include "lib/spi/spi_mem_worker.h"
 #include "spi_mem_manager_icons.h"
+#include <assets_icons.h>
 #include "views/spi_mem_view_progress.h"
 #include "views/spi_mem_view_detect.h"
 
diff --git a/applications/external/subghz_bruteforcer/application.fam b/applications/external/subghz_bruteforcer/application.fam
index cfd354f48..6a3fdef3f 100644
--- a/applications/external/subghz_bruteforcer/application.fam
+++ b/applications/external/subghz_bruteforcer/application.fam
@@ -6,7 +6,6 @@ App(
     requires=["gui", "dialogs"],
     stack_size=2 * 1024,
     order=11,
-    fap_icon="images/subbrute_10px.png",
+    fap_icon="subbrute_10px.png",
     fap_category="Sub-GHz",
-    fap_icon_assets="images",
 )
diff --git a/applications/external/subghz_bruteforcer/images/ButtonDown_7x4.png b/applications/external/subghz_bruteforcer/images/ButtonDown_7x4.png
deleted file mode 100644
index 2954bb6a6..000000000
Binary files a/applications/external/subghz_bruteforcer/images/ButtonDown_7x4.png and /dev/null differ
diff --git a/applications/external/subghz_bruteforcer/images/ButtonUp_7x4.png b/applications/external/subghz_bruteforcer/images/ButtonUp_7x4.png
deleted file mode 100644
index 1be79328b..000000000
Binary files a/applications/external/subghz_bruteforcer/images/ButtonUp_7x4.png and /dev/null differ
diff --git a/applications/external/subghz_bruteforcer/images/DolphinNice_96x59.png b/applications/external/subghz_bruteforcer/images/DolphinNice_96x59.png
deleted file mode 100644
index a299d3630..000000000
Binary files a/applications/external/subghz_bruteforcer/images/DolphinNice_96x59.png and /dev/null differ
diff --git a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_01.png b/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_01.png
deleted file mode 100644
index 52dc4ad21..000000000
Binary files a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_01.png and /dev/null differ
diff --git a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_02.png b/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_02.png
deleted file mode 100644
index 2dff1c031..000000000
Binary files a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_02.png and /dev/null differ
diff --git a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_03.png b/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_03.png
deleted file mode 100644
index c1e438b01..000000000
Binary files a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_03.png and /dev/null differ
diff --git a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_04.png b/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_04.png
deleted file mode 100644
index 169fb6147..000000000
Binary files a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_04.png and /dev/null differ
diff --git a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_05.png b/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_05.png
deleted file mode 100644
index 79b2bc972..000000000
Binary files a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_05.png and /dev/null differ
diff --git a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_06.png b/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_06.png
deleted file mode 100644
index 8fce0c44d..000000000
Binary files a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_06.png and /dev/null differ
diff --git a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_rate b/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_rate
deleted file mode 100644
index e440e5c84..000000000
--- a/applications/external/subghz_bruteforcer/images/Sub1ghz_14/frame_rate
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/applications/external/subghz_bruteforcer/images/sub1_10px.png b/applications/external/subghz_bruteforcer/images/sub1_10px.png
deleted file mode 100644
index 5a25fdf4e..000000000
Binary files a/applications/external/subghz_bruteforcer/images/sub1_10px.png and /dev/null differ
diff --git a/applications/external/subghz_bruteforcer/images/subbrute_10px.png b/applications/external/subghz_bruteforcer/subbrute_10px.png
similarity index 100%
rename from applications/external/subghz_bruteforcer/images/subbrute_10px.png
rename to applications/external/subghz_bruteforcer/subbrute_10px.png
diff --git a/applications/external/subghz_bruteforcer/subbrute_i.h b/applications/external/subghz_bruteforcer/subbrute_i.h
index 59afaa231..4ec8f6cd3 100644
--- a/applications/external/subghz_bruteforcer/subbrute_i.h
+++ b/applications/external/subghz_bruteforcer/subbrute_i.h
@@ -16,7 +16,7 @@
 #include <gui/modules/widget.h>
 #include <gui/modules/loading.h>
 
-#include "subghz_bruteforcer_icons.h"
+#include <assets_icons.h>
 
 #include <dialogs/dialogs.h>
 
diff --git a/applications/external/subghz_playlist/application.fam b/applications/external/subghz_playlist/application.fam
index 6f74f2b55..d0d647ae2 100644
--- a/applications/external/subghz_playlist/application.fam
+++ b/applications/external/subghz_playlist/application.fam
@@ -8,5 +8,4 @@ App(
     order=14,
     fap_icon="playlist_10px.png",
     fap_category="Sub-GHz",
-    fap_icon_assets="images",
 )
diff --git a/applications/external/subghz_playlist/images/ButtonRight_4x7.png b/applications/external/subghz_playlist/images/ButtonRight_4x7.png
deleted file mode 100644
index 8e1c74c1c..000000000
Binary files a/applications/external/subghz_playlist/images/ButtonRight_4x7.png and /dev/null differ
diff --git a/applications/external/subghz_playlist/images/sub1_10px.png b/applications/external/subghz_playlist/images/sub1_10px.png
deleted file mode 100644
index 5a25fdf4e..000000000
Binary files a/applications/external/subghz_playlist/images/sub1_10px.png and /dev/null differ
diff --git a/applications/external/subghz_playlist/playlist.c b/applications/external/subghz_playlist/playlist.c
index 6576ec748..6e0fdf932 100644
--- a/applications/external/subghz_playlist/playlist.c
+++ b/applications/external/subghz_playlist/playlist.c
@@ -6,7 +6,7 @@
 #include <storage/storage.h>
 
 #include <lib/toolbox/path.h>
-#include <subghz_playlist_icons.h>
+#include <assets_icons.h>
 
 #include <lib/subghz/protocols/protocol_items.h>
 #include <flipper_format/flipper_format_i.h>
diff --git a/applications/external/subghz_remote/application.fam b/applications/external/subghz_remote/application.fam
index e2229e505..42ea9d358 100644
--- a/applications/external/subghz_remote/application.fam
+++ b/applications/external/subghz_remote/application.fam
@@ -13,7 +13,6 @@ App(
     ],
     stack_size=2 * 1024,
     order=11,
-    fap_libs=["assets"],
     fap_icon="subghz_remote_10px.png",
     fap_category="Sub-GHz",
 )
diff --git a/applications/external/subghz_remote_configurator/application.fam b/applications/external/subghz_remote_configurator/application.fam
index 5589349a0..4604a509b 100644
--- a/applications/external/subghz_remote_configurator/application.fam
+++ b/applications/external/subghz_remote_configurator/application.fam
@@ -11,6 +11,5 @@ App(
     order=50,
     fap_description="File Editor for the SubGhz Remote app",
     fap_category="Sub-Ghz",
-    fap_icon_assets="icons",
-    fap_icon="icons/subrem_10px.png",
+    fap_icon="subrem_10px.png",
 )
diff --git a/applications/external/subghz_remote_configurator/icons/DolphinNice_96x59.png b/applications/external/subghz_remote_configurator/icons/DolphinNice_96x59.png
deleted file mode 100644
index a299d3630..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/DolphinNice_96x59.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonDown_7x4.png b/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonDown_7x4.png
deleted file mode 100644
index 2954bb6a6..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonDown_7x4.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonLeft_4x7.png b/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonLeft_4x7.png
deleted file mode 100644
index 0b4655d43..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonLeft_4x7.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonRight_4x7.png b/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonRight_4x7.png
deleted file mode 100644
index 8e1c74c1c..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonRight_4x7.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonUp_7x4.png b/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonUp_7x4.png
deleted file mode 100644
index 1be79328b..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonUp_7x4.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/icons/remote_scene/Ok_btn_9x9.png b/applications/external/subghz_remote_configurator/icons/remote_scene/Ok_btn_9x9.png
deleted file mode 100644
index 9a1539da2..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/remote_scene/Ok_btn_9x9.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_arrow_up_7x9.png b/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_arrow_up_7x9.png
deleted file mode 100644
index a91a6fd5e..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_arrow_up_7x9.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_cell_13x13.png b/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_cell_13x13.png
deleted file mode 100644
index 1b1ff0c2f..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_cell_13x13.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_star_7x7.png b/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_star_7x7.png
deleted file mode 100644
index 42fdea86e..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_star_7x7.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/icons/remote_scene/back_10px.png b/applications/external/subghz_remote_configurator/icons/remote_scene/back_10px.png
deleted file mode 100644
index f9c615a99..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/remote_scene/back_10px.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/icons/sub1_10px.png b/applications/external/subghz_remote_configurator/icons/sub1_10px.png
deleted file mode 100644
index 5a25fdf4e..000000000
Binary files a/applications/external/subghz_remote_configurator/icons/sub1_10px.png and /dev/null differ
diff --git a/applications/external/subghz_remote_configurator/subghz_remote_app_i.h b/applications/external/subghz_remote_configurator/subghz_remote_app_i.h
index 0bc1c19c2..f096a7d46 100644
--- a/applications/external/subghz_remote_configurator/subghz_remote_app_i.h
+++ b/applications/external/subghz_remote_configurator/subghz_remote_app_i.h
@@ -5,7 +5,7 @@
 #include "scenes/subrem_scene.h"
 
 #include "helpers/txrx/subghz_txrx.h"
-#include <subrem_configurator_icons.h>
+#include <assets_icons.h>
 
 #include "views/remote.h"
 #include "views/edit_menu.h"
diff --git a/applications/external/subghz_remote_configurator/icons/subrem_10px.png b/applications/external/subghz_remote_configurator/subrem_10px.png
similarity index 100%
rename from applications/external/subghz_remote_configurator/icons/subrem_10px.png
rename to applications/external/subghz_remote_configurator/subrem_10px.png
diff --git a/applications/external/swd_probe/icons/ButtonDown_7x4.png b/applications/external/swd_probe/icons/ButtonDown_7x4.png
deleted file mode 100644
index 2954bb6a6..000000000
Binary files a/applications/external/swd_probe/icons/ButtonDown_7x4.png and /dev/null differ
diff --git a/applications/external/swd_probe/icons/ButtonUp_7x4.png b/applications/external/swd_probe/icons/ButtonUp_7x4.png
deleted file mode 100644
index 1be79328b..000000000
Binary files a/applications/external/swd_probe/icons/ButtonUp_7x4.png and /dev/null differ
diff --git a/applications/external/swd_probe/swd_probe_app.c b/applications/external/swd_probe/swd_probe_app.c
index 5b646141d..3e15cd02c 100644
--- a/applications/external/swd_probe/swd_probe_app.c
+++ b/applications/external/swd_probe/swd_probe_app.c
@@ -2,6 +2,7 @@
 
 #include "swd_probe_app.h"
 #include "swd_probe_icons.h"
+#include <assets_icons.h>
 #include "jep106.h"
 #include "adi.h"
 
diff --git a/applications/external/timelapse/icons/ButtonDown_7x4.png b/applications/external/timelapse/icons/ButtonDown_7x4.png
deleted file mode 100644
index 2954bb6a6..000000000
Binary files a/applications/external/timelapse/icons/ButtonDown_7x4.png and /dev/null differ
diff --git a/applications/external/timelapse/icons/ButtonLeft_4x7.png b/applications/external/timelapse/icons/ButtonLeft_4x7.png
deleted file mode 100644
index 0b4655d43..000000000
Binary files a/applications/external/timelapse/icons/ButtonLeft_4x7.png and /dev/null differ
diff --git a/applications/external/timelapse/icons/ButtonRight_4x7.png b/applications/external/timelapse/icons/ButtonRight_4x7.png
deleted file mode 100644
index 8e1c74c1c..000000000
Binary files a/applications/external/timelapse/icons/ButtonRight_4x7.png and /dev/null differ
diff --git a/applications/external/timelapse/icons/ButtonUp_7x4.png b/applications/external/timelapse/icons/ButtonUp_7x4.png
deleted file mode 100644
index 1be79328b..000000000
Binary files a/applications/external/timelapse/icons/ButtonUp_7x4.png and /dev/null differ
diff --git a/applications/external/timelapse/icons/Pin_star_7x7.png b/applications/external/timelapse/icons/Pin_star_7x7.png
deleted file mode 100644
index 42fdea86e..000000000
Binary files a/applications/external/timelapse/icons/Pin_star_7x7.png and /dev/null differ
diff --git a/applications/external/timelapse/icons/loading_10px.png b/applications/external/timelapse/icons/loading_10px.png
deleted file mode 100644
index 4f626b3d5..000000000
Binary files a/applications/external/timelapse/icons/loading_10px.png and /dev/null differ
diff --git a/applications/external/timelapse/zeitraffer.c b/applications/external/timelapse/zeitraffer.c
index c5430bfdb..859d256ee 100644
--- a/applications/external/timelapse/zeitraffer.c
+++ b/applications/external/timelapse/zeitraffer.c
@@ -6,6 +6,7 @@
 #include <flipper_format/flipper_format.h>
 #include "gpio_item.h"
 #include "gpio_timelapse_icons.h"
+#include <assets_icons.h>
 
 #define CONFIG_FILE_DIRECTORY_PATH "/ext/apps_data/timelapse"
 #define CONFIG_FILE_PATH CONFIG_FILE_DIRECTORY_PATH "/timelapse.conf"
diff --git a/applications/external/totp/images/DolphinCommon_56x48.png b/applications/external/totp/images/DolphinCommon_56x48.png
deleted file mode 100644
index 089aaed83..000000000
Binary files a/applications/external/totp/images/DolphinCommon_56x48.png and /dev/null differ
diff --git a/applications/external/totp/ui/scenes/app_settings/totp_app_settings.c b/applications/external/totp/ui/scenes/app_settings/totp_app_settings.c
index bf76b7c82..0f2e0cf86 100644
--- a/applications/external/totp/ui/scenes/app_settings/totp_app_settings.c
+++ b/applications/external/totp/ui/scenes/app_settings/totp_app_settings.c
@@ -1,6 +1,7 @@
 #include "totp_app_settings.h"
 #include <math.h>
 #include <totp_icons.h>
+#include <assets_icons.h>
 #include "../../ui_controls.h"
 #include "../../common_dialogs.h"
 #include "../../scene_director.h"
diff --git a/applications/external/totp/ui/scenes/authenticate/totp_scene_authenticate.c b/applications/external/totp/ui/scenes/authenticate/totp_scene_authenticate.c
index 218e5e397..23a919ed7 100644
--- a/applications/external/totp/ui/scenes/authenticate/totp_scene_authenticate.c
+++ b/applications/external/totp/ui/scenes/authenticate/totp_scene_authenticate.c
@@ -1,6 +1,7 @@
 #include "totp_scene_authenticate.h"
 #include <dialogs/dialogs.h>
 #include <totp_icons.h>
+#include <assets_icons.h>
 #include "../../../types/common.h"
 #include "../../constants.h"
 #include "../../../services/config/config.h"
diff --git a/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c b/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c
index da99623fd..ab1b730d3 100644
--- a/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c
+++ b/applications/external/totp/ui/scenes/generate_token/totp_scene_generate_token.c
@@ -2,6 +2,7 @@
 #include <notification/notification.h>
 #include <notification/notification_messages.h>
 #include <totp_icons.h>
+#include <assets_icons.h>
 #include <roll_value.h>
 #include "totp_scene_generate_token.h"
 #include "../../../types/token_info.h"
diff --git a/applications/external/totp/ui/scenes/standby/standby.c b/applications/external/totp/ui/scenes/standby/standby.c
index 5cd6bae6a..8524cf2a8 100644
--- a/applications/external/totp/ui/scenes/standby/standby.c
+++ b/applications/external/totp/ui/scenes/standby/standby.c
@@ -1,5 +1,6 @@
 #include "standby.h"
 #include <totp_icons.h>
+#include <assets_icons.h>
 #include "../../constants.h"
 
 void totp_scene_standby_render(Canvas* const canvas) {
@@ -9,4 +10,4 @@ void totp_scene_standby_render(Canvas* const canvas) {
     canvas_draw_str_aligned(canvas, 5, 10, AlignLeft, AlignTop, "CLI command");
 
     canvas_draw_str_aligned(canvas, 5, 24, AlignLeft, AlignTop, "is running now");
-}
\ No newline at end of file
+}
diff --git a/applications/external/totp/ui/ui_controls.c b/applications/external/totp/ui/ui_controls.c
index d5e86aa58..c6ad3e1fe 100644
--- a/applications/external/totp/ui/ui_controls.c
+++ b/applications/external/totp/ui/ui_controls.c
@@ -1,5 +1,6 @@
 #include "ui_controls.h"
 #include <totp_icons.h>
+#include <assets_icons.h>
 #include "constants.h"
 
 #define TEXT_BOX_HEIGHT (13)
diff --git a/applications/external/uart_terminal/application.fam b/applications/external/uart_terminal/application.fam
index eb879458e..3f57ba314 100644
--- a/applications/external/uart_terminal/application.fam
+++ b/applications/external/uart_terminal/application.fam
@@ -8,5 +8,4 @@ App(
     order=90,
     fap_icon="uart_terminal.png",
     fap_category="GPIO",
-    fap_icon_assets="assets",
 )
diff --git a/applications/external/uart_terminal/assets/KeyBackspaceSelected_16x9.png b/applications/external/uart_terminal/assets/KeyBackspaceSelected_16x9.png
deleted file mode 100644
index 7cc0759a8..000000000
Binary files a/applications/external/uart_terminal/assets/KeyBackspaceSelected_16x9.png and /dev/null differ
diff --git a/applications/external/uart_terminal/assets/KeyBackspace_16x9.png b/applications/external/uart_terminal/assets/KeyBackspace_16x9.png
deleted file mode 100644
index 9946232d9..000000000
Binary files a/applications/external/uart_terminal/assets/KeyBackspace_16x9.png and /dev/null differ
diff --git a/applications/external/uart_terminal/assets/KeySaveSelected_24x11.png b/applications/external/uart_terminal/assets/KeySaveSelected_24x11.png
deleted file mode 100644
index eeb3569d3..000000000
Binary files a/applications/external/uart_terminal/assets/KeySaveSelected_24x11.png and /dev/null differ
diff --git a/applications/external/uart_terminal/assets/KeySave_24x11.png b/applications/external/uart_terminal/assets/KeySave_24x11.png
deleted file mode 100644
index e7dba987a..000000000
Binary files a/applications/external/uart_terminal/assets/KeySave_24x11.png and /dev/null differ
diff --git a/applications/external/uart_terminal/assets/WarningDolphin_45x42.png b/applications/external/uart_terminal/assets/WarningDolphin_45x42.png
deleted file mode 100644
index d766ffbb4..000000000
Binary files a/applications/external/uart_terminal/assets/WarningDolphin_45x42.png and /dev/null differ
diff --git a/applications/external/uart_terminal/uart_text_input.c b/applications/external/uart_terminal/uart_text_input.c
index 7d400b81e..62884550d 100644
--- a/applications/external/uart_terminal/uart_text_input.c
+++ b/applications/external/uart_terminal/uart_text_input.c
@@ -1,6 +1,6 @@
 #include "uart_text_input.h"
 #include <gui/elements.h>
-#include "uart_terminal_icons.h"
+#include <assets_icons.h>
 #include "uart_terminal_app_i.h"
 #include <furi.h>
 
diff --git a/applications/external/unitemp/application.fam b/applications/external/unitemp/application.fam
index b0e0aa6ee..ec865dff9 100644
--- a/applications/external/unitemp/application.fam
+++ b/applications/external/unitemp/application.fam
@@ -14,5 +14,4 @@ App(
     fap_category="GPIO",
     fap_icon="icon.png",
     fap_icon_assets="assets",
-    fap_libs=["assets"],
 )
diff --git a/applications/external/wav_player/application.fam b/applications/external/wav_player/application.fam
index c71527c9d..f3a6ec251 100644
--- a/applications/external/wav_player/application.fam
+++ b/applications/external/wav_player/application.fam
@@ -7,5 +7,4 @@ App(
     order=46,
     fap_icon="wav_10px.png",
     fap_category="Media",
-    fap_icon_assets="images",
 )
diff --git a/applications/external/wav_player/images/music_10px.png b/applications/external/wav_player/images/music_10px.png
deleted file mode 100644
index d41eb0db8..000000000
Binary files a/applications/external/wav_player/images/music_10px.png and /dev/null differ
diff --git a/applications/external/wav_player/wav_player.c b/applications/external/wav_player/wav_player.c
index 3a48f41e8..2fa590f9e 100644
--- a/applications/external/wav_player/wav_player.c
+++ b/applications/external/wav_player/wav_player.c
@@ -12,7 +12,7 @@
 #include "wav_player_view.h"
 #include <math.h>
 
-#include <wav_player_icons.h>
+#include <assets_icons.h>
 
 #define TAG "WavPlayer"
 
diff --git a/applications/external/weather_station/images/Fishing_123x52.png b/applications/external/weather_station/images/Fishing_123x52.png
deleted file mode 100644
index 1e365de8f..000000000
Binary files a/applications/external/weather_station/images/Fishing_123x52.png and /dev/null differ
diff --git a/applications/external/weather_station/images/Lock_7x8.png b/applications/external/weather_station/images/Lock_7x8.png
deleted file mode 100644
index f7c9ca2c7..000000000
Binary files a/applications/external/weather_station/images/Lock_7x8.png and /dev/null differ
diff --git a/applications/external/weather_station/images/Pin_back_arrow_10x8.png b/applications/external/weather_station/images/Pin_back_arrow_10x8.png
deleted file mode 100644
index 3bafabd14..000000000
Binary files a/applications/external/weather_station/images/Pin_back_arrow_10x8.png and /dev/null differ
diff --git a/applications/external/weather_station/images/Quest_7x8.png b/applications/external/weather_station/images/Quest_7x8.png
deleted file mode 100644
index 6825247fb..000000000
Binary files a/applications/external/weather_station/images/Quest_7x8.png and /dev/null differ
diff --git a/applications/external/weather_station/images/Scanning_123x52.png b/applications/external/weather_station/images/Scanning_123x52.png
deleted file mode 100644
index ec785948d..000000000
Binary files a/applications/external/weather_station/images/Scanning_123x52.png and /dev/null differ
diff --git a/applications/external/weather_station/images/Unlock_7x8.png b/applications/external/weather_station/images/Unlock_7x8.png
deleted file mode 100644
index 9d82b4daf..000000000
Binary files a/applications/external/weather_station/images/Unlock_7x8.png and /dev/null differ
diff --git a/applications/external/weather_station/images/WarningDolphin_45x42.png b/applications/external/weather_station/images/WarningDolphin_45x42.png
deleted file mode 100644
index d766ffbb4..000000000
Binary files a/applications/external/weather_station/images/WarningDolphin_45x42.png and /dev/null differ
diff --git a/applications/external/weather_station/views/weather_station_receiver.c b/applications/external/weather_station/views/weather_station_receiver.c
index e994e7830..22f5343f1 100644
--- a/applications/external/weather_station/views/weather_station_receiver.c
+++ b/applications/external/weather_station/views/weather_station_receiver.c
@@ -1,6 +1,7 @@
 #include "weather_station_receiver.h"
 #include "../weather_station_app_i.h"
 #include <weather_station_icons.h>
+#include <assets_icons.h>
 #include <math.h>
 
 #include <input/input.h>
diff --git a/applications/external/weather_station/views/weather_station_receiver_info.c b/applications/external/weather_station/views/weather_station_receiver_info.c
index b3b3f2193..c58993a98 100644
--- a/applications/external/weather_station/views/weather_station_receiver_info.c
+++ b/applications/external/weather_station/views/weather_station_receiver_info.c
@@ -1,6 +1,7 @@
 #include "weather_station_receiver.h"
 #include "../weather_station_app_i.h"
 #include "weather_station_icons.h"
+#include <assets_icons.h>
 #include "../protocols/ws_generic.h"
 #include <input/input.h>
 #include <gui/elements.h>
diff --git a/applications/external/wifi_marauder_companion/assets/DolphinCommon_56x48.png b/applications/external/wifi_marauder_companion/assets/DolphinCommon_56x48.png
deleted file mode 100644
index 089aaed83..000000000
Binary files a/applications/external/wifi_marauder_companion/assets/DolphinCommon_56x48.png and /dev/null differ
diff --git a/applications/external/wifi_marauder_companion/assets/KeyBackspaceSelected_16x9.png b/applications/external/wifi_marauder_companion/assets/KeyBackspaceSelected_16x9.png
deleted file mode 100644
index 7cc0759a8..000000000
Binary files a/applications/external/wifi_marauder_companion/assets/KeyBackspaceSelected_16x9.png and /dev/null differ
diff --git a/applications/external/wifi_marauder_companion/assets/KeyBackspace_16x9.png b/applications/external/wifi_marauder_companion/assets/KeyBackspace_16x9.png
deleted file mode 100644
index 9946232d9..000000000
Binary files a/applications/external/wifi_marauder_companion/assets/KeyBackspace_16x9.png and /dev/null differ
diff --git a/applications/external/wifi_marauder_companion/assets/KeyKeyboardSelected_10x11.png b/applications/external/wifi_marauder_companion/assets/KeyKeyboardSelected_10x11.png
deleted file mode 100644
index 231880386..000000000
Binary files a/applications/external/wifi_marauder_companion/assets/KeyKeyboardSelected_10x11.png and /dev/null differ
diff --git a/applications/external/wifi_marauder_companion/assets/KeyKeyboard_10x11.png b/applications/external/wifi_marauder_companion/assets/KeyKeyboard_10x11.png
deleted file mode 100644
index 1f4c03478..000000000
Binary files a/applications/external/wifi_marauder_companion/assets/KeyKeyboard_10x11.png and /dev/null differ
diff --git a/applications/external/wifi_marauder_companion/assets/KeySaveSelected_24x11.png b/applications/external/wifi_marauder_companion/assets/KeySaveSelected_24x11.png
deleted file mode 100644
index eeb3569d3..000000000
Binary files a/applications/external/wifi_marauder_companion/assets/KeySaveSelected_24x11.png and /dev/null differ
diff --git a/applications/external/wifi_marauder_companion/assets/KeySave_24x11.png b/applications/external/wifi_marauder_companion/assets/KeySave_24x11.png
deleted file mode 100644
index e7dba987a..000000000
Binary files a/applications/external/wifi_marauder_companion/assets/KeySave_24x11.png and /dev/null differ
diff --git a/applications/external/wifi_marauder_companion/assets/WarningDolphin_45x42.png b/applications/external/wifi_marauder_companion/assets/WarningDolphin_45x42.png
deleted file mode 100644
index d766ffbb4..000000000
Binary files a/applications/external/wifi_marauder_companion/assets/WarningDolphin_45x42.png and /dev/null differ
diff --git a/applications/external/wifi_marauder_companion/wifi_marauder_app_i.h b/applications/external/wifi_marauder_companion/wifi_marauder_app_i.h
index d6a0d37c7..9e24d3964 100644
--- a/applications/external/wifi_marauder_companion/wifi_marauder_app_i.h
+++ b/applications/external/wifi_marauder_companion/wifi_marauder_app_i.h
@@ -22,6 +22,7 @@
 #include "wifi_marauder_text_input.h"
 
 #include <esp32_wifi_marauder_icons.h>
+#include <assets_icons.h>
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
 #include <dialogs/dialogs.h>
diff --git a/applications/external/yatzee/application.fam b/applications/external/yatzee/application.fam
index 1c59d634b..45f0f181f 100644
--- a/applications/external/yatzee/application.fam
+++ b/applications/external/yatzee/application.fam
@@ -6,7 +6,7 @@ App(
     requires=["gui"],
     stack_size=4 * 1024,
     order=99,
-    fap_icon="images/yatzee_icon_10px.png",
+    fap_icon="yatzee_icon_10px.png",
     fap_category="Games",
     fap_icon_assets="images",
 )
diff --git a/applications/external/yatzee/images/yatzee_icon_10px.png b/applications/external/yatzee/yatzee_icon_10px.png
similarity index 100%
rename from applications/external/yatzee/images/yatzee_icon_10px.png
rename to applications/external/yatzee/yatzee_icon_10px.png
diff --git a/applications/main/bad_kb/application.fam b/applications/main/bad_kb/application.fam
index 74764f8b8..165634967 100644
--- a/applications/main/bad_kb/application.fam
+++ b/applications/main/bad_kb/application.fam
@@ -11,5 +11,4 @@ App(
     stack_size=2 * 1024,
     icon="A_BadKb_14",
     order=70,
-    fap_libs=["assets"],
 )
diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam
index f18b8318e..0e99eb45a 100644
--- a/applications/main/gpio/application.fam
+++ b/applications/main/gpio/application.fam
@@ -8,5 +8,4 @@ App(
     stack_size=1 * 1024,
     icon="A_GPIO_14",
     order=50,
-    fap_libs=["assets"],
 )
diff --git a/applications/main/ibutton/application.fam b/applications/main/ibutton/application.fam
index e5f2907af..f37f98a5c 100644
--- a/applications/main/ibutton/application.fam
+++ b/applications/main/ibutton/application.fam
@@ -13,7 +13,6 @@ App(
     icon="A_iButton_14",
     stack_size=2 * 1024,
     order=60,
-    fap_libs=["assets"],
 )
 
 App(
diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam
index c08cb80bd..5c65cd079 100644
--- a/applications/main/infrared/application.fam
+++ b/applications/main/infrared/application.fam
@@ -13,7 +13,6 @@ App(
     icon="A_Infrared_14",
     stack_size=3 * 1024,
     order=40,
-    fap_libs=["assets"],
 )
 
 App(
diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam
index 60d5f8ac2..aa887cdd7 100644
--- a/applications/main/lfrfid/application.fam
+++ b/applications/main/lfrfid/application.fam
@@ -15,7 +15,6 @@ App(
     icon="A_125khz_14",
     stack_size=2 * 1024,
     order=20,
-    fap_libs=["assets"],
 )
 
 App(
diff --git a/applications/main/u2f/application.fam b/applications/main/u2f/application.fam
index 82010ffb4..6b32e0225 100644
--- a/applications/main/u2f/application.fam
+++ b/applications/main/u2f/application.fam
@@ -11,5 +11,4 @@ App(
     stack_size=2 * 1024,
     icon="A_U2F_14",
     order=80,
-    fap_libs=["assets"],
 )
diff --git a/applications/main/xtreme_app/application.fam b/applications/main/xtreme_app/application.fam
index fe8d59bd9..854e72199 100644
--- a/applications/main/xtreme_app/application.fam
+++ b/applications/main/xtreme_app/application.fam
@@ -11,5 +11,4 @@ App(
     stack_size=2 * 1024,
     icon="A_Xtreme_14",
     order=90,
-    fap_libs=["assets"],
 )
diff --git a/assets/SConscript b/assets/SConscript
index 9bd273626..87242b78a 100644
--- a/assets/SConscript
+++ b/assets/SConscript
@@ -9,8 +9,9 @@ assetsenv = env.Clone(
 )
 assetsenv.ApplyLibFlags()
 
+icons_path = assetsenv.Dir("#/build/icons") if assetsenv["IS_BASE_FIRMWARE"] else assetsenv.Dir("compiled")
 icons = assetsenv.CompileIcons(
-    assetsenv.Dir("compiled"), assetsenv.Dir("#/assets/icons")
+    icons_path, assetsenv.Dir("#/assets/icons")
 )
 assetsenv.Alias("icons", icons)
 
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 734862ceb..6b70d8481 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -39,6 +39,7 @@ Header,+,applications/services/notification/notification_messages.h,,
 Header,+,applications/services/power/power_service/power.h,,
 Header,+,applications/services/rpc/rpc_app.h,,
 Header,+,applications/services/storage/storage.h,,
+Header,+,build/icons/assets_icons.h,,
 Header,+,firmware/targets/f7/furi_hal/furi_hal_bus.h,,
 Header,+,firmware/targets/f7/furi_hal/furi_hal_clock.h,,
 Header,+,firmware/targets/f7/furi_hal/furi_hal_console.h,,
@@ -3245,7 +3246,208 @@ Function,-,yn,double,"int, double"
 Function,-,ynf,float,"int, float"
 Variable,-,AHBPrescTable,const uint32_t[16],
 Variable,-,APBPrescTable,const uint32_t[8],
+Variable,+,A_125khz_14,Icon,
+Variable,+,A_BadKb_14,Icon,
+Variable,+,A_GPIO_14,Icon,
+Variable,+,A_Infrared_14,Icon,
+Variable,+,A_Levelup_128x64,Icon,
+Variable,+,A_Loading_24,Icon,
+Variable,+,A_NFC_14,Icon,
+Variable,+,A_Plugins_14,Icon,
+Variable,+,A_Round_loader_8x8,Icon,
+Variable,+,A_Settings_14,Icon,
+Variable,+,A_Sub1ghz_14,Icon,
+Variable,+,A_U2F_14,Icon,
+Variable,+,A_Xtreme_14,Icon,
+Variable,+,A_iButton_14,Icon,
+Variable,+,ICON_PATHS,const IconPath[],
+Variable,+,ICON_PATHS_COUNT,const size_t,
 Variable,-,ITM_RxBuffer,volatile int32_t,
+Variable,+,I_125_10px,Icon,
+Variable,+,I_ActiveConnection_50x64,Icon,
+Variable,+,I_Apps_10px,Icon,
+Variable,+,I_ArrowC_1_36x36,Icon,
+Variable,+,I_ArrowUpEmpty_14x15,Icon,
+Variable,+,I_ArrowUpFilled_14x15,Icon,
+Variable,+,I_Auth_62x31,Icon,
+Variable,+,I_BLE_Pairing_128x64,Icon,
+Variable,+,I_Background_128x11,Icon,
+Variable,+,I_BatteryBody_52x28,Icon,
+Variable,+,I_Battery_16x16,Icon,
+Variable,+,I_Battery_25x8,Icon,
+Variable,+,I_Ble_connected_15x15,Icon,
+Variable,+,I_Ble_disconnected_15x15,Icon,
+Variable,+,I_Bluetooth_Connected_16x8,Icon,
+Variable,+,I_Bluetooth_Idle_5x8,Icon,
+Variable,+,I_ButtonCenter_7x7,Icon,
+Variable,+,I_ButtonDown_7x4,Icon,
+Variable,+,I_ButtonLeftSmall_3x5,Icon,
+Variable,+,I_ButtonLeft_4x7,Icon,
+Variable,+,I_ButtonRightSmall_3x5,Icon,
+Variable,+,I_ButtonRight_4x7,Icon,
+Variable,+,I_ButtonUp_7x4,Icon,
+Variable,+,I_Button_18x18,Icon,
+Variable,+,I_CC_Bluetooth_16x16,Icon,
+Variable,+,I_CC_DarkMode_16x16,Icon,
+Variable,+,I_CC_LefthandedMode_16x16,Icon,
+Variable,+,I_CC_Lock_16x16,Icon,
+Variable,+,I_CC_Settings_16x16,Icon,
+Variable,+,I_CC_Xtreme_16x16,Icon,
+Variable,+,I_Certification1_103x56,Icon,
+Variable,+,I_Certification2_98x33,Icon,
+Variable,+,I_Charging_lightning_9x10,Icon,
+Variable,+,I_Charging_lightning_mask_9x10,Icon,
+Variable,+,I_Circles_47x47,Icon,
+Variable,+,I_Clock_18x18,Icon,
+Variable,+,I_Connect_me_62x31,Icon,
+Variable,+,I_Connected_62x31,Icon,
+Variable,+,I_CoolHi_25x27,Icon,
+Variable,+,I_CoolHi_hvr_25x27,Icon,
+Variable,+,I_CoolLo_25x27,Icon,
+Variable,+,I_CoolLo_hvr_25x27,Icon,
+Variable,+,I_Cry_dolph_55x52,Icon,
+Variable,+,I_DFU_128x50,Icon,
+Variable,+,I_Dehumidify_25x27,Icon,
+Variable,+,I_Dehumidify_hvr_25x27,Icon,
+Variable,+,I_DolphinCommon_56x48,Icon,
+Variable,+,I_DolphinMafia_115x62,Icon,
+Variable,+,I_DolphinNice_96x59,Icon,
+Variable,+,I_DolphinReadingSuccess_59x63,Icon,
+Variable,+,I_DolphinWait_61x59,Icon,
+Variable,+,I_Down_25x27,Icon,
+Variable,+,I_Down_hvr_25x27,Icon,
+Variable,+,I_Drive_112x35,Icon,
+Variable,+,I_Dynamic_9x7,Icon,
+Variable,+,I_Erase_pin_128x64,Icon,
+Variable,+,I_Error_18x18,Icon,
+Variable,+,I_Error_62x31,Icon,
+Variable,+,I_EviSmile1_18x21,Icon,
+Variable,+,I_EviSmile2_18x21,Icon,
+Variable,+,I_EviWaiting1_18x21,Icon,
+Variable,+,I_EviWaiting2_18x21,Icon,
+Variable,+,I_Exit_25x27,Icon,
+Variable,+,I_Exit_hvr_25x27,Icon,
+Variable,+,I_FaceCharging_29x14,Icon,
+Variable,+,I_FaceConfused_29x14,Icon,
+Variable,+,I_FaceNopower_29x14,Icon,
+Variable,+,I_FaceNormal_29x14,Icon,
+Variable,+,I_Fishing_123x52,Icon,
+Variable,+,I_Flash_25x27,Icon,
+Variable,+,I_Flash_hvr_25x27,Icon,
+Variable,+,I_Health_16x16,Icon,
+Variable,+,I_HeatHi_25x27,Icon,
+Variable,+,I_HeatHi_hvr_25x27,Icon,
+Variable,+,I_HeatLo_25x27,Icon,
+Variable,+,I_HeatLo_hvr_25x27,Icon,
+Variable,+,I_Hidden_window_9x8,Icon,
+Variable,+,I_InfraredArrowDown_4x8,Icon,
+Variable,+,I_InfraredArrowUp_4x8,Icon,
+Variable,+,I_InfraredLearnShort_128x31,Icon,
+Variable,+,I_Input_25x27,Icon,
+Variable,+,I_Input_hvr_25x27,Icon,
+Variable,+,I_KeyBackspaceSelected_16x9,Icon,
+Variable,+,I_KeyBackspace_16x9,Icon,
+Variable,+,I_KeyKeyboardSelected_10x11,Icon,
+Variable,+,I_KeyKeyboard_10x11,Icon,
+Variable,+,I_KeySaveSelected_24x11,Icon,
+Variable,+,I_KeySave_24x11,Icon,
+Variable,+,I_Keychain_39x36,Icon,
+Variable,+,I_Left_mouse_icon_9x9,Icon,
+Variable,+,I_Lock_7x8,Icon,
+Variable,+,I_Lockscreen,Icon,
+Variable,+,I_MHz_25x11,Icon,
+Variable,+,I_Mode_25x27,Icon,
+Variable,+,I_Mode_hvr_25x27,Icon,
+Variable,+,I_Modern_reader_18x34,Icon,
+Variable,+,I_Move_flipper_26x39,Icon,
+Variable,+,I_Mute_25x27,Icon,
+Variable,+,I_Mute_hvr_25x27,Icon,
+Variable,+,I_Muted_8x8,Icon,
+Variable,+,I_NFC_dolphin_emulation_47x61,Icon,
+Variable,+,I_NFC_manual_60x50,Icon,
+Variable,+,I_Nfc_10px,Icon,
+Variable,+,I_Off_25x27,Icon,
+Variable,+,I_Off_hvr_25x27,Icon,
+Variable,+,I_Ok_btn_9x9,Icon,
+Variable,+,I_Ok_btn_pressed_13x13,Icon,
+Variable,+,I_Pause_25x27,Icon,
+Variable,+,I_Pause_hvr_25x27,Icon,
+Variable,+,I_Percent_10x14,Icon,
+Variable,+,I_Pin_arrow_up_7x9,Icon,
+Variable,+,I_Pin_attention_dpad_29x29,Icon,
+Variable,+,I_Pin_back_arrow_10x8,Icon,
+Variable,+,I_Pin_cell_13x13,Icon,
+Variable,+,I_Pin_pointer_5x3,Icon,
+Variable,+,I_Pin_star_7x7,Icon,
+Variable,+,I_Play_25x27,Icon,
+Variable,+,I_Play_hvr_25x27,Icon,
+Variable,+,I_Power_25x27,Icon,
+Variable,+,I_Power_hvr_25x27,Icon,
+Variable,+,I_Pressed_Button_13x13,Icon,
+Variable,+,I_Quest_7x8,Icon,
+Variable,+,I_RFIDDolphinReceive_97x61,Icon,
+Variable,+,I_RFIDDolphinSend_97x61,Icon,
+Variable,+,I_RFIDDolphinSuccess_108x57,Icon,
+Variable,+,I_RFIDSmallChip_14x14,Icon,
+Variable,+,I_Raw_9x7,Icon,
+Variable,+,I_Release_arrow_18x15,Icon,
+Variable,+,I_Right_mouse_icon_9x9,Icon,
+Variable,+,I_Rotate_25x27,Icon,
+Variable,+,I_Rotate_hvr_25x27,Icon,
+Variable,+,I_Rpc_active_7x8,Icon,
+Variable,+,I_SDQuestion_35x43,Icon,
+Variable,+,I_SDcardFail_11x8,Icon,
+Variable,+,I_SDcardMounted_11x8,Icon,
+Variable,+,I_Scanning_123x52,Icon,
+Variable,+,I_SmallArrowDown_3x5,Icon,
+Variable,+,I_SmallArrowUp_3x5,Icon,
+Variable,+,I_Smile_18x18,Icon,
+Variable,+,I_Space_65x18,Icon,
+Variable,+,I_Static_9x7,Icon,
+Variable,+,I_Stop_25x27,Icon,
+Variable,+,I_Stop_hvr_25x27,Icon,
+Variable,+,I_Temperature_16x16,Icon,
+Variable,+,I_Timer_25x27,Icon,
+Variable,+,I_Timer_hvr_25x27,Icon,
+Variable,+,I_TrackNext_25x27,Icon,
+Variable,+,I_TrackNext_hvr_25x27,Icon,
+Variable,+,I_TrackPrev_25x27,Icon,
+Variable,+,I_TrackPrev_hvr_25x27,Icon,
+Variable,+,I_Unlock_7x8,Icon,
+Variable,+,I_Unplug_bg_bottom_128x10,Icon,
+Variable,+,I_Unplug_bg_top_128x14,Icon,
+Variable,+,I_Up_25x27,Icon,
+Variable,+,I_Up_hvr_25x27,Icon,
+Variable,+,I_Updating_32x40,Icon,
+Variable,+,I_UsbTree_48x22,Icon,
+Variable,+,I_Vol_down_25x27,Icon,
+Variable,+,I_Vol_down_hvr_25x27,Icon,
+Variable,+,I_Vol_up_25x27,Icon,
+Variable,+,I_Vol_up_hvr_25x27,Icon,
+Variable,+,I_Voldwn_6x6,Icon,
+Variable,+,I_Voltage_16x16,Icon,
+Variable,+,I_Volup_8x6,Icon,
+Variable,+,I_WarningDolphin_45x42,Icon,
+Variable,+,I_Warning_30x23,Icon,
+Variable,+,I_back_10px,Icon,
+Variable,+,I_badkb_10px,Icon,
+Variable,+,I_dir_10px,Icon,
+Variable,+,I_iButtonDolphinVerySuccess_108x52,Icon,
+Variable,+,I_iButtonKey_49x44,Icon,
+Variable,+,I_ibutt_10px,Icon,
+Variable,+,I_ir_10px,Icon,
+Variable,+,I_keyboard_10px,Icon,
+Variable,+,I_loading_10px,Icon,
+Variable,+,I_music_10px,Icon,
+Variable,+,I_passport_DB,Icon,
+Variable,+,I_passport_bad_46x49,Icon,
+Variable,+,I_passport_happy_46x49,Icon,
+Variable,+,I_passport_okay_46x49,Icon,
+Variable,+,I_sub1_10px,Icon,
+Variable,+,I_subrem_10px,Icon,
+Variable,+,I_u2f_10px,Icon,
+Variable,+,I_unknown_10px,Icon,
+Variable,+,I_update_10px,Icon,
 Variable,-,MSIRangeTable,const uint32_t[16],
 Variable,-,SmpsPrescalerTable,const uint32_t[4][6],
 Variable,+,SystemCoreClock,uint32_t,
diff --git a/lib/SConscript b/lib/SConscript
index 3344a5661..711f281f1 100644
--- a/lib/SConscript
+++ b/lib/SConscript
@@ -26,6 +26,7 @@ env.Append(
         "#/lib/mlib",
         # Ugly hack
         Dir("../assets/compiled"),
+        Dir("../../icons"),
     ],
     SDK_HEADERS=[
         *(
@@ -43,6 +44,7 @@ env.Append(
                 "variant",
             )
         ),
+        File("../../icons/assets_icons.h"),
         File("xtreme/xtreme.h"),
     ],
     CPPDEFINES=[