diff --git a/applications/main/nfc/helpers/protocol_support/felica/felica.c b/applications/main/nfc/helpers/protocol_support/felica/felica.c
index f9c849121..cdfb53794 100644
--- a/applications/main/nfc/helpers/protocol_support/felica/felica.c
+++ b/applications/main/nfc/helpers/protocol_support/felica/felica.c
@@ -58,8 +58,8 @@ static void nfc_scene_read_success_on_enter_felica(NfcApp* instance) {
     furi_string_free(temp_str);
 }
 
-static bool nfc_scene_saved_menu_on_event_felica(NfcApp* instance, uint32_t event) {
-    if(event == SubmenuIndexCommonEdit) {
+static bool nfc_scene_saved_menu_on_event_felica(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexCommonEdit) {
         scene_manager_next_scene(instance->scene_manager, NfcSceneSetUid);
         return true;
     }
diff --git a/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a.c b/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a.c
index c0d502d03..f5830fa9b 100644
--- a/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a.c
+++ b/applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a.c
@@ -95,8 +95,8 @@ static void nfc_scene_emulate_on_enter_iso14443_3a(NfcApp* instance) {
         instance->listener, nfc_scene_emulate_listener_callback_iso14443_3a, instance);
 }
 
-static bool nfc_scene_read_menu_on_event_iso14443_3a(NfcApp* instance, uint32_t event) {
-    if(event == SubmenuIndexCommonEmulate) {
+static bool nfc_scene_read_menu_on_event_iso14443_3a(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexCommonEmulate) {
         scene_manager_next_scene(instance->scene_manager, NfcSceneEmulate);
         return true;
     }
diff --git a/applications/main/nfc/helpers/protocol_support/iso14443_3b/iso14443_3b.c b/applications/main/nfc/helpers/protocol_support/iso14443_3b/iso14443_3b.c
index fee231846..bb3751fc8 100644
--- a/applications/main/nfc/helpers/protocol_support/iso14443_3b/iso14443_3b.c
+++ b/applications/main/nfc/helpers/protocol_support/iso14443_3b/iso14443_3b.c
@@ -59,8 +59,8 @@ static void nfc_scene_read_success_on_enter_iso14443_3b(NfcApp* instance) {
     furi_string_free(temp_str);
 }
 
-bool nfc_scene_saved_menu_on_event_iso14443_3b_common(NfcApp* instance, uint32_t event) {
-    if(event == SubmenuIndexCommonEdit) {
+bool nfc_scene_saved_menu_on_event_iso14443_3b_common(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexCommonEdit) {
         scene_manager_next_scene(instance->scene_manager, NfcSceneSetUid);
         return true;
     }
@@ -68,7 +68,7 @@ bool nfc_scene_saved_menu_on_event_iso14443_3b_common(NfcApp* instance, uint32_t
     return false;
 }
 
-static bool nfc_scene_saved_menu_on_event_iso14443_3b(NfcApp* instance, uint32_t event) {
+static bool nfc_scene_saved_menu_on_event_iso14443_3b(NfcApp* instance, SceneManagerEvent event) {
     return nfc_scene_saved_menu_on_event_iso14443_3b_common(instance, event);
 }
 
diff --git a/applications/main/nfc/helpers/protocol_support/iso14443_3b/iso14443_3b_i.h b/applications/main/nfc/helpers/protocol_support/iso14443_3b/iso14443_3b_i.h
index 53fe6b392..6c7c2a0bc 100644
--- a/applications/main/nfc/helpers/protocol_support/iso14443_3b/iso14443_3b_i.h
+++ b/applications/main/nfc/helpers/protocol_support/iso14443_3b/iso14443_3b_i.h
@@ -4,4 +4,4 @@
 
 #include "iso14443_3b.h"
 
-bool nfc_scene_saved_menu_on_event_iso14443_3b_common(NfcApp* instance, uint32_t event);
+bool nfc_scene_saved_menu_on_event_iso14443_3b_common(NfcApp* instance, SceneManagerEvent event);
diff --git a/applications/main/nfc/helpers/protocol_support/iso14443_4a/iso14443_4a.c b/applications/main/nfc/helpers/protocol_support/iso14443_4a/iso14443_4a.c
index 0a3a592e1..015f32ed5 100644
--- a/applications/main/nfc/helpers/protocol_support/iso14443_4a/iso14443_4a.c
+++ b/applications/main/nfc/helpers/protocol_support/iso14443_4a/iso14443_4a.c
@@ -99,8 +99,8 @@ static void nfc_scene_emulate_on_enter_iso14443_4a(NfcApp* instance) {
         instance->listener, nfc_scene_emulate_listener_callback_iso14443_4a, instance);
 }
 
-static bool nfc_scene_read_menu_on_event_iso14443_4a(NfcApp* instance, uint32_t event) {
-    if(event == SubmenuIndexCommonEmulate) {
+static bool nfc_scene_read_menu_on_event_iso14443_4a(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexCommonEmulate) {
         scene_manager_next_scene(instance->scene_manager, NfcSceneEmulate);
         return true;
     }
diff --git a/applications/main/nfc/helpers/protocol_support/iso14443_4b/iso14443_4b.c b/applications/main/nfc/helpers/protocol_support/iso14443_4b/iso14443_4b.c
index a0c70a22e..965cbc8dd 100644
--- a/applications/main/nfc/helpers/protocol_support/iso14443_4b/iso14443_4b.c
+++ b/applications/main/nfc/helpers/protocol_support/iso14443_4b/iso14443_4b.c
@@ -64,8 +64,8 @@ static void nfc_scene_saved_menu_on_enter_iso14443_4b(NfcApp* instance) {
     UNUSED(instance);
 }
 
-static bool nfc_scene_read_menu_on_event_iso14443_4b(NfcApp* instance, uint32_t event) {
-    if(event == SubmenuIndexCommonEmulate) {
+static bool nfc_scene_read_menu_on_event_iso14443_4b(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexCommonEmulate) {
         scene_manager_next_scene(instance->scene_manager, NfcSceneEmulate);
         return true;
     }
@@ -73,7 +73,7 @@ static bool nfc_scene_read_menu_on_event_iso14443_4b(NfcApp* instance, uint32_t
     return false;
 }
 
-static bool nfc_scene_saved_menu_on_event_iso14443_4b(NfcApp* instance, uint32_t event) {
+static bool nfc_scene_saved_menu_on_event_iso14443_4b(NfcApp* instance, SceneManagerEvent event) {
     return nfc_scene_saved_menu_on_event_iso14443_3b_common(instance, event);
 }
 
diff --git a/applications/main/nfc/helpers/protocol_support/iso15693_3/iso15693_3.c b/applications/main/nfc/helpers/protocol_support/iso15693_3/iso15693_3.c
index 7f861a032..109278752 100644
--- a/applications/main/nfc/helpers/protocol_support/iso15693_3/iso15693_3.c
+++ b/applications/main/nfc/helpers/protocol_support/iso15693_3/iso15693_3.c
@@ -94,8 +94,8 @@ static void nfc_scene_emulate_on_enter_iso15693_3(NfcApp* instance) {
         instance->listener, nfc_scene_emulate_listener_callback_iso15693_3, instance);
 }
 
-static bool nfc_scene_saved_menu_on_event_iso15693_3(NfcApp* instance, uint32_t event) {
-    if(event == SubmenuIndexCommonEdit) {
+static bool nfc_scene_saved_menu_on_event_iso15693_3(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexCommonEdit) {
         scene_manager_next_scene(instance->scene_manager, NfcSceneSetUid);
         return true;
     }
diff --git a/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c b/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c
index 7feeccf22..c771df8dc 100644
--- a/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c
+++ b/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c
@@ -99,8 +99,9 @@ static void nfc_scene_read_on_enter_mf_classic(NfcApp* instance) {
     nfc_poller_start(instance->poller, nfc_scene_read_poller_callback_mf_classic, instance);
 }
 
-static bool nfc_scene_read_on_event_mf_classic(NfcApp* instance, uint32_t event) {
-    if(event == NfcCustomEventPollerIncomplete) {
+static bool nfc_scene_read_on_event_mf_classic(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom &&
+       event.event == NfcCustomEventPollerIncomplete) {
         scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicDictAttack);
     }
 
@@ -170,8 +171,8 @@ static void nfc_scene_emulate_on_enter_mf_classic(NfcApp* instance) {
     nfc_listener_start(instance->listener, NULL, NULL);
 }
 
-static bool nfc_scene_read_menu_on_event_mf_classic(NfcApp* instance, uint32_t event) {
-    if(event == SubmenuIndexDetectReader) {
+static bool nfc_scene_read_menu_on_event_mf_classic(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexDetectReader) {
         scene_manager_next_scene(instance->scene_manager, NfcSceneSaveConfirm);
         dolphin_deed(DolphinDeedNfcDetectReader);
         return true;
@@ -180,27 +181,29 @@ static bool nfc_scene_read_menu_on_event_mf_classic(NfcApp* instance, uint32_t e
     return false;
 }
 
-static bool nfc_scene_saved_menu_on_event_mf_classic(NfcApp* instance, uint32_t event) {
+static bool nfc_scene_saved_menu_on_event_mf_classic(NfcApp* instance, SceneManagerEvent event) {
     bool consumed = false;
 
-    if(event == SubmenuIndexDetectReader) {
-        scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicDetectReader);
-        consumed = true;
-    } else if(event == SubmenuIndexWrite) {
-        scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicWriteInitial);
-        consumed = true;
-    } else if(event == SubmenuIndexUpdate) {
-        scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicUpdateInitial);
-        consumed = true;
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == SubmenuIndexDetectReader) {
+            scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicDetectReader);
+            consumed = true;
+        } else if(event.event == SubmenuIndexWrite) {
+            scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicWriteInitial);
+            consumed = true;
+        } else if(event.event == SubmenuIndexUpdate) {
+            scene_manager_next_scene(instance->scene_manager, NfcSceneMfClassicUpdateInitial);
+            consumed = true;
+        }
     }
 
     return consumed;
 }
 
-static bool nfc_scene_save_name_on_event_mf_classic(NfcApp* instance, uint32_t event) {
+static bool nfc_scene_save_name_on_event_mf_classic(NfcApp* instance, SceneManagerEvent event) {
     bool consumed = false;
 
-    if(event == NfcCustomEventTextInputDone) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == NfcCustomEventTextInputDone) {
         mf_classic_key_cache_save(
             instance->mfc_key_cache,
             nfc_device_get_data(instance->nfc_device, NfcProtocolMfClassic));
diff --git a/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c b/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c
index 4a8d4d744..662126c02 100644
--- a/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c
+++ b/applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c
@@ -132,15 +132,17 @@ static void nfc_scene_read_on_enter_mf_ultralight(NfcApp* instance) {
     nfc_poller_start(instance->poller, nfc_scene_read_poller_callback_mf_ultralight, instance);
 }
 
-bool nfc_scene_read_on_event_mf_ultralight(NfcApp* instance, uint32_t event) {
-    if(event == NfcCustomEventCardDetected) {
-        scene_manager_set_scene_state(
-            instance->scene_manager, NfcSceneRead, NfcSceneMfUltralightReadMenuStateCardFound);
-        nfc_scene_read_setup_view(instance);
-    } else if((event == NfcCustomEventPollerIncomplete)) {
-        notification_message(instance->notifications, &sequence_semi_success);
-        scene_manager_next_scene(instance->scene_manager, NfcSceneReadSuccess);
-        dolphin_deed(DolphinDeedNfcReadSuccess);
+bool nfc_scene_read_on_event_mf_ultralight(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == NfcCustomEventCardDetected) {
+            scene_manager_set_scene_state(
+                instance->scene_manager, NfcSceneRead, NfcSceneMfUltralightReadMenuStateCardFound);
+            nfc_scene_read_setup_view(instance);
+        } else if((event.event == NfcCustomEventPollerIncomplete)) {
+            notification_message(instance->notifications, &sequence_semi_success);
+            scene_manager_next_scene(instance->scene_manager, NfcSceneReadSuccess);
+            dolphin_deed(DolphinDeedNfcReadSuccess);
+        }
     }
     return true;
 }
@@ -202,14 +204,17 @@ static void nfc_scene_emulate_on_enter_mf_ultralight(NfcApp* instance) {
     nfc_listener_start(instance->listener, NULL, NULL);
 }
 
-static bool
-    nfc_scene_read_and_saved_menu_on_event_mf_ultralight(NfcApp* instance, uint32_t event) {
-    if(event == SubmenuIndexUnlock) {
-        scene_manager_next_scene(instance->scene_manager, NfcSceneMfUltralightUnlockMenu);
-        return true;
-    } else if(event == SubmenuIndexWrite) {
-        scene_manager_next_scene(instance->scene_manager, NfcSceneMfUltralightWrite);
-        return true;
+static bool nfc_scene_read_and_saved_menu_on_event_mf_ultralight(
+    NfcApp* instance,
+    SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == SubmenuIndexUnlock) {
+            scene_manager_next_scene(instance->scene_manager, NfcSceneMfUltralightUnlockMenu);
+            return true;
+        } else if(event.event == SubmenuIndexWrite) {
+            scene_manager_next_scene(instance->scene_manager, NfcSceneMfUltralightWrite);
+            return true;
+        }
     }
     return false;
 }
diff --git a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
index c87ee613f..9bd28b4b7 100644
--- a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
+++ b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
@@ -131,10 +131,8 @@ static bool
     nfc_protocol_support_scene_more_info_on_event(NfcApp* instance, SceneManagerEvent event) {
     bool consumed = false;
 
-    if(event.type == SceneManagerEventTypeCustom) {
-        const NfcProtocol protocol = nfc_device_get_protocol(instance->nfc_device);
-        consumed = nfc_protocol_support[protocol]->scene_more_info.on_event(instance, event.event);
-    }
+    const NfcProtocol protocol = nfc_device_get_protocol(instance->nfc_device);
+    consumed = nfc_protocol_support[protocol]->scene_more_info.on_event(instance, event);
 
     return consumed;
 }
@@ -188,8 +186,7 @@ static bool nfc_protocol_support_scene_read_on_event(NfcApp* instance, SceneMana
             } else {
                 const NfcProtocol protocol =
                     instance->protocols_detected[instance->protocols_detected_selected_idx];
-                consumed =
-                    nfc_protocol_support[protocol]->scene_read.on_event(instance, event.event);
+                consumed = nfc_protocol_support[protocol]->scene_read.on_event(instance, event);
             }
         } else if(event.event == NfcCustomEventPollerFailure) {
             nfc_poller_stop(instance->poller);
@@ -202,7 +199,7 @@ static bool nfc_protocol_support_scene_read_on_event(NfcApp* instance, SceneMana
         } else if(event.event == NfcCustomEventCardDetected) {
             const NfcProtocol protocol =
                 instance->protocols_detected[instance->protocols_detected_selected_idx];
-            consumed = nfc_protocol_support[protocol]->scene_read.on_event(instance, event.event);
+            consumed = nfc_protocol_support[protocol]->scene_read.on_event(instance, event);
         }
     } else if(event.type == SceneManagerEventTypeBack) {
         nfc_poller_stop(instance->poller);
@@ -287,8 +284,7 @@ static bool
             consumed = true;
         } else {
             const NfcProtocol protocol = nfc_device_get_protocol(instance->nfc_device);
-            consumed =
-                nfc_protocol_support[protocol]->scene_read_menu.on_event(instance, event.event);
+            consumed = nfc_protocol_support[protocol]->scene_read_menu.on_event(instance, event);
         }
 
     } else if(event.type == SceneManagerEventTypeBack) {
@@ -456,8 +452,7 @@ static bool
             consumed = true;
         } else {
             const NfcProtocol protocol = nfc_device_get_protocol(instance->nfc_device);
-            consumed =
-                nfc_protocol_support[protocol]->scene_saved_menu.on_event(instance, event.event);
+            consumed = nfc_protocol_support[protocol]->scene_saved_menu.on_event(instance, event);
         }
 
     } else if(event.type == SceneManagerEventTypeBack) {
@@ -523,8 +518,8 @@ static bool
                         DolphinDeedNfcSave);
                 const NfcProtocol protocol =
                     instance->protocols_detected[instance->protocols_detected_selected_idx];
-                consumed = nfc_protocol_support[protocol]->scene_save_name.on_event(
-                    instance, event.event);
+                consumed =
+                    nfc_protocol_support[protocol]->scene_save_name.on_event(instance, event);
             } else {
                 consumed = scene_manager_search_and_switch_to_previous_scene(
                     instance->scene_manager, NfcSceneStart);
diff --git a/applications/main/nfc/helpers/protocol_support/slix/slix.c b/applications/main/nfc/helpers/protocol_support/slix/slix.c
index ad858a75f..b32776a58 100644
--- a/applications/main/nfc/helpers/protocol_support/slix/slix.c
+++ b/applications/main/nfc/helpers/protocol_support/slix/slix.c
@@ -91,8 +91,8 @@ static void nfc_scene_emulate_on_enter_slix(NfcApp* instance) {
     nfc_listener_start(instance->listener, nfc_scene_emulate_listener_callback_slix, instance);
 }
 
-static bool nfc_scene_saved_menu_on_event_slix(NfcApp* instance, uint32_t event) {
-    if(event == SubmenuIndexCommonEdit) {
+static bool nfc_scene_saved_menu_on_event_slix(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexCommonEdit) {
         scene_manager_next_scene(instance->scene_manager, NfcSceneSetUid);
         return true;
     }
diff --git a/applications/main/nfc/helpers/protocol_support/st25tb/st25tb.c b/applications/main/nfc/helpers/protocol_support/st25tb/st25tb.c
index e22af48b3..e8b31b805 100644
--- a/applications/main/nfc/helpers/protocol_support/st25tb/st25tb.c
+++ b/applications/main/nfc/helpers/protocol_support/st25tb/st25tb.c
@@ -60,8 +60,8 @@ static void nfc_scene_read_success_on_enter_st25tb(NfcApp* instance) {
     furi_string_free(temp_str);
 }
 
-static bool nfc_scene_saved_menu_on_event_st25tb(NfcApp* instance, uint32_t event) {
-    if(event == SubmenuIndexCommonEdit) {
+static bool nfc_scene_saved_menu_on_event_st25tb(NfcApp* instance, SceneManagerEvent event) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexCommonEdit) {
         scene_manager_next_scene(instance->scene_manager, NfcSceneSetUid);
         return true;
     }