diff --git a/applications/plugins/mousejacker/application.fam b/applications/plugins/mousejacker/application.fam
index 07ee51ae3..4a4093244 100644
--- a/applications/plugins/mousejacker/application.fam
+++ b/applications/plugins/mousejacker/application.fam
@@ -12,4 +12,5 @@ App(
     order=60,
     fap_icon="mouse_10px.png",
     fap_category="GPIO",
+    fap_icon_assets="images",
 )
diff --git a/applications/plugins/mousejacker/images/badusb_10px.png b/applications/plugins/mousejacker/images/badusb_10px.png
new file mode 100644
index 000000000..037474aa3
Binary files /dev/null and b/applications/plugins/mousejacker/images/badusb_10px.png differ
diff --git a/applications/plugins/mousejacker/images/sub1_10px.png b/applications/plugins/mousejacker/images/sub1_10px.png
new file mode 100644
index 000000000..5a25fdf4e
Binary files /dev/null and b/applications/plugins/mousejacker/images/sub1_10px.png differ
diff --git a/applications/plugins/mousejacker/mousejacker.c b/applications/plugins/mousejacker/mousejacker.c
index a0cf4845f..e050f0a25 100644
--- a/applications/plugins/mousejacker/mousejacker.c
+++ b/applications/plugins/mousejacker/mousejacker.c
@@ -10,6 +10,7 @@
 #include <furi_hal_resources.h>
 #include <nrf24.h>
 #include "mousejacker_ducky.h"
+#include <NRF24_Mouse_Jacker_icons.h>
 
 #define TAG "mousejacker"
 #define LOGITECH_MAX_CHANNEL 85
diff --git a/applications/plugins/picopass/picopass_i.h b/applications/plugins/picopass/picopass_i.h
index 469a672b7..8f954c83c 100644
--- a/applications/plugins/picopass/picopass_i.h
+++ b/applications/plugins/picopass/picopass_i.h
@@ -24,7 +24,7 @@
 
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
-#include <picopass_icons.h>
+#include <Picopass_icons.h>
 
 #define PICOPASS_TEXT_STORE_SIZE 128
 
diff --git a/applications/plugins/totp/application.fam b/applications/plugins/totp/application.fam
index 08f54619c..5b0266493 100644
--- a/applications/plugins/totp/application.fam
+++ b/applications/plugins/totp/application.fam
@@ -15,5 +15,6 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_category="Misc",
+    fap_icon_assets="images",
     fap_icon="totp_10px.png"
 )
diff --git a/applications/plugins/totp/images/DolphinCommon_56x48.png b/applications/plugins/totp/images/DolphinCommon_56x48.png
new file mode 100644
index 000000000..089aaed83
Binary files /dev/null and b/applications/plugins/totp/images/DolphinCommon_56x48.png differ
diff --git a/applications/plugins/totp/services/ui/icons.h b/applications/plugins/totp/services/ui/icons.h
index a9139403f..2ce25a898 100644
--- a/applications/plugins/totp/services/ui/icons.h
+++ b/applications/plugins/totp/services/ui/icons.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <totp_icons.h>
 #include <inttypes.h>
 
 #define ICON_ARROW_LEFT_8x9_WIDTH 8
diff --git a/applications/plugins/usbkeyboard/application.fam b/applications/plugins/usbkeyboard/application.fam
index b5ac0f74f..1e419f3fe 100644
--- a/applications/plugins/usbkeyboard/application.fam
+++ b/applications/plugins/usbkeyboard/application.fam
@@ -11,4 +11,5 @@ App(
     order=60,
     fap_icon="usb_keyboard_10px.png",
     fap_category="Misc",
+    fap_icon_assets="assets",
 )
