diff --git a/applications/debug/file_browser_test/application.fam b/applications/debug/file_browser_test/application.fam
index 5e4c7f467..4a401a649 100644
--- a/applications/debug/file_browser_test/application.fam
+++ b/applications/debug/file_browser_test/application.fam
@@ -8,4 +8,5 @@ App(
     stack_size=2 * 1024,
     order=150,
     fap_category="Debug",
+    fap_icon_assets="icons",
 )
diff --git a/applications/debug/file_browser_test/file_browser_app.c b/applications/debug/file_browser_test/file_browser_app.c
index 5c7b93bcb..6cb50d385 100644
--- a/applications/debug/file_browser_test/file_browser_app.c
+++ b/applications/debug/file_browser_test/file_browser_app.c
@@ -1,4 +1,4 @@
-#include "assets_icons.h"
+#include <file_browser_test_icons.h>
 #include "file_browser_app_i.h"
 #include "gui/modules/file_browser.h"
 #include <furi.h>
diff --git a/applications/debug/file_browser_test/icons/badusb_10px.png b/applications/debug/file_browser_test/icons/badusb_10px.png
new file mode 100644
index 000000000..037474aa3
Binary files /dev/null and b/applications/debug/file_browser_test/icons/badusb_10px.png differ
diff --git a/applications/examples/example_images/ReadMe.md b/applications/examples/example_images/ReadMe.md
new file mode 100644
index 000000000..d884a0a97
--- /dev/null
+++ b/applications/examples/example_images/ReadMe.md
@@ -0,0 +1,24 @@
+# Application icons
+To use icons, do the following:
+* add a line to the application manifest: `fap_icon_assets="folder"`, where `folder` points to the folder where your icons are located
+* add `#include "application_id_icons.h"` to the application code, where `application_id` is the appid from the manifest
+* every icon in the folder will be available as a `I_icon_name` variable, where `icon_name` is the name of the icon file without the extension
+
+## Example
+We have an application with the following manifest:
+```
+App(
+    appid="example_images",
+    ...
+    fap_icon_assets="images",
+)
+```
+
+So the icons are in the `images` folder and will be available in the generated `example_images_icons.h` file.
+
+The example code is located in `example_images_main.c` and contains the following line:
+```
+#include "example_images_icons.h"
+```
+
+Image `dolphin_71x25.png` is available as `I_dolphin_71x25`.
diff --git a/applications/main/bad_usb/bad_usb_app_i.h b/applications/main/bad_usb/bad_usb_app_i.h
index 85fd56ff0..f333c36d8 100644
--- a/applications/main/bad_usb/bad_usb_app_i.h
+++ b/applications/main/bad_usb/bad_usb_app_i.h
@@ -5,6 +5,7 @@
 #include "bad_usb_script.h"
 
 #include <gui/gui.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <gui/modules/submenu.h>
diff --git a/applications/main/bad_usb/views/bad_usb_view.c b/applications/main/bad_usb/views/bad_usb_view.c
index 6c6a15847..e5c5d92a3 100644
--- a/applications/main/bad_usb/views/bad_usb_view.c
+++ b/applications/main/bad_usb/views/bad_usb_view.c
@@ -1,6 +1,7 @@
 #include "bad_usb_view.h"
 #include "../bad_usb_script.h"
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 #define MAX_NAME_LEN 64
 
diff --git a/applications/main/fap_loader/fap_loader_app.c b/applications/main/fap_loader/fap_loader_app.c
index faf8eefc8..9b4c92335 100644
--- a/applications/main/fap_loader/fap_loader_app.c
+++ b/applications/main/fap_loader/fap_loader_app.c
@@ -1,5 +1,6 @@
 #include <furi.h>
 #include <gui/gui.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <storage/storage.h>
 #include <gui/modules/loading.h>
diff --git a/applications/main/gpio/gpio_app_i.h b/applications/main/gpio/gpio_app_i.h
index fff35c95a..85c5c332e 100644
--- a/applications/main/gpio/gpio_app_i.h
+++ b/applications/main/gpio/gpio_app_i.h
@@ -15,6 +15,7 @@
 #include <gui/modules/widget.h>
 #include "views/gpio_test.h"
 #include "views/gpio_usb_uart.h"
