diff --git a/applications/main/ibutton/application.fam b/applications/main/ibutton/application.fam
index 1265fb788..6d98b75a5 100644
--- a/applications/main/ibutton/application.fam
+++ b/applications/main/ibutton/application.fam
@@ -13,4 +13,5 @@ App(
     order=60,
     fap_icon="iBIcon.png",
     fap_category="Main",
+    fap_icon_assets="images",
 )
diff --git a/applications/main/ibutton/ibutton.c b/applications/main/ibutton/ibutton.c
index b6d8361b3..2762d68e1 100644
--- a/applications/main/ibutton/ibutton.c
+++ b/applications/main/ibutton/ibutton.c
@@ -1,5 +1,4 @@
 #include "ibutton.h"
-#include "assets_icons.h"
 #include "ibutton_i.h"
 #include "ibutton/scenes/ibutton_scene.h"
 #include <toolbox/path.h>
diff --git a/applications/main/ibutton/ibutton_i.h b/applications/main/ibutton/ibutton_i.h
index 0a8099351..f79ae0d81 100644
--- a/applications/main/ibutton/ibutton_i.h
+++ b/applications/main/ibutton/ibutton_i.h
@@ -4,7 +4,7 @@
 
 #include <gui/gui.h>
 #include <gui/view.h>
-#include <assets_icons.h>
+#include "ibutton_icons.h"
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <notification/notification_messages.h>
diff --git a/applications/main/ibutton/images/DolphinMafia_115x62.png b/applications/main/ibutton/images/DolphinMafia_115x62.png
new file mode 100644
index 000000000..53dffb4fa
Binary files /dev/null and b/applications/main/ibutton/images/DolphinMafia_115x62.png differ
diff --git a/applications/main/ibutton/images/DolphinNice_96x59.png b/applications/main/ibutton/images/DolphinNice_96x59.png
new file mode 100644
index 000000000..b111196c7
Binary files /dev/null and b/applications/main/ibutton/images/DolphinNice_96x59.png differ
diff --git a/applications/main/ibutton/images/DolphinReadingSuccess_59x63.png b/applications/main/ibutton/images/DolphinReadingSuccess_59x63.png
new file mode 100644
index 000000000..46f559f65
Binary files /dev/null and b/applications/main/ibutton/images/DolphinReadingSuccess_59x63.png differ
diff --git a/applications/main/ibutton/images/DolphinWait_61x59.png b/applications/main/ibutton/images/DolphinWait_61x59.png
new file mode 100644
index 000000000..bb0c38400
Binary files /dev/null and b/applications/main/ibutton/images/DolphinWait_61x59.png differ
diff --git a/applications/main/ibutton/images/iButtonDolphinVerySuccess_108x52.png b/applications/main/ibutton/images/iButtonDolphinVerySuccess_108x52.png
new file mode 100644
index 000000000..2b4bec7c6
Binary files /dev/null and b/applications/main/ibutton/images/iButtonDolphinVerySuccess_108x52.png differ
diff --git a/applications/main/ibutton/images/iButtonKey_49x44.png b/applications/main/ibutton/images/iButtonKey_49x44.png
new file mode 100644
index 000000000..db895ec52
Binary files /dev/null and b/applications/main/ibutton/images/iButtonKey_49x44.png differ
diff --git a/applications/main/ibutton/images/ibutt_10px.png b/applications/main/ibutton/images/ibutt_10px.png
new file mode 100644
index 000000000..2fdaf123a
Binary files /dev/null and b/applications/main/ibutton/images/ibutt_10px.png differ
diff --git a/applications/main/u2f/application.fam b/applications/main/u2f/application.fam
index 5e825c1bf..df823e768 100644
--- a/applications/main/u2f/application.fam
+++ b/applications/main/u2f/application.fam
@@ -13,4 +13,5 @@ App(
     order=80,
     fap_icon="U2FIcon.png",
     fap_category="Main",
+    fap_icon_assets="images",
 )
diff --git a/applications/main/u2f/images/ActiveConnection_50x64.png b/applications/main/u2f/images/ActiveConnection_50x64.png
new file mode 100644
index 000000000..1d7686ddd
Binary files /dev/null and b/applications/main/u2f/images/ActiveConnection_50x64.png differ
diff --git a/applications/main/u2f/images/Auth_62x31.png b/applications/main/u2f/images/Auth_62x31.png
new file mode 100644
index 000000000..40f094ac9
Binary files /dev/null and b/applications/main/u2f/images/Auth_62x31.png differ
diff --git a/applications/main/u2f/images/Connect_me_62x31.png b/applications/main/u2f/images/Connect_me_62x31.png
new file mode 100644
index 000000000..68c48c0e6
Binary files /dev/null and b/applications/main/u2f/images/Connect_me_62x31.png differ
diff --git a/applications/main/u2f/images/Connected_62x31.png b/applications/main/u2f/images/Connected_62x31.png
new file mode 100644
index 000000000..eeaf660b1
Binary files /dev/null and b/applications/main/u2f/images/Connected_62x31.png differ
diff --git a/applications/main/u2f/images/Drive_112x35.png b/applications/main/u2f/images/Drive_112x35.png
new file mode 100644
index 000000000..6f7b9c834
Binary files /dev/null and b/applications/main/u2f/images/Drive_112x35.png differ
diff --git a/applications/main/u2f/images/Error_62x31.png b/applications/main/u2f/images/Error_62x31.png
new file mode 100644
index 000000000..bb280e751
Binary files /dev/null and b/applications/main/u2f/images/Error_62x31.png differ
diff --git a/applications/main/u2f/images/SDQuestion_35x43.png b/applications/main/u2f/images/SDQuestion_35x43.png
new file mode 100644
index 000000000..9b9c9a58e
Binary files /dev/null and b/applications/main/u2f/images/SDQuestion_35x43.png differ
diff --git a/applications/main/u2f/u2f_app_i.h b/applications/main/u2f/u2f_app_i.h
index 2896684c3..c7bac40b4 100644
--- a/applications/main/u2f/u2f_app_i.h
+++ b/applications/main/u2f/u2f_app_i.h
@@ -4,7 +4,7 @@
 #include "scenes/u2f_scene.h"
 
 #include <gui/gui.h>
-#include <assets_icons.h>
+#include <u2f_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 181c495d0..d16d8542c 100644
--- a/applications/main/u2f/views/u2f_view.c
+++ b/applications/main/u2f/views/u2f_view.c
@@ -1,6 +1,6 @@
 #include "u2f_view.h"
 #include <gui/elements.h>
-#include <assets_icons.h>
+#include <u2f_icons.h>
 
 struct U2fView {
     View* view;