diff --git a/applications/plugins/usbkeyboard/assets/Arr_dwn_7x9.png b/applications/plugins/usbkeyboard/assets/Arr_dwn_7x9.png
new file mode 100644
index 000000000..d4034efc4
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Arr_dwn_7x9.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Arr_up_7x9.png b/applications/plugins/usbkeyboard/assets/Arr_up_7x9.png
new file mode 100644
index 000000000..28b4236a2
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Arr_up_7x9.png differ
diff --git a/applications/plugins/usbkeyboard/assets/ButtonDown_7x4.png b/applications/plugins/usbkeyboard/assets/ButtonDown_7x4.png
new file mode 100644
index 000000000..2954bb6a6
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/ButtonDown_7x4.png differ
diff --git a/applications/plugins/usbkeyboard/assets/ButtonLeft_4x7.png b/applications/plugins/usbkeyboard/assets/ButtonLeft_4x7.png
new file mode 100644
index 000000000..0b4655d43
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/ButtonLeft_4x7.png differ
diff --git a/applications/plugins/usbkeyboard/assets/ButtonRight_4x7.png b/applications/plugins/usbkeyboard/assets/ButtonRight_4x7.png
new file mode 100644
index 000000000..8e1c74c1c
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/ButtonRight_4x7.png differ
diff --git a/applications/plugins/usbkeyboard/assets/ButtonUp_7x4.png b/applications/plugins/usbkeyboard/assets/ButtonUp_7x4.png
new file mode 100644
index 000000000..1be79328b
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/ButtonUp_7x4.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Button_18x18.png b/applications/plugins/usbkeyboard/assets/Button_18x18.png
new file mode 100644
index 000000000..30a5b4fab
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Button_18x18.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Circles_47x47.png b/applications/plugins/usbkeyboard/assets/Circles_47x47.png
new file mode 100644
index 000000000..6a16ebf7b
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Circles_47x47.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Left_mouse_icon_9x9.png b/applications/plugins/usbkeyboard/assets/Left_mouse_icon_9x9.png
new file mode 100644
index 000000000..c533d8572
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Left_mouse_icon_9x9.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Like_def_11x9.png b/applications/plugins/usbkeyboard/assets/Like_def_11x9.png
new file mode 100644
index 000000000..555bea3d4
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Like_def_11x9.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Like_pressed_17x17.png b/applications/plugins/usbkeyboard/assets/Like_pressed_17x17.png
new file mode 100644
index 000000000..f5bf276f3
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Like_pressed_17x17.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Ok_btn_9x9.png b/applications/plugins/usbkeyboard/assets/Ok_btn_9x9.png
new file mode 100644
index 000000000..9a1539da2
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Ok_btn_9x9.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Ok_btn_pressed_13x13.png b/applications/plugins/usbkeyboard/assets/Ok_btn_pressed_13x13.png
new file mode 100644
index 000000000..6b46ba3a8
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Ok_btn_pressed_13x13.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Pin_arrow_down_7x9.png b/applications/plugins/usbkeyboard/assets/Pin_arrow_down_7x9.png
new file mode 100644
index 000000000..9687397af
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Pin_arrow_down_7x9.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Pin_arrow_left_9x7.png b/applications/plugins/usbkeyboard/assets/Pin_arrow_left_9x7.png
new file mode 100644
index 000000000..fb4ded78f
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Pin_arrow_left_9x7.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Pin_arrow_right_9x7.png b/applications/plugins/usbkeyboard/assets/Pin_arrow_right_9x7.png
new file mode 100644
index 000000000..97648d176
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Pin_arrow_right_9x7.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Pin_arrow_up_7x9.png b/applications/plugins/usbkeyboard/assets/Pin_arrow_up_7x9.png
new file mode 100644
index 000000000..a91a6fd5e
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Pin_arrow_up_7x9.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Pin_back_arrow_10x8.png b/applications/plugins/usbkeyboard/assets/Pin_back_arrow_10x8.png
new file mode 100644
index 000000000..3bafabd14
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Pin_back_arrow_10x8.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Pressed_Button_13x13.png b/applications/plugins/usbkeyboard/assets/Pressed_Button_13x13.png
new file mode 100644
index 000000000..823926b84
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Pressed_Button_13x13.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Right_mouse_icon_9x9.png b/applications/plugins/usbkeyboard/assets/Right_mouse_icon_9x9.png
new file mode 100644
index 000000000..446d7176c
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Right_mouse_icon_9x9.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Space_65x18.png b/applications/plugins/usbkeyboard/assets/Space_65x18.png
new file mode 100644
index 000000000..b60ae5097
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Space_65x18.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Voldwn_6x6.png b/applications/plugins/usbkeyboard/assets/Voldwn_6x6.png
new file mode 100644
index 000000000..d7a82a2df
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Voldwn_6x6.png differ
diff --git a/applications/plugins/usbkeyboard/assets/Volup_8x6.png b/applications/plugins/usbkeyboard/assets/Volup_8x6.png
new file mode 100644
index 000000000..4b7ec66d6
Binary files /dev/null and b/applications/plugins/usbkeyboard/assets/Volup_8x6.png differ
diff --git a/applications/plugins/usbkeyboard/views/usb_hid_dirpad.c b/applications/plugins/usbkeyboard/views/usb_hid_dirpad.c
index f17dc1a00..d6aec9ef2 100644
--- a/applications/plugins/usbkeyboard/views/usb_hid_dirpad.c
+++ b/applications/plugins/usbkeyboard/views/usb_hid_dirpad.c
@@ -2,6 +2,7 @@
 #include <furi.h>
 #include <furi_hal_usb_hid.h>
 #include <gui/elements.h>