+#include <assets_icons.h>
 
 struct GpioApp {
     Gui* gui;
diff --git a/applications/main/ibutton/ibutton_i.h b/applications/main/ibutton/ibutton_i.h
index a9515195e..0a8099351 100644
--- a/applications/main/ibutton/ibutton_i.h
+++ b/applications/main/ibutton/ibutton_i.h
@@ -4,6 +4,7 @@
 
 #include <gui/gui.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <notification/notification_messages.h>
diff --git a/applications/main/infrared/infrared_i.h b/applications/main/infrared/infrared_i.h
index 6d25d1609..5b555e4bb 100644
--- a/applications/main/infrared/infrared_i.h
+++ b/applications/main/infrared/infrared_i.h
@@ -2,6 +2,7 @@
 
 #include <gui/gui.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <gui/view_stack.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
diff --git a/applications/main/lfrfid/lfrfid_i.h b/applications/main/lfrfid/lfrfid_i.h
index 71917c0c2..72b061930 100644
--- a/applications/main/lfrfid/lfrfid_i.h
+++ b/applications/main/lfrfid/lfrfid_i.h
@@ -5,6 +5,7 @@
 
 #include <gui/gui.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <cli/cli.h>
diff --git a/applications/main/lfrfid/views/lfrfid_view_read.c b/applications/main/lfrfid/views/lfrfid_view_read.c
index 0d4db6178..094afb617 100644
--- a/applications/main/lfrfid/views/lfrfid_view_read.c
+++ b/applications/main/lfrfid/views/lfrfid_view_read.c
@@ -1,5 +1,6 @@
 #include "lfrfid_view_read.h"
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 #define TEMP_STR_LEN 128
 
diff --git a/applications/main/nfc/nfc_i.h b/applications/main/nfc/nfc_i.h
index fa5b54edc..e9b36a3e9 100644
--- a/applications/main/nfc/nfc_i.h
+++ b/applications/main/nfc/nfc_i.h
@@ -7,6 +7,7 @@
 
 #include <gui/gui.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <cli/cli.h>
diff --git a/applications/main/nfc/views/detect_reader.c b/applications/main/nfc/views/detect_reader.c
index 2dbb4338b..91537868b 100644
--- a/applications/main/nfc/views/detect_reader.c
+++ b/applications/main/nfc/views/detect_reader.c
@@ -1,5 +1,5 @@
 #include "detect_reader.h"
-
+#include <assets_icons.h>
 #include <gui/elements.h>
 
 struct DetectReader {
diff --git a/applications/main/subghz/subghz_i.h b/applications/main/subghz/subghz_i.h
index 09830ba05..46768cf02 100644
--- a/applications/main/subghz/subghz_i.h
+++ b/applications/main/subghz/subghz_i.h
@@ -13,6 +13,7 @@
 #include "views/subghz_test_packet.h"
 
 #include <gui/gui.h>
+#include <assets_icons.h>
 #include <dialogs/dialogs.h>
 #include <gui/scene_manager.h>
 #include <notification/notification_messages.h>
diff --git a/applications/main/u2f/u2f_app_i.h b/applications/main/u2f/u2f_app_i.h
index 53647859a..2896684c3 100644
--- a/applications/main/u2f/u2f_app_i.h
+++ b/applications/main/u2f/u2f_app_i.h
@@ -4,6 +4,7 @@
 #include "scenes/u2f_scene.h"
 
 #include <gui/gui.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <gui/modules/submenu.h>
diff --git a/applications/main/u2f/views/u2f_view.c b/applications/main/u2f/views/u2f_view.c
index fa3d6cc24..181c495d0 100644
--- a/applications/main/u2f/views/u2f_view.c
+++ b/applications/main/u2f/views/u2f_view.c
@@ -1,5 +1,6 @@
 #include "u2f_view.h"
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 struct U2fView {
     View* view;
diff --git a/applications/plugins/bt_hid_app/assets/ButtonDown_7x4.png b/applications/plugins/bt_hid_app/assets/ButtonDown_7x4.png
new file mode 100644
index 000000000..2954bb6a6
Binary files /dev/null and b/applications/plugins/bt_hid_app/assets/ButtonDown_7x4.png differ
diff --git a/applications/plugins/bt_hid_app/assets/ButtonLeft_4x7.png b/applications/plugins/bt_hid_app/assets/ButtonLeft_4x7.png
new file mode 100644
index 000000000..0b4655d43
Binary files /dev/null and b/applications/plugins/bt_hid_app/assets/ButtonLeft_4x7.png differ
diff --git a/applications/plugins/bt_hid_app/assets/ButtonRight_4x7.png b/applications/plugins/bt_hid_app/assets/ButtonRight_4x7.png
new file mode 100644
index 000000000..8e1c74c1c
Binary files /dev/null and b/applications/plugins/bt_hid_app/assets/ButtonRight_4x7.png differ
diff --git a/applications/plugins/bt_hid_app/assets/ButtonUp_7x4.png b/applications/plugins/bt_hid_app/assets/ButtonUp_7x4.png
new file mode 100644
index 000000000..1be79328b
Binary files /dev/null and b/applications/plugins/bt_hid_app/assets/ButtonUp_7x4.png differ
diff --git a/applications/plugins/bt_hid_app/assets/Ok_btn_9x9.png b/applications/plugins/bt_hid_app/assets/Ok_btn_9x9.png
new file mode 100644
index 000000000..9a1539da2
Binary files /dev/null and b/applications/plugins/bt_hid_app/assets/Ok_btn_9x9.png differ
diff --git a/applications/plugins/bt_hid_app/assets/Pin_arrow_down_7x9.png b/applications/plugins/bt_hid_app/assets/Pin_arrow_down_7x9.png
new file mode 100644
index 000000000..9687397af
Binary files /dev/null and b/applications/plugins/bt_hid_app/assets/Pin_arrow_down_7x9.png differ
diff --git a/applications/plugins/bt_hid_app/assets/Pin_arrow_left_9x7.png b/applications/plugins/bt_hid_app/assets/Pin_arrow_left_9x7.png
new file mode 100644
index 000000000..fb4ded78f
Binary files /dev/null and b/applications/plugins/bt_hid_app/assets/Pin_arrow_left_9x7.png differ
diff --git a/applications/plugins/bt_hid_app/assets/Pin_arrow_right_9x7.png b/applications/plugins/bt_hid_app/assets/Pin_arrow_right_9x7.png
new file mode 100644
index 000000000..97648d176
Binary files /dev/null and b/applications/plugins/bt_hid_app/assets/Pin_arrow_right_9x7.png differ
diff --git a/applications/plugins/bt_hid_app/assets/Pin_arrow_up_7x9.png b/applications/plugins/bt_hid_app/assets/Pin_arrow_up_7x9.png
new file mode 100644
index 000000000..a91a6fd5e
Binary files /dev/null and b/applications/plugins/bt_hid_app/assets/Pin_arrow_up_7x9.png differ
diff --git a/applications/plugins/bt_hid_app/assets/Pin_back_arrow_10x8.png b/applications/plugins/bt_hid_app/assets/Pin_back_arrow_10x8.png
new file mode 100644
index 000000000..3bafabd14
Binary files /dev/null and b/applications/plugins/bt_hid_app/assets/Pin_back_arrow_10x8.png differ
diff --git a/applications/plugins/music_player/application.fam b/applications/plugins/music_player/application.fam
index 76787e097..a36988983 100644
--- a/applications/plugins/music_player/application.fam
+++ b/applications/plugins/music_player/application.fam
@@ -11,8 +11,9 @@ App(
     provides=["music_player_start"],
     stack_size=2 * 1024,
     order=20,
-    fap_icon="../../../assets/icons/Archive/music_10px.png",
+    fap_icon="icons/music_10px.png",
     fap_category="Misc",
+    fap_icon_assets="icons",
 )
 
 App(
diff --git a/applications/plugins/music_player/icons/music_10px.png b/applications/plugins/music_player/icons/music_10px.png
new file mode 100644
index 000000000..d41eb0db8
Binary files /dev/null and b/applications/plugins/music_player/icons/music_10px.png differ
diff --git a/applications/plugins/music_player/music_player.c b/applications/plugins/music_player/music_player.c
index 192500c2e..28872284b 100644
--- a/applications/plugins/music_player/music_player.c
+++ b/applications/plugins/music_player/music_player.c
@@ -3,7 +3,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 
-#include <assets_icons.h>
+#include <music_player_icons.h>
 #include <gui/gui.h>
 #include <dialogs/dialogs.h>
 #include <storage/storage.h>
diff --git a/applications/plugins/picopass/application.fam b/applications/plugins/picopass/application.fam
index bbe37e064..88460b4ff 100644
--- a/applications/plugins/picopass/application.fam
+++ b/applications/plugins/picopass/application.fam
@@ -17,4 +17,5 @@ App(
             name="loclass",
         ),
     ],
+    fap_icon_assets="icons",
 )
diff --git a/applications/plugins/picopass/icons/DolphinMafia_115x62.png b/applications/plugins/picopass/icons/DolphinMafia_115x62.png
new file mode 100644
index 000000000..66fdb40ff
Binary files /dev/null and b/applications/plugins/picopass/icons/DolphinMafia_115x62.png differ
diff --git a/applications/plugins/picopass/icons/DolphinNice_96x59.png b/applications/plugins/picopass/icons/DolphinNice_96x59.png
new file mode 100644
index 000000000..a299d3630
Binary files /dev/null and b/applications/plugins/picopass/icons/DolphinNice_96x59.png differ
diff --git a/applications/plugins/picopass/icons/Nfc_10px.png b/applications/plugins/picopass/icons/Nfc_10px.png
new file mode 100644
index 000000000..6bc027111
Binary files /dev/null and b/applications/plugins/picopass/icons/Nfc_10px.png differ
diff --git a/applications/plugins/picopass/icons/RFIDDolphinReceive_97x61.png b/applications/plugins/picopass/icons/RFIDDolphinReceive_97x61.png
new file mode 100644
index 000000000..e1f5f9f80
Binary files /dev/null and b/applications/plugins/picopass/icons/RFIDDolphinReceive_97x61.png differ
diff --git a/applications/plugins/picopass/icons/RFIDDolphinSend_97x61.png b/applications/plugins/picopass/icons/RFIDDolphinSend_97x61.png
new file mode 100644
index 000000000..380a970d9
Binary files /dev/null and b/applications/plugins/picopass/icons/RFIDDolphinSend_97x61.png differ
diff --git a/applications/plugins/picopass/picopass_device.c b/applications/plugins/picopass/picopass_device.c
index b6e69cc21..199b79e97 100644
--- a/applications/plugins/picopass/picopass_device.c
+++ b/applications/plugins/picopass/picopass_device.c
@@ -2,6 +2,7 @@
 
 #include <toolbox/path.h>
 #include <flipper_format/flipper_format.h>
+#include <picopass_icons.h>
 
 #define TAG "PicopassDevice"
 
diff --git a/applications/plugins/picopass/picopass_i.h b/applications/plugins/picopass/picopass_i.h
index 8e011f222..469a672b7 100644
--- a/applications/plugins/picopass/picopass_i.h
+++ b/applications/plugins/picopass/picopass_i.h
@@ -24,6 +24,7 @@
 
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
+#include <picopass_icons.h>
 
 #define PICOPASS_TEXT_STORE_SIZE 128
 
diff --git a/applications/plugins/signal_generator/application.fam b/applications/plugins/signal_generator/application.fam
index 7794ee492..de915733c 100644
--- a/applications/plugins/signal_generator/application.fam
+++ b/applications/plugins/signal_generator/application.fam
@@ -9,4 +9,5 @@ App(
     order=50,
     fap_icon="signal_gen_10px.png",
     fap_category="Tools",
+    fap_icon_assets="icons",
 )
diff --git a/applications/plugins/signal_generator/icons/SmallArrowDown_3x5.png b/applications/plugins/signal_generator/icons/SmallArrowDown_3x5.png
new file mode 100644
index 000000000..1912e5d24
Binary files /dev/null and b/applications/plugins/signal_generator/icons/SmallArrowDown_3x5.png differ
diff --git a/applications/plugins/signal_generator/icons/SmallArrowUp_3x5.png b/applications/plugins/signal_generator/icons/SmallArrowUp_3x5.png
new file mode 100644
index 000000000..9c6242078
Binary files /dev/null and b/applications/plugins/signal_generator/icons/SmallArrowUp_3x5.png differ
diff --git a/applications/plugins/signal_generator/views/signal_gen_pwm.c b/applications/plugins/signal_generator/views/signal_gen_pwm.c
index 6d1a3c1ba..8e618f8a9 100644
--- a/applications/plugins/signal_generator/views/signal_gen_pwm.c
+++ b/applications/plugins/signal_generator/views/signal_gen_pwm.c
@@ -1,6 +1,7 @@
 #include "../signal_gen_app_i.h"
 #include "furi_hal.h"
 #include <gui/elements.h>
+#include <signal_generator_icons.h>
 
 typedef enum {
     LineIndexChannel,
diff --git a/applications/plugins/weather_station/images/Lock_7x8.png b/applications/plugins/weather_station/images/Lock_7x8.png
new file mode 100644
index 000000000..f7c9ca2c7
Binary files /dev/null and b/applications/plugins/weather_station/images/Lock_7x8.png differ
diff --git a/applications/plugins/weather_station/images/Pin_back_arrow_10x8.png b/applications/plugins/weather_station/images/Pin_back_arrow_10x8.png
new file mode 100644
index 000000000..3bafabd14
Binary files /dev/null and b/applications/plugins/weather_station/images/Pin_back_arrow_10x8.png differ
diff --git a/applications/plugins/weather_station/images/Quest_7x8.png b/applications/plugins/weather_station/images/Quest_7x8.png
new file mode 100644
index 000000000..6825247fb
Binary files /dev/null and b/applications/plugins/weather_station/images/Quest_7x8.png differ
diff --git a/applications/plugins/weather_station/images/Scanning_123x52.png b/applications/plugins/weather_station/images/Scanning_123x52.png
new file mode 100644
index 000000000..ec785948d
Binary files /dev/null and b/applications/plugins/weather_station/images/Scanning_123x52.png differ
diff --git a/applications/plugins/weather_station/images/Unlock_7x8.png b/applications/plugins/weather_station/images/Unlock_7x8.png
new file mode 100644
index 000000000..9d82b4daf
Binary files /dev/null and b/applications/plugins/weather_station/images/Unlock_7x8.png differ
diff --git a/applications/plugins/weather_station/images/WarningDolphin_45x42.png b/applications/plugins/weather_station/images/WarningDolphin_45x42.png
new file mode 100644
index 000000000..d766ffbb4
Binary files /dev/null and b/applications/plugins/weather_station/images/WarningDolphin_45x42.png differ
diff --git a/applications/plugins/weather_station/views/weather_station_receiver.c b/applications/plugins/weather_station/views/weather_station_receiver.c
index d30b7926b..61b152602 100644
--- a/applications/plugins/weather_station/views/weather_station_receiver.c
+++ b/applications/plugins/weather_station/views/weather_station_receiver.c
@@ -1,11 +1,10 @@
 #include "weather_station_receiver.h"
 #include "../weather_station_app_i.h"
-#include "weather_station_icons.h"
+#include <weather_station_icons.h>
 #include <math.h>
 
 #include <input/input.h>
 #include <gui/elements.h>
-#include <assets_icons.h>
 #include <m-array.h>
 
 #define FRAME_HEIGHT 12
diff --git a/applications/services/bt/bt_service/bt.c b/applications/services/bt/bt_service/bt.c
index c003013e4..62b5ab109 100644
--- a/applications/services/bt/bt_service/bt.c
+++ b/applications/services/bt/bt_service/bt.c
@@ -4,6 +4,7 @@
 
 #include <notification/notification_messages.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 #define TAG "BtSrv"
 
diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c
index 8cb8a7a12..486be23b5 100644
--- a/applications/services/desktop/views/desktop_view_lock_menu.c
+++ b/applications/services/desktop/views/desktop_view_lock_menu.c
@@ -1,5 +1,6 @@
 #include <furi.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 #include "../desktop_i.h"
 #include "desktop_view_lock_menu.h"
diff --git a/applications/services/desktop/views/desktop_view_locked.c b/applications/services/desktop/views/desktop_view_locked.c
index 915b26103..d18ed6c98 100644
--- a/applications/services/desktop/views/desktop_view_locked.c
+++ b/applications/services/desktop/views/desktop_view_locked.c
@@ -4,6 +4,7 @@
 #include <gui/elements.h>
 #include <gui/icon.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <portmacro.h>
 
 #include <desktop/desktop_settings.h>
diff --git a/applications/services/desktop/views/desktop_view_pin_input.c b/applications/services/desktop/views/desktop_view_pin_input.c
index bf05f06b9..b86bf2929 100644
--- a/applications/services/desktop/views/desktop_view_pin_input.c
+++ b/applications/services/desktop/views/desktop_view_pin_input.c
@@ -2,6 +2,7 @@
 #include <furi.h>
 #include <gui/view.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 #include <stdint.h>
 #include <portmacro.h>
 
diff --git a/applications/services/dialogs/dialogs_api.c b/applications/services/dialogs/dialogs_api.c
index 6fd51782d..ee959a33c 100644
--- a/applications/services/dialogs/dialogs_api.c
+++ b/applications/services/dialogs/dialogs_api.c
@@ -1,6 +1,7 @@
 #include "dialogs/dialogs_message.h"
 #include "dialogs_i.h"
 #include "dialogs_api_lock.h"
+#include <assets_icons.h>
 
 /****************** File browser ******************/
 
diff --git a/applications/services/gui/canvas.h b/applications/services/gui/canvas.h
index a67e58494..a3df5adc7 100644
--- a/applications/services/gui/canvas.h
+++ b/applications/services/gui/canvas.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 #include <gui/icon_animation.h>
-#include <assets_icons.h>
+#include <gui/icon.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/applications/services/gui/gui.c b/applications/services/gui/gui.c
index 42712ed90..2d06d70c7 100644
--- a/applications/services/gui/gui.c
+++ b/applications/services/gui/gui.c
@@ -1,5 +1,6 @@
 #include "gui/canvas.h"
 #include "gui_i.h"
+#include <assets_icons.h>
 
 #define TAG "GuiSrv"
 
diff --git a/applications/services/gui/icon_animation.h b/applications/services/gui/icon_animation.h
index dab9d996d..684790353 100644
--- a/applications/services/gui/icon_animation.h
+++ b/applications/services/gui/icon_animation.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <assets_icons.h>
+#include <gui/icon.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/applications/services/gui/modules/button_menu.c b/applications/services/gui/modules/button_menu.c
index 37a04326a..ff12a9311 100644
--- a/applications/services/gui/modules/button_menu.c
+++ b/applications/services/gui/modules/button_menu.c
@@ -5,6 +5,7 @@
 #include <m-array.h>
 #include <furi.h>
 #include <stdint.h>
+#include <assets_icons.h>
 
 #define ITEM_FIRST_OFFSET 17
 #define ITEM_NEXT_OFFSET 4
diff --git a/applications/services/gui/modules/byte_input.c b/applications/services/gui/modules/byte_input.c
index 8d7e7fd4f..bc19f0eee 100644
--- a/applications/services/gui/modules/byte_input.c
+++ b/applications/services/gui/modules/byte_input.c
@@ -1,6 +1,7 @@
-#include "byte_input.h"
-#include <gui/elements.h>
 #include <furi.h>
+#include <gui/elements.h>
+#include <assets_icons.h>
+#include "byte_input.h"
 
 struct ByteInput {
     View* view;
diff --git a/applications/services/gui/modules/menu.c b/applications/services/gui/modules/menu.c
index db0717f77..6983e0108 100644
--- a/applications/services/gui/modules/menu.c
+++ b/applications/services/gui/modules/menu.c
@@ -2,6 +2,7 @@
 
 #include <m-array.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 #include <furi.h>
 
 struct Menu {
diff --git a/applications/services/gui/modules/text_input.c b/applications/services/gui/modules/text_input.c
index 79fa87728..540e4b7c4 100644
--- a/applications/services/gui/modules/text_input.c
+++ b/applications/services/gui/modules/text_input.c
@@ -1,5 +1,6 @@
 #include "text_input.h"
 #include <gui/elements.h>
+#include <assets_icons.h>
 #include <furi.h>
 
 struct TextInput {
diff --git a/applications/services/power/power_service/power_i.h b/applications/services/power/power_service/power_i.h
index 66ced885b..8cb5140d7 100644
--- a/applications/services/power/power_service/power_i.h
+++ b/applications/services/power/power_service/power_i.h
@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <gui/view_dispatcher.h>
 #include <gui/gui.h>
+#include <assets_icons.h>
 
 #include <gui/modules/popup.h>
 #include "views/power_off.h"
diff --git a/applications/services/power/power_service/views/power_off.c b/applications/services/power/power_service/views/power_off.c
index b0046325c..f14a18d7e 100644
--- a/applications/services/power/power_service/views/power_off.c
+++ b/applications/services/power/power_service/views/power_off.c
@@ -1,6 +1,7 @@
 #include "power_off.h"
 #include <furi.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 struct PowerOff {
     View* view;
diff --git a/applications/services/power/power_service/views/power_unplug_usb.c b/applications/services/power/power_service/views/power_unplug_usb.c
index 5632cd8b0..c2d61139e 100644
--- a/applications/services/power/power_service/views/power_unplug_usb.c
+++ b/applications/services/power/power_service/views/power_unplug_usb.c
@@ -1,6 +1,7 @@
 #include "power_unplug_usb.h"
 #include <furi.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 struct PowerUnplugUsb {
     View* view;
diff --git a/applications/services/storage/storage.c b/applications/services/storage/storage.c
index 9079a95ed..700408c9d 100644
--- a/applications/services/storage/storage.c
+++ b/applications/services/storage/storage.c
@@ -5,6 +5,7 @@
 #include "storage/storage_glue.h"
 #include "storages/storage_int.h"
 #include "storages/storage_ext.h"
+#include <assets_icons.h>
 
 #define STORAGE_TICK 1000
 
diff --git a/applications/settings/about/about.c b/applications/settings/about/about.c
index a42969b2b..1719e188d 100644
--- a/applications/settings/about/about.c
+++ b/applications/settings/about/about.c
@@ -3,6 +3,7 @@
 #include <gui/gui.h>
 #include <gui/view_dispatcher.h>
 #include <gui/modules/empty_screen.h>
+#include <assets_icons.h>
 #include <furi_hal_version.h>
 #include <furi_hal_region.h>
 #include <furi_hal_bt.h>
diff --git a/applications/settings/bt_settings_app/bt_settings_app.h b/applications/settings/bt_settings_app/bt_settings_app.h
index c45ff3db0..b79e36951 100644
--- a/applications/settings/bt_settings_app/bt_settings_app.h
+++ b/applications/settings/bt_settings_app/bt_settings_app.h
@@ -6,6 +6,7 @@
 #include <gui/view.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
+#include <assets_icons.h>
 
 #include <gui/modules/variable_item_list.h>
 #include <gui/modules/dialog_ex.h>
diff --git a/applications/settings/desktop_settings/desktop_settings_app.h b/applications/settings/desktop_settings/desktop_settings_app.h
index fc56c3253..6f97564c9 100644
--- a/applications/settings/desktop_settings/desktop_settings_app.h
+++ b/applications/settings/desktop_settings/desktop_settings_app.h
@@ -7,6 +7,7 @@
 #include <gui/modules/submenu.h>
 #include <gui/modules/variable_item_list.h>
 #include <dialogs/dialogs.h>
+#include <assets_icons.h>
 
 #include <desktop/desktop_settings.h>
 #include <desktop/views/desktop_view_pin_input.h>
diff --git a/applications/settings/power_settings_app/power_settings_app.h b/applications/settings/power_settings_app/power_settings_app.h
index 8429b54b4..cd05846c0 100644
--- a/applications/settings/power_settings_app/power_settings_app.h
+++ b/applications/settings/power_settings_app/power_settings_app.h
@@ -6,6 +6,7 @@
 #include <gui/view.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
+#include <assets_icons.h>
 
 #include "views/battery_info.h"
 #include <gui/modules/submenu.h>
diff --git a/applications/settings/power_settings_app/views/battery_info.c b/applications/settings/power_settings_app/views/battery_info.c
index 1a8bc71ec..e1b7adb4b 100644
--- a/applications/settings/power_settings_app/views/battery_info.c
+++ b/applications/settings/power_settings_app/views/battery_info.c
@@ -1,6 +1,7 @@
 #include "battery_info.h"
 #include <furi.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 struct BatteryInfo {
     View* view;
diff --git a/applications/settings/storage_settings/storage_settings.h b/applications/settings/storage_settings/storage_settings.h
index 4cf185e0c..664e74c84 100644
--- a/applications/settings/storage_settings/storage_settings.h
+++ b/applications/settings/storage_settings/storage_settings.h
@@ -4,6 +4,7 @@
 #include <gui/view.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
+#include <assets_icons.h>
 #include <notification/notification_messages.h>
 
 #include <gui/modules/submenu.h>
diff --git a/applications/system/updater/views/updater_main.c b/applications/system/updater/views/updater_main.c
index 5ed3c70aa..1199cc882 100644
--- a/applications/system/updater/views/updater_main.c
+++ b/applications/system/updater/views/updater_main.c
@@ -2,6 +2,7 @@
 #include <gui/view.h>
 #include <gui/elements.h>
 #include <gui/canvas.h>
+#include <assets_icons.h>
 #include <furi.h>
 #include <input/input.h>
 
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index fd11dffe0..00ba30c24 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,6.0,,
+Version,+,7.0,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -2661,191 +2661,7 @@ 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,const Icon,
-Variable,+,A_BadUsb_14,const Icon,
-Variable,+,A_Debug_14,const Icon,
-Variable,+,A_FileManager_14,const Icon,
-Variable,+,A_GPIO_14,const Icon,
-Variable,+,A_Infrared_14,const Icon,
-Variable,+,A_Levelup1_128x64,const Icon,
-Variable,+,A_Levelup2_128x64,const Icon,
-Variable,+,A_Loading_24,const Icon,
-Variable,+,A_NFC_14,const Icon,
-Variable,+,A_Plugins_14,const Icon,
-Variable,+,A_Round_loader_8x8,const Icon,
-Variable,+,A_Settings_14,const Icon,
-Variable,+,A_Sub1ghz_14,const Icon,
-Variable,+,A_U2F_14,const Icon,
-Variable,+,A_iButton_14,const Icon,
 Variable,-,ITM_RxBuffer,volatile int32_t,
-Variable,+,I_125_10px,const Icon,
-Variable,+,I_ActiveConnection_50x64,const Icon,
-Variable,+,I_Alert_9x8,const Icon,
-Variable,+,I_ArrowC_1_36x36,const Icon,
-Variable,+,I_ArrowDownEmpty_14x15,const Icon,
-Variable,+,I_ArrowDownFilled_14x15,const Icon,
-Variable,+,I_ArrowUpEmpty_14x15,const Icon,
-Variable,+,I_ArrowUpFilled_14x15,const Icon,
-Variable,+,I_Attention_5x8,const Icon,
-Variable,+,I_Auth_62x31,const Icon,
-Variable,+,I_BLE_Pairing_128x64,const Icon,
-Variable,+,I_Background_128x11,const Icon,
-Variable,+,I_BatteryBody_52x28,const Icon,
-Variable,+,I_Battery_16x16,const Icon,
-Variable,+,I_Battery_26x8,const Icon,
-Variable,+,I_Ble_connected_15x15,const Icon,
-Variable,+,I_Ble_disconnected_15x15,const Icon,
-Variable,+,I_Bluetooth_Connected_16x8,const Icon,
-Variable,+,I_Bluetooth_Idle_5x8,const Icon,
-Variable,+,I_ButtonCenter_7x7,const Icon,
-Variable,+,I_ButtonDown_7x4,const Icon,
-Variable,+,I_ButtonLeftSmall_3x5,const Icon,
-Variable,+,I_ButtonLeft_4x7,const Icon,
-Variable,+,I_ButtonRightSmall_3x5,const Icon,
-Variable,+,I_ButtonRight_4x7,const Icon,
-Variable,+,I_ButtonUp_7x4,const Icon,
-Variable,+,I_Button_18x18,const Icon,
-Variable,+,I_Certification1_103x56,const Icon,
-Variable,+,I_Certification2_98x33,const Icon,
-Variable,+,I_Charging_lightning_9x10,const Icon,
-Variable,+,I_Charging_lightning_mask_9x10,const Icon,
-Variable,+,I_Circles_47x47,const Icon,
-Variable,+,I_Clock_18x18,const Icon,
-Variable,+,I_Connect_me_62x31,const Icon,
-Variable,+,I_Connected_62x31,const Icon,
-Variable,+,I_CoolHi_25x27,const Icon,
-Variable,+,I_CoolHi_hvr_25x27,const Icon,
-Variable,+,I_CoolLo_25x27,const Icon,
-Variable,+,I_CoolLo_hvr_25x27,const Icon,
-Variable,+,I_Cry_dolph_55x52,const Icon,
-Variable,+,I_DFU_128x50,const Icon,
-Variable,+,I_Dehumidify_25x27,const Icon,
-Variable,+,I_Dehumidify_hvr_25x27,const Icon,
-Variable,+,I_Detailed_chip_17x13,const Icon,
-Variable,+,I_DolphinCommon_56x48,const Icon,
-Variable,+,I_DolphinMafia_115x62,const Icon,
-Variable,+,I_DolphinNice_96x59,const Icon,
-Variable,+,I_DolphinReadingSuccess_59x63,const Icon,
-Variable,+,I_DolphinWait_61x59,const Icon,
-Variable,+,I_DoorLeft_70x55,const Icon,
-Variable,+,I_DoorRight_70x55,const Icon,
-Variable,+,I_Down_25x27,const Icon,
-Variable,+,I_Down_hvr_25x27,const Icon,
-Variable,+,I_Drive_112x35,const Icon,
-Variable,+,I_Error_18x18,const Icon,
-Variable,+,I_Error_62x31,const Icon,
-Variable,+,I_EviSmile1_18x21,const Icon,
-Variable,+,I_EviSmile2_18x21,const Icon,
-Variable,+,I_EviWaiting1_18x21,const Icon,
-Variable,+,I_EviWaiting2_18x21,const Icon,
-Variable,+,I_FaceCharging_29x14,const Icon,
-Variable,+,I_FaceConfused_29x14,const Icon,
-Variable,+,I_FaceNopower_29x14,const Icon,
-Variable,+,I_FaceNormal_29x14,const Icon,
-Variable,+,I_GameMode_11x8,const Icon,
-Variable,+,I_Health_16x16,const Icon,
-Variable,+,I_HeatHi_25x27,const Icon,
-Variable,+,I_HeatHi_hvr_25x27,const Icon,
-Variable,+,I_HeatLo_25x27,const Icon,
-Variable,+,I_HeatLo_hvr_25x27,const Icon,
-Variable,+,I_Hidden_window_9x8,const Icon,
-Variable,+,I_InfraredArrowDown_4x8,const Icon,
-Variable,+,I_InfraredArrowUp_4x8,const Icon,
-Variable,+,I_InfraredLearnShort_128x31,const Icon,
-Variable,+,I_KeyBackspaceSelected_16x9,const Icon,
-Variable,+,I_KeyBackspace_16x9,const Icon,
-Variable,+,I_KeySaveSelected_24x11,const Icon,
-Variable,+,I_KeySave_24x11,const Icon,
-Variable,+,I_Keychain_39x36,const Icon,
-Variable,+,I_Left_mouse_icon_9x9,const Icon,
-Variable,+,I_Lock_7x8,const Icon,
-Variable,+,I_Lock_8x8,const Icon,
-Variable,+,I_MHz_25x11,const Icon,
-Variable,+,I_Medium_chip_22x21,const Icon,
-Variable,+,I_Modern_reader_18x34,const Icon,
-Variable,+,I_Move_flipper_26x39,const Icon,
-Variable,+,I_Mute_25x27,const Icon,
-Variable,+,I_Mute_hvr_25x27,const Icon,
-Variable,+,I_NFC_manual_60x50,const Icon,
-Variable,+,I_Nfc_10px,const Icon,
-Variable,+,I_Off_25x27,const Icon,
-Variable,+,I_Off_hvr_25x27,const Icon,
-Variable,+,I_Ok_btn_9x9,const Icon,
-Variable,+,I_Ok_btn_pressed_13x13,const Icon,
-Variable,+,I_Percent_10x14,const Icon,
-Variable,+,I_Pin_arrow_down_7x9,const Icon,
-Variable,+,I_Pin_arrow_left_9x7,const Icon,
-Variable,+,I_Pin_arrow_right_9x7,const Icon,
-Variable,+,I_Pin_arrow_up_7x9,const Icon,
-Variable,+,I_Pin_attention_dpad_29x29,const Icon,
-Variable,+,I_Pin_back_arrow_10x8,const Icon,
-Variable,+,I_Pin_back_full_40x8,const Icon,
-Variable,+,I_Pin_pointer_5x3,const Icon,
-Variable,+,I_Pin_star_7x7,const Icon,
-Variable,+,I_Power_25x27,const Icon,
-Variable,+,I_Power_hvr_25x27,const Icon,
-Variable,+,I_Pressed_Button_13x13,const Icon,
-Variable,+,I_Quest_7x8,const Icon,
-Variable,+,I_RFIDBigChip_37x36,const Icon,
-Variable,+,I_RFIDDolphinReceive_97x61,const Icon,
-Variable,+,I_RFIDDolphinSend_97x61,const Icon,
-Variable,+,I_RFIDDolphinSuccess_108x57,const Icon,
-Variable,+,I_Reader_detect_43x40,const Icon,
-Variable,+,I_Release_arrow_18x15,const Icon,
-Variable,+,I_Restoring_38x32,const Icon,
-Variable,+,I_Right_mouse_icon_9x9,const Icon,
-Variable,+,I_SDQuestion_35x43,const Icon,
-Variable,+,I_SDcardFail_11x8,const Icon,
-Variable,+,I_SDcardMounted_11x8,const Icon,
-Variable,+,I_Scanning_123x52,const Icon,
-Variable,+,I_SmallArrowDown_3x5,const Icon,
-Variable,+,I_SmallArrowDown_4x7,const Icon,
-Variable,+,I_SmallArrowUp_3x5,const Icon,
-Variable,+,I_SmallArrowUp_4x7,const Icon,
-Variable,+,I_Smile_18x18,const Icon,
-Variable,+,I_Space_65x18,const Icon,
-Variable,+,I_Tap_reader_36x38,const Icon,
-Variable,+,I_Temperature_16x16,const Icon,
-Variable,+,I_Unlock_7x8,const Icon,
-Variable,+,I_Unplug_bg_bottom_128x10,const Icon,
-Variable,+,I_Unplug_bg_top_128x14,const Icon,
-Variable,+,I_Up_25x27,const Icon,
-Variable,+,I_Up_hvr_25x27,const Icon,
-Variable,+,I_Updating_32x40,const Icon,
-Variable,+,I_UsbTree_48x22,const Icon,
-Variable,+,I_Vol_down_25x27,const Icon,
-Variable,+,I_Vol_down_hvr_25x27,const Icon,
-Variable,+,I_Vol_up_25x27,const Icon,
-Variable,+,I_Vol_up_hvr_25x27,const Icon,
-Variable,+,I_Voldwn_6x6,const Icon,
-Variable,+,I_Voltage_16x16,const Icon,
-Variable,+,I_Volup_8x6,const Icon,
-Variable,+,I_WarningDolphin_45x42,const Icon,
-Variable,+,I_Warning_30x23,const Icon,
-Variable,+,I_back_10px,const Icon,
-Variable,+,I_badusb_10px,const Icon,
-Variable,+,I_dir_10px,const Icon,
-Variable,+,I_iButtonDolphinVerySuccess_108x52,const Icon,
-Variable,+,I_iButtonKey_49x44,const Icon,
-Variable,+,I_ibutt_10px,const Icon,
-Variable,+,I_ir_10px,const Icon,
-Variable,+,I_loading_10px,const Icon,
-Variable,+,I_music_10px,const Icon,
-Variable,+,I_passport_bad1_46x49,const Icon,
-Variable,+,I_passport_bad2_46x49,const Icon,
-Variable,+,I_passport_bad3_46x49,const Icon,
-Variable,+,I_passport_bottom_128x18,const Icon,
-Variable,+,I_passport_happy1_46x49,const Icon,
-Variable,+,I_passport_happy2_46x49,const Icon,
-Variable,+,I_passport_happy3_46x49,const Icon,
-Variable,+,I_passport_left_6x46,const Icon,
-Variable,+,I_passport_okay1_46x49,const Icon,
-Variable,+,I_passport_okay2_46x49,const Icon,
-Variable,+,I_passport_okay3_46x49,const Icon,
-Variable,+,I_sub1_10px,const Icon,
-Variable,+,I_u2f_10px,const Icon,
-Variable,+,I_unknown_10px,const Icon,
-Variable,+,I_update_10px,const Icon,
 Variable,-,MSIRangeTable,const uint32_t[16],
 Variable,-,SmpsPrescalerTable,const uint32_t[4][6],
 Variable,+,SystemCoreClock,uint32_t,