diff --git a/applications/external/nfc_maker/application.fam b/applications/external/nfc_maker/application.fam
index 89bbb202e..95bcd8878 100644
--- a/applications/external/nfc_maker/application.fam
+++ b/applications/external/nfc_maker/application.fam
@@ -11,4 +11,5 @@ App(
     stack_size=1 * 1024,
     fap_icon="nfc_maker_10px.png",
     fap_category="NFC",
+    fap_icon_assets="assets",
 )
diff --git a/applications/external/nfc_maker/assets/DolphinNice_96x59.png b/applications/external/nfc_maker/assets/DolphinNice_96x59.png
new file mode 100644
index 000000000..a299d3630
Binary files /dev/null and b/applications/external/nfc_maker/assets/DolphinNice_96x59.png differ
diff --git a/applications/external/nfc_maker/nfc_maker.h b/applications/external/nfc_maker/nfc_maker.h
index 388dc7196..76a7a2538 100644
--- a/applications/external/nfc_maker/nfc_maker.h
+++ b/applications/external/nfc_maker/nfc_maker.h
@@ -6,7 +6,7 @@
 #include <gui/modules/validators.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
-#include <assets_icons.h>
+#include "nfc_maker_icons.h"
 #include <gui/modules/submenu.h>
 #include <gui/modules/text_input.h>
 #include <gui/modules/byte_input.h>
@@ -16,6 +16,7 @@
 #include <lib/toolbox/random_name.h>
 #include <applications/main/nfc/nfc_i.h>
 #include <furi_hal_bt.h>
+#include "strnlen.h"
 
 #define TEXT_INPUT_LEN 248
 #define WIFI_INPUT_LEN 90
diff --git a/applications/external/nfc_maker/strnlen.c b/applications/external/nfc_maker/strnlen.c
new file mode 100644
index 000000000..54d183895
--- /dev/null
+++ b/applications/external/nfc_maker/strnlen.c
@@ -0,0 +1,11 @@
+#include "strnlen.h"
+
+size_t strnlen(const char* s, size_t maxlen) {
+    size_t len;
+
+    for(len = 0; len < maxlen; len++, s++) {
+        if(!*s) break;
+    }
+
+    return len;
+}
\ No newline at end of file
diff --git a/applications/external/nfc_maker/strnlen.h b/applications/external/nfc_maker/strnlen.h
new file mode 100644
index 000000000..4fe0d540c
--- /dev/null
+++ b/applications/external/nfc_maker/strnlen.h
@@ -0,0 +1,6 @@
+#pragma once
+#pragma weak strnlen
+
+#include <stddef.h>
+
+size_t strnlen(const char* s, size_t maxlen);
\ No newline at end of file