+#include <USB_Keyboard_icons.h>
 
 struct UsbHidDirpad {
     View* view;
diff --git a/applications/plugins/usbkeyboard/views/usb_hid_keyboard.c b/applications/plugins/usbkeyboard/views/usb_hid_keyboard.c
index 687189e7d..71438e1c9 100644
--- a/applications/plugins/usbkeyboard/views/usb_hid_keyboard.c
+++ b/applications/plugins/usbkeyboard/views/usb_hid_keyboard.c
@@ -3,6 +3,7 @@
 #include <furi_hal_usb_hid.h>
 #include <gui/elements.h>
 #include <gui/icon_i.h>
+#include <USB_Keyboard_icons.h>
 
 struct UsbHidKeyboard {
     View* view;
diff --git a/applications/plugins/usbkeyboard/views/usb_hid_media.c b/applications/plugins/usbkeyboard/views/usb_hid_media.c
index 520d04717..8d2188434 100644
--- a/applications/plugins/usbkeyboard/views/usb_hid_media.c
+++ b/applications/plugins/usbkeyboard/views/usb_hid_media.c
@@ -2,6 +2,7 @@
 #include <furi.h>
 #include <furi_hal_usb_hid.h>
 #include <gui/elements.h>
+#include <USB_Keyboard_icons.h>
 
 struct UsbHidMedia {
     View* view;
diff --git a/applications/plugins/usbkeyboard/views/usb_hid_mouse.c b/applications/plugins/usbkeyboard/views/usb_hid_mouse.c
index 77067ac04..27f2ac105 100644
--- a/applications/plugins/usbkeyboard/views/usb_hid_mouse.c
+++ b/applications/plugins/usbkeyboard/views/usb_hid_mouse.c
@@ -2,6 +2,7 @@
 #include <furi.h>
 #include <furi_hal_usb_hid.h>
 #include <gui/elements.h>
+#include <USB_Keyboard_icons.h>
 
 struct UsbHidMouse {
     View* view;
diff --git a/applications/plugins/wav_player/application.fam b/applications/plugins/wav_player/application.fam
index 394e45d29..4040ed159 100644
--- a/applications/plugins/wav_player/application.fam
+++ b/applications/plugins/wav_player/application.fam
@@ -8,4 +8,5 @@ App(
     order=46,
     fap_icon="wav_10px.png",
     fap_category="Music",
+    fap_icon_assets="images",
 )
diff --git a/applications/plugins/wav_player/images/music_10px.png b/applications/plugins/wav_player/images/music_10px.png
new file mode 100644
index 000000000..d41eb0db8
Binary files /dev/null and b/applications/plugins/wav_player/images/music_10px.png differ
diff --git a/applications/plugins/wav_player/wav_player.c b/applications/plugins/wav_player/wav_player.c
index 830e37dbf..8798b788a 100644
--- a/applications/plugins/wav_player/wav_player.c
+++ b/applications/plugins/wav_player/wav_player.c
@@ -12,6 +12,8 @@
 #include "wav_player_view.h"
 #include <math.h>
 
+#include <WAV_Player_icons.h>
+
 #define TAG "WavPlayer"
 
 #define WAVPLAYER_FOLDER "/ext/wav_player"