diff --git a/src_nbgl/ui_approve_tx.c b/src_nbgl/ui_approve_tx.c
index 8abcdf1a..cd8cfa53 100644
--- a/src_nbgl/ui_approve_tx.c
+++ b/src_nbgl/ui_approve_tx.c
@@ -9,23 +9,19 @@
 #include "caller_api.h"
 #include "network_icons.h"
 #include "network.h"
+#include "ledger_assert.h"
 
-#define TEXT_TX "transaction"
 // 1 more than actually displayed on screen, because of calculations in StaticReview
-#define MAX_PLUGIN_ITEMS_PER_SCREEN 4
-#define TAG_MAX_LEN                 43
-#define VALUE_MAX_LEN               79
-enum {
-    REJECT_TOKEN,
-    START_REVIEW_TOKEN,
-};
+#define MAX_PLUGIN_ITEMS 8
+#define TAG_MAX_LEN      43
+#define VALUE_MAX_LEN    79
+#define MAX_PAIRS        12  // Max 10 for plugins + 2 (Network and fees)
 
-static nbgl_layoutTagValue_t pair;
+static nbgl_layoutTagValue_t pairs[MAX_PAIRS];
+static nbgl_layoutTagValueList_t pairsList;
 // these buffers are used as circular
-static char title_buffer[MAX_PLUGIN_ITEMS_PER_SCREEN][TAG_MAX_LEN];
-static char msg_buffer[MAX_PLUGIN_ITEMS_PER_SCREEN][VALUE_MAX_LEN];
-static nbgl_layoutTagValueList_t useCaseTagValueList;
-static nbgl_pageInfoLongPress_t infoLongPress;
+static char title_buffer[MAX_PLUGIN_ITEMS][TAG_MAX_LEN];
+static char msg_buffer[MAX_PLUGIN_ITEMS][VALUE_MAX_LEN];
 
 struct tx_approval_context_t {
     bool fromPlugin;
@@ -38,8 +34,6 @@ struct tx_approval_context_t {
 
 static struct tx_approval_context_t tx_approval_context;
 
-static void reviewContinueCommon(void);
-
 static void reviewReject(void) {
     io_seproxyhal_touch_tx_cancel(NULL);
     memset(&tx_approval_context, 0, sizeof(tx_approval_context));
@@ -50,134 +44,11 @@ static void confirmTransation(void) {
     memset(&tx_approval_context, 0, sizeof(tx_approval_context));
 }
 
-static void onConfirmAbandon(void) {
-    nbgl_useCaseStatus("Transaction rejected", false, reviewReject);
-}
-
-static void rejectTransactionQuestion(void) {
-    nbgl_useCaseConfirm(REJECT_QUESTION(TEXT_TX),
-                        NULL,
-                        REJECT_CONFIRM_BUTTON,
-                        RESUME(TEXT_TX),
-                        onConfirmAbandon);
-}
-
 static void reviewChoice(bool confirm) {
     if (confirm) {
-        nbgl_useCaseStatus("TRANSACTION\nSIGNED", true, confirmTransation);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_TRANSACTION_SIGNED, confirmTransation);
     } else {
-        rejectTransactionQuestion();
-    }
-}
-
-// called by NBGL to get the tag/value pair corresponding to pairIndex
-static nbgl_layoutTagValue_t *getTagValuePair(uint8_t pairIndex) {
-    static int counter = 0;
-
-    if (tx_approval_context.fromPlugin) {
-        if (pairIndex < dataContext.tokenContext.pluginUiMaxItems) {
-            // for the next dataContext.tokenContext.pluginUiMaxItems items, get tag/value from
-            // plugin_ui_get_item_internal()
-            dataContext.tokenContext.pluginUiCurrentItem = pairIndex;
-            plugin_ui_get_item_internal((uint8_t *) title_buffer[counter],
-                                        TAG_MAX_LEN,
-                                        (uint8_t *) msg_buffer[counter],
-                                        VALUE_MAX_LEN);
-            pair.item = title_buffer[counter];
-            pair.value = msg_buffer[counter];
-        } else {
-            pairIndex -= dataContext.tokenContext.pluginUiMaxItems;
-            // for the last 1 (or 2), tags are fixed
-            if (tx_approval_context.displayNetwork && (pairIndex == 0)) {
-                pair.item = "Network";
-                pair.value = strings.common.network_name;
-            } else {
-                pair.item = "Max fees";
-                pair.value = strings.common.maxFee;
-            }
-        }
-    } else {
-        uint8_t target_index = 0;
-
-        if (pairIndex == target_index++) {
-            pair.item = "Amount";
-            pair.value = strings.common.fullAmount;
-        }
-#ifdef HAVE_DOMAIN_NAME
-        if (tx_approval_context.domain_name_match) {
-            if (pairIndex == target_index++) {
-                pair.item = "Domain";
-                pair.value = g_domain_name;
-            }
-        }
-        if (!tx_approval_context.domain_name_match || N_storage.verbose_domain_name) {
-#endif  // HAVE_DOMAIN_NAME
-            if (pairIndex == target_index++) {
-                pair.item = "Address";
-                pair.value = strings.common.fullAddress;
-            }
-#ifdef HAVE_DOMAIN_NAME
-        }
-#endif  // HAVE_DOMAIN_NAME
-        if (N_storage.displayNonce) {
-            if (pairIndex == target_index++) {
-                pair.item = "Nonce";
-                pair.value = strings.common.nonce;
-            }
-        }
-        if (pairIndex == target_index++) {
-            pair.item = "Max fees";
-            pair.value = strings.common.maxFee;
-        }
-        if (pairIndex == target_index++) {
-            pair.item = "Network";
-            pair.value = strings.common.network_name;
-        }
-    }
-    // counter is used as index to circular buffer
-    counter++;
-    if (counter == MAX_PLUGIN_ITEMS_PER_SCREEN) {
-        counter = 0;
-    }
-    return &pair;
-}
-
-static void pageCallback(int token, uint8_t index) {
-    (void) index;
-    nbgl_pageRelease(pageContext);
-    if (token == REJECT_TOKEN) {
-        reviewReject();
-    } else if (token == START_REVIEW_TOKEN) {
-        reviewContinueCommon();
-    }
-}
-
-static void reviewContinue(void) {
-    if (tx_approval_context.blindSigning) {
-        nbgl_pageInfoDescription_t info = {
-            .centeredInfo.icon = &C_Important_Circle_64px,
-            .centeredInfo.text1 = "Blind Signing",
-            .centeredInfo.text2 =
-                "This transaction cannot be\nsecurely interpreted by Ledger\nStax. It might put "
-                "your assets\nat risk.",
-            .centeredInfo.text3 = NULL,
-            .centeredInfo.style = LARGE_CASE_INFO,
-            .centeredInfo.offsetY = -32,
-            .footerText = REJECT(TEXT_TX),
-            .footerToken = REJECT_TOKEN,
-            .tapActionText = "Tap to continue",
-            .tapActionToken = START_REVIEW_TOKEN,
-            .topRightStyle = NO_BUTTON_STYLE,
-            .actionButtonText = NULL,
-            .tuneId = TUNE_TAP_CASUAL};
-
-        if (pageContext != NULL) {
-            nbgl_pageRelease(pageContext);
-            pageContext = NULL;
-        }
-        pageContext = nbgl_pageDrawInfo(&pageCallback, NULL, &info);
-    } else {
-        reviewContinueCommon();
+        nbgl_useCaseReviewStatus(STATUS_TYPE_TRANSACTION_REJECTED, reviewReject);
     }
 }
 
@@ -202,55 +73,6 @@ static const nbgl_icon_details_t *get_tx_icon(void) {
     return icon;
 }
 
-static void reviewContinueCommon(void) {
-    uint8_t nbPairs = 0;
-
-    if (tx_approval_context.fromPlugin) {
-        // plugin id + max items + fees
-        nbPairs += dataContext.tokenContext.pluginUiMaxItems + 1;
-    } else {
-        nbPairs += 3;
-        if (N_storage.displayNonce) {
-            nbPairs++;
-        }
-#ifdef HAVE_DOMAIN_NAME
-        uint64_t chain_id = get_tx_chain_id();
-        tx_approval_context.domain_name_match =
-            has_domain_name(&chain_id, tmpContent.txContent.destination);
-        if (tx_approval_context.domain_name_match && N_storage.verbose_domain_name) {
-            nbPairs += 1;
-        }
-#endif  // HAVE_DOMAIN_NAME
-    }
-
-    if (tx_approval_context.displayNetwork) {
-        nbPairs++;
-    }
-
-    useCaseTagValueList.pairs = NULL;
-    useCaseTagValueList.callback = getTagValuePair;
-    useCaseTagValueList.startIndex = 0;
-    useCaseTagValueList.nbPairs = nbPairs;  ///< number of pairs in pairs array
-    useCaseTagValueList.smallCaseForValue = false;
-    useCaseTagValueList.wrapping = false;
-    infoLongPress.icon = get_tx_icon();
-    infoLongPress.text = tx_approval_context.fromPlugin ? g_stax_shared_buffer : SIGN(TEXT_TX);
-    infoLongPress.longPressText = SIGN_BUTTON;
-    nbgl_useCaseStaticReview(&useCaseTagValueList, &infoLongPress, REJECT(TEXT_TX), reviewChoice);
-}
-
-// Replace "Review" by "Sign" and add questionmark
-static void prepare_sign_text(void) {
-    uint8_t sign_length = strlen("Sign");
-    uint8_t review_length = strlen("Review");
-
-    memmove(g_stax_shared_buffer, "Sign", sign_length);
-    memmove(g_stax_shared_buffer + sign_length,
-            g_stax_shared_buffer + review_length,
-            strlen(g_stax_shared_buffer) - review_length + 1);
-    strlcat(g_stax_shared_buffer, "?", sizeof(g_stax_shared_buffer));
-}
-
 // Force operation to be lowercase
 static void get_lowercase_operation(char *dst, size_t dst_len) {
     const char *src = strings.common.fullAmount;
@@ -262,43 +84,132 @@ static void get_lowercase_operation(char *dst, size_t dst_len) {
     dst[idx] = '\0';
 }
 
-static void buildFirstPage(void) {
+static uint8_t setTagValuePairs(void) {
+    uint8_t nbPairs = 0;
+    uint8_t pairIndex = 0;
+    uint8_t counter = 0;
+
+    explicit_bzero(pairs, sizeof(pairs));
+
+    // Setup data to display
     if (tx_approval_context.fromPlugin) {
+        for (pairIndex = 0; pairIndex < dataContext.tokenContext.pluginUiMaxItems; pairIndex++) {
+            // for the next dataContext.tokenContext.pluginUiMaxItems items, get tag/value from
+            // plugin_ui_get_item_internal()
+            dataContext.tokenContext.pluginUiCurrentItem = pairIndex;
+            plugin_ui_get_item_internal((uint8_t *) title_buffer[counter],
+                                        TAG_MAX_LEN,
+                                        (uint8_t *) msg_buffer[counter],
+                                        VALUE_MAX_LEN);
+            pairs[nbPairs].item = title_buffer[counter];
+            pairs[nbPairs].value = msg_buffer[counter];
+            nbPairs++;
+            LEDGER_ASSERT((++counter < MAX_PLUGIN_ITEMS), "Too many items for plugin\n");
+        }
+        // for the last 1 (or 2), tags are fixed
+        if (tx_approval_context.displayNetwork) {
+            pairs[nbPairs].item = "Network";
+            pairs[nbPairs].value = strings.common.network_name;
+            nbPairs++;
+        }
+        pairs[nbPairs].item = "Max fees";
+        pairs[nbPairs].value = strings.common.maxFee;
+        nbPairs++;
+    } else {
+        pairs[nbPairs].item = "Amount";
+        pairs[nbPairs].value = strings.common.fullAmount;
+        nbPairs++;
+
+#ifdef HAVE_DOMAIN_NAME
+        uint64_t chain_id = get_tx_chain_id();
+        tx_approval_context.domain_name_match =
+            has_domain_name(&chain_id, tmpContent.txContent.destination);
+        if (tx_approval_context.domain_name_match) {
+            pairs[nbPairs].item = "Domain";
+            pairs[nbPairs].value = g_domain_name;
+            nbPairs++;
+        }
+        if (!tx_approval_context.domain_name_match || N_storage.verbose_domain_name) {
+#endif
+            pairs[nbPairs].item = "Address";
+            pairs[nbPairs].value = strings.common.fullAddress;
+            nbPairs++;
+#ifdef HAVE_DOMAIN_NAME
+        }
+#endif
+        if (N_storage.displayNonce) {
+            pairs[nbPairs].item = "Nonce";
+            pairs[nbPairs].value = strings.common.nonce;
+            nbPairs++;
+        }
+        pairs[nbPairs].item = "Max fees";
+        pairs[nbPairs].value = strings.common.maxFee;
+        nbPairs++;
+
+        if (tx_approval_context.displayNetwork) {
+            pairs[nbPairs].item = "Network";
+            pairs[nbPairs].value = strings.common.network_name;
+            nbPairs++;
+        }
+    }
+    return nbPairs;
+}
+
+static void reviewCommon(void) {
+    explicit_bzero(&pairsList, sizeof(pairsList));
+
+    pairsList.nbPairs = setTagValuePairs();
+    pairsList.pairs = pairs;
+
+    if (tx_approval_context.fromPlugin) {
+        uint32_t buf_size = SHARED_BUFFER_SIZE / 2;
         char op_name[sizeof(strings.common.fullAmount)];
         plugin_ui_get_id();
 
         get_lowercase_operation(op_name, sizeof(op_name));
-        if (pluginType == EXTERNAL) {
-            snprintf(g_stax_shared_buffer,
-                     sizeof(g_stax_shared_buffer),
-                     "Review transaction\nto %s\non %s",
-                     op_name,
-                     strings.common.fullAddress);
-        } else {
-            snprintf(g_stax_shared_buffer,
-                     sizeof(g_stax_shared_buffer),
-                     "Review transaction\nto %s\n%s",
-                     op_name,
-                     strings.common.fullAddress);
-        }
-        nbgl_useCaseReviewStart(get_tx_icon(),
-                                g_stax_shared_buffer,
-                                NULL,
-                                REJECT(TEXT_TX),
-                                reviewContinue,
-                                rejectTransactionQuestion);
-        prepare_sign_text();
+        snprintf(g_stax_shared_buffer,
+                 buf_size,
+                 "Review transaction\nto %s\n%s%s",
+                 op_name,
+                 (pluginType == EXTERNAL ? "on " : ""),
+                 strings.common.fullAddress);
+        // Finish text: replace "Review" by "Sign" and add questionmark
+        snprintf(g_stax_shared_buffer + buf_size,
+                 buf_size,
+                 "Sign transaction\nto %s\n%s%s",
+                 op_name,
+                 (pluginType == EXTERNAL ? "on " : ""),
+                 strings.common.fullAddress);
+
+        nbgl_useCaseReview(TYPE_TRANSACTION,
+                           &pairsList,
+                           get_tx_icon(),
+                           g_stax_shared_buffer,
+                           NULL,
+                           g_stax_shared_buffer + buf_size,
+                           reviewChoice);
     } else {
-        nbgl_useCaseReviewStart(get_tx_icon(),
-                                REVIEW(TEXT_TX),
-                                NULL,
-                                REJECT(TEXT_TX),
-                                reviewContinue,
-                                rejectTransactionQuestion);
+        nbgl_useCaseReview(TYPE_TRANSACTION,
+                           &pairsList,
+                           get_tx_icon(),
+                           REVIEW("transaction"),
+                           NULL,
+                           SIGN("transaction"),
+                           reviewChoice);
+    }
+}
+
+void blind_confirm_cb(bool confirm) {
+    if (confirm) {
+        reviewCommon();
+    } else {
+        reviewReject();
     }
 }
 
 void ux_approve_tx(bool fromPlugin) {
+    memset(&tx_approval_context, 0, sizeof(tx_approval_context));
+
     tx_approval_context.blindSigning =
         !fromPlugin && tmpContent.txContent.dataPresent && !N_storage.contractDetails;
     tx_approval_context.fromPlugin = fromPlugin;
@@ -309,5 +220,16 @@ void ux_approve_tx(bool fromPlugin) {
         tx_approval_context.displayNetwork = true;
     }
 
-    buildFirstPage();
+    if (tx_approval_context.blindSigning) {
+        nbgl_useCaseChoice(&C_Important_Circle_64px,
+                           "Blind Signing",
+                           "This transaction cannot be securely interpreted by "
+                           "your Ledger device.\nIt might put "
+                           "your assets at risk.",
+                           "Continue",
+                           "Cancel",
+                           blind_confirm_cb);
+    } else {
+        reviewCommon();
+    }
 }
diff --git a/tests/ragger/snapshots/stax/domain_name_non_mainnet/00000.png b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00000.png
index 0108042c..115c3686 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_non_mainnet/00000.png and b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00000.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_non_mainnet/00001.png b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00001.png
index 9c677e29..a20a36b2 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_non_mainnet/00001.png and b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00001.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_non_mainnet/00002.png b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00002.png
index 5bc6ddc9..d87ae618 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_non_mainnet/00002.png and b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00002.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_non_mainnet/00003.png b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00003.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_non_mainnet/00003.png and b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00003.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00000.png b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00000.png
index 74fa840c..a39bb82f 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00000.png and b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00000.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00001.png b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00001.png
index 5962c92e..690fecc5 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00001.png and b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00001.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00002.png b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00002.png
index 285801cf..8bf548ca 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00002.png and b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00002.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00003.png b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00003.png
index aed7d333..c8918a98 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00003.png and b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00003.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00004.png b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00004.png and b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00004.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_verbose_False/00000.png b/tests/ragger/snapshots/stax/domain_name_verbose_False/00000.png
index f992e718..f1b35e47 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_False/00000.png and b/tests/ragger/snapshots/stax/domain_name_verbose_False/00000.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_verbose_False/00001.png b/tests/ragger/snapshots/stax/domain_name_verbose_False/00001.png
index b12e252d..d5ab1544 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_False/00001.png and b/tests/ragger/snapshots/stax/domain_name_verbose_False/00001.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_verbose_False/00002.png b/tests/ragger/snapshots/stax/domain_name_verbose_False/00002.png
index bc1ca938..687a019c 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_False/00002.png and b/tests/ragger/snapshots/stax/domain_name_verbose_False/00002.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_verbose_False/00003.png b/tests/ragger/snapshots/stax/domain_name_verbose_False/00003.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_False/00003.png and b/tests/ragger/snapshots/stax/domain_name_verbose_False/00003.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_verbose_True/00000.png b/tests/ragger/snapshots/stax/domain_name_verbose_True/00000.png
index f992e718..b22161fe 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_True/00000.png and b/tests/ragger/snapshots/stax/domain_name_verbose_True/00000.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_verbose_True/00001.png b/tests/ragger/snapshots/stax/domain_name_verbose_True/00001.png
index 03184921..de9fd7f5 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_True/00001.png and b/tests/ragger/snapshots/stax/domain_name_verbose_True/00001.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_verbose_True/00002.png b/tests/ragger/snapshots/stax/domain_name_verbose_True/00002.png
index d4429dd5..637827a1 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_True/00002.png and b/tests/ragger/snapshots/stax/domain_name_verbose_True/00002.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_verbose_True/00003.png b/tests/ragger/snapshots/stax/domain_name_verbose_True/00003.png
index 687a019c..c19f5135 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_True/00003.png and b/tests/ragger/snapshots/stax/domain_name_verbose_True/00003.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_verbose_True/00004.png b/tests/ragger/snapshots/stax/domain_name_verbose_True/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_True/00004.png and b/tests/ragger/snapshots/stax/domain_name_verbose_True/00004.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_wrong_addr/00000.png b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00000.png
index f992e718..f1b35e47 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_wrong_addr/00000.png and b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00000.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_wrong_addr/00001.png b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00001.png
index 4fdbc625..8b4da43c 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_wrong_addr/00001.png and b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00001.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_wrong_addr/00002.png b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00002.png
index bc1ca938..687a019c 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_wrong_addr/00002.png and b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00002.png differ
diff --git a/tests/ragger/snapshots/stax/domain_name_wrong_addr/00003.png b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00003.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_wrong_addr/00003.png and b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00000.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00000.png
index a052cf5b..9c2c8759 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00000.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00001.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00001.png
index fff290d2..222e3003 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00001.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00002.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00002.png
index 8a12928a..15628d14 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00002.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00003.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00003.png
index 3add68c8..c2497ee0 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00003.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00004.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00004.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00000.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00000.png
index 793dc7ce..aa5486db 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00000.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00001.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00001.png
index ac999f45..4dd300cf 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00001.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00002.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00002.png
index ebba918e..bfbf1090 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00002.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00003.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00003.png
index 97b18b86..013d892f 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00003.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00004.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00004.png
index f1745c66..0460b4a9 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00004.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00005.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00005.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00000.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00000.png
index 2f11ba6e..36f72be6 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00000.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00001.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00001.png
index ac999f45..4dd300cf 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00001.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00002.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00002.png
index 013c76cf..4493c03c 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00002.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00003.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00003.png
index 637827a1..079d916e 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00003.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00004.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00004.png
index 1ebf85c4..73b69693 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00004.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00005.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00005.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00000.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00000.png
index 4db1d2e9..b59ebfa3 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00000.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00001.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00001.png
index 8e0349ca..be471333 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00001.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00002.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00002.png
index eb3fbaff..67388ea4 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00002.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00003.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00003.png
index 637827a1..079d916e 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00003.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00004.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00004.png
index 2e4e974b..56bea13a 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00004.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00005.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00005.png
index 9d261148..babad989 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00005.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00000.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00000.png
index 4db1d2e9..b59ebfa3 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00000.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00001.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00001.png
index 8e0349ca..be471333 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00001.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00002.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00002.png
index eb3fbaff..67388ea4 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00002.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00003.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00003.png
index 637827a1..079d916e 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00003.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00004.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00004.png
index 2e4e974b..56bea13a 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00004.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00005.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00005.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00000.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00000.png
index 84aef9b7..70e15c58 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00000.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00001.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00001.png
index ac999f45..4dd300cf 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00001.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00002.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00002.png
index c735e5bd..aca2b296 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00002.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00003.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00003.png
index 31f14901..7094b8bb 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00003.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00004.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00004.png
index 82b2b678..cf3c47c2 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00004.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00005.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00005.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00000.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00000.png
index b4c13a18..14d6f224 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00000.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00001.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00001.png
index ac999f45..4dd300cf 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00001.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00002.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00002.png
index f8ef3281..b3735685 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00002.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00003.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00003.png
index 902eabaf..5f4abe87 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00003.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00004.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00004.png
index 61c85763..deb19bf5 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00004.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00005.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00005.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00000.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00000.png
index 3507984e..a760f9d8 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00000.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00001.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00001.png
index d77ef275..d26b8b57 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00001.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00002.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00002.png
index 079bac22..39ea40ff 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00002.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00003.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00003.png
index 4ea90064..2f6a5743 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00003.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00004.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00004.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00000.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00000.png
index ea3b0441..02c71a88 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00000.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00001.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00001.png
index 783fdcab..fab7beb1 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00001.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00002.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00002.png
index 2889b809..6bf8e30e 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00002.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00003.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00003.png
index 5aa28c72..68348413 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00003.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00004.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00004.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00000.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00000.png
index 7a48edd5..8b583016 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00000.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00001.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00001.png
index 783fdcab..fab7beb1 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00001.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00002.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00002.png
index 50a0880d..164914df 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00002.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00003.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00003.png
index c51949c5..7a02616f 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00003.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00004.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00004.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_1/00000.png b/tests/ragger/snapshots/stax/erc721_approve_1/00000.png
index 3507984e..a760f9d8 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_1/00000.png and b/tests/ragger/snapshots/stax/erc721_approve_1/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_1/00001.png b/tests/ragger/snapshots/stax/erc721_approve_1/00001.png
index a479dee5..6ceff71c 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_1/00001.png and b/tests/ragger/snapshots/stax/erc721_approve_1/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_1/00002.png b/tests/ragger/snapshots/stax/erc721_approve_1/00002.png
index ec7ce097..326765cc 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_1/00002.png and b/tests/ragger/snapshots/stax/erc721_approve_1/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_1/00003.png b/tests/ragger/snapshots/stax/erc721_approve_1/00003.png
index 4ea90064..2f6a5743 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_1/00003.png and b/tests/ragger/snapshots/stax/erc721_approve_1/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_1/00004.png b/tests/ragger/snapshots/stax/erc721_approve_1/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_1/00004.png and b/tests/ragger/snapshots/stax/erc721_approve_1/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_137/00000.png b/tests/ragger/snapshots/stax/erc721_approve_137/00000.png
index ea3b0441..edf970ee 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_137/00000.png and b/tests/ragger/snapshots/stax/erc721_approve_137/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_137/00001.png b/tests/ragger/snapshots/stax/erc721_approve_137/00001.png
index 8a1c9537..cb4fb8e7 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_137/00001.png and b/tests/ragger/snapshots/stax/erc721_approve_137/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_137/00002.png b/tests/ragger/snapshots/stax/erc721_approve_137/00002.png
index 4e99e678..312a8b85 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_137/00002.png and b/tests/ragger/snapshots/stax/erc721_approve_137/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_137/00003.png b/tests/ragger/snapshots/stax/erc721_approve_137/00003.png
index 97b18b86..013d892f 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_137/00003.png and b/tests/ragger/snapshots/stax/erc721_approve_137/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_137/00004.png b/tests/ragger/snapshots/stax/erc721_approve_137/00004.png
index 1fc04a35..8dffb377 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_137/00004.png and b/tests/ragger/snapshots/stax/erc721_approve_137/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_137/00005.png b/tests/ragger/snapshots/stax/erc721_approve_137/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_137/00005.png and b/tests/ragger/snapshots/stax/erc721_approve_137/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_5/00000.png b/tests/ragger/snapshots/stax/erc721_approve_5/00000.png
index 7a48edd5..bbb6130d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_5/00000.png and b/tests/ragger/snapshots/stax/erc721_approve_5/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_5/00001.png b/tests/ragger/snapshots/stax/erc721_approve_5/00001.png
index 675b1ae4..ad4aaa33 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_5/00001.png and b/tests/ragger/snapshots/stax/erc721_approve_5/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_5/00002.png b/tests/ragger/snapshots/stax/erc721_approve_5/00002.png
index 186b27cd..a44ea984 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_5/00002.png and b/tests/ragger/snapshots/stax/erc721_approve_5/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_5/00003.png b/tests/ragger/snapshots/stax/erc721_approve_5/00003.png
index 637827a1..079d916e 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_5/00003.png and b/tests/ragger/snapshots/stax/erc721_approve_5/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_5/00004.png b/tests/ragger/snapshots/stax/erc721_approve_5/00004.png
index 107ce91b..69e740df 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_5/00004.png and b/tests/ragger/snapshots/stax/erc721_approve_5/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_5/00005.png b/tests/ragger/snapshots/stax/erc721_approve_5/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_5/00005.png and b/tests/ragger/snapshots/stax/erc721_approve_5/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00000.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00000.png
index 4db1d2e9..920729b5 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00000.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00001.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00001.png
index 9488ed1c..16fb7383 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00001.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00002.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00002.png
index ec7ce097..326765cc 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00002.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00003.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00003.png
index b73cefa5..17f3b48a 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00003.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00004.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00004.png
index 9d261148..babad989 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00004.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00000.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00000.png
index 4db1d2e9..920729b5 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00000.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00001.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00001.png
index 9488ed1c..16fb7383 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00001.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00002.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00002.png
index ec7ce097..326765cc 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00002.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00003.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00003.png
index b73cefa5..17f3b48a 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00003.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00004.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00004.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00000.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00000.png
index 84aef9b7..70e15c58 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00000.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00001.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00001.png
index 4d9ac34b..fb0f7bbc 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00001.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00002.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00002.png
index 4e99e678..312a8b85 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00002.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00003.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00003.png
index 97b18b86..013d892f 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00003.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00004.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00004.png
index 82b2b678..cf3c47c2 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00004.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00005.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00005.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00000.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00000.png
index b4c13a18..14d6f224 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00000.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00001.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00001.png
index 759bdc47..c7063c44 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00001.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00002.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00002.png
index 186b27cd..a44ea984 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00002.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00003.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00003.png
index 637827a1..079d916e 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00003.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00004.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00004.png
index 61c85763..deb19bf5 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00004.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00005.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00005.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00000.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00000.png
index 3507984e..a760f9d8 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00000.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00001.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00001.png
index d64e222d..1c7c4bb6 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00001.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00002.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00002.png
index 7de0c0e9..52901c71 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00002.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00003.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00003.png
index 4ea90064..2f6a5743 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00003.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00004.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00004.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00000.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00000.png
index ea3b0441..02c71a88 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00000.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00001.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00001.png
index 36791d88..125f695a 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00001.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00002.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00002.png
index 7479cde7..7d7f7e18 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00002.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00003.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00003.png
index 5aa28c72..68348413 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00003.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00004.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00004.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00000.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00000.png
index 7a48edd5..8b583016 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00000.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00001.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00001.png
index 49d18f1b..ac60009d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00001.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00002.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00002.png
index acad067d..8d8ae2e2 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00002.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00003.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00003.png
index c51949c5..7a02616f 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00003.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00004.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00004.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00000.png b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00000.png
index 4db1d2e9..920729b5 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00000.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00001.png b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00001.png
index 9488ed1c..16fb7383 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00001.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00002.png b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00002.png
index ec7ce097..326765cc 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00002.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00003.png b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00003.png
index b73cefa5..17f3b48a 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00003.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00004.png b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00004.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00000.png b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00000.png
index 84aef9b7..70e15c58 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00000.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00001.png b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00001.png
index 4d9ac34b..fb0f7bbc 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00001.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00002.png b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00002.png
index 4e99e678..312a8b85 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00002.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00003.png b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00003.png
index 97b18b86..013d892f 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00003.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00004.png b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00004.png
index 82b2b678..cf3c47c2 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00004.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00005.png b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00005.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00000.png b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00000.png
index b4c13a18..14d6f224 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00000.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00000.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00001.png b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00001.png
index 759bdc47..c7063c44 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00001.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00001.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00002.png b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00002.png
index 186b27cd..a44ea984 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00002.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00003.png b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00003.png
index 637827a1..079d916e 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00003.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00004.png b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00004.png
index 61c85763..deb19bf5 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00004.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00005.png b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00005.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00005.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/stax/test_clone_thundercore/00000.png b/tests/ragger/snapshots/stax/test_clone_thundercore/00000.png
index f992e718..f1b35e47 100644
Binary files a/tests/ragger/snapshots/stax/test_clone_thundercore/00000.png and b/tests/ragger/snapshots/stax/test_clone_thundercore/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_clone_thundercore/00001.png b/tests/ragger/snapshots/stax/test_clone_thundercore/00001.png
index aaf07456..5b58c610 100644
Binary files a/tests/ragger/snapshots/stax/test_clone_thundercore/00001.png and b/tests/ragger/snapshots/stax/test_clone_thundercore/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_clone_thundercore/00002.png b/tests/ragger/snapshots/stax/test_clone_thundercore/00002.png
index bc1ca938..687a019c 100644
Binary files a/tests/ragger/snapshots/stax/test_clone_thundercore/00002.png and b/tests/ragger/snapshots/stax/test_clone_thundercore/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_clone_thundercore/00003.png b/tests/ragger/snapshots/stax/test_clone_thundercore/00003.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/test_clone_thundercore/00003.png and b/tests/ragger/snapshots/stax/test_clone_thundercore/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid/00000.png b/tests/ragger/snapshots/stax/test_legacy_chainid/00000.png
index 74fa840c..a39bb82f 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_chainid/00000.png and b/tests/ragger/snapshots/stax/test_legacy_chainid/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid/00001.png b/tests/ragger/snapshots/stax/test_legacy_chainid/00001.png
index 6a59429f..7c93eac3 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_chainid/00001.png and b/tests/ragger/snapshots/stax/test_legacy_chainid/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid/00002.png b/tests/ragger/snapshots/stax/test_legacy_chainid/00002.png
index 930dba7a..c25fae26 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_chainid/00002.png and b/tests/ragger/snapshots/stax/test_legacy_chainid/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid/00003.png b/tests/ragger/snapshots/stax/test_legacy_chainid/00003.png
index aed7d333..c8918a98 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_chainid/00003.png and b/tests/ragger/snapshots/stax/test_legacy_chainid/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid/00004.png b/tests/ragger/snapshots/stax/test_legacy_chainid/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_chainid/00004.png and b/tests/ragger/snapshots/stax/test_legacy_chainid/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00000.png b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00000.png
index 5f9bab11..7d081358 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00000.png and b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00001.png b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00001.png
index f13c0f55..baa3da77 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00001.png and b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00002.png b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00002.png
index 35c26534..6d7d00e9 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00002.png and b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00003.png b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00003.png
index ff517f2e..dfd5e789 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00003.png and b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00004.png b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00004.png and b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00000.png b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00000.png
index f992e718..b22161fe 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00000.png and b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00001.png b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00001.png
index 107b38cc..9cd93f0d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00001.png and b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00002.png b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00002.png
index 24dbb3ca..637827a1 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00002.png and b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00003.png b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00003.png
index d4429dd5..c19f5135 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00003.png and b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00004.png b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00004.png
index 687a019c..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00004.png and b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00005.png b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00005.png
index a21279c8..b1ff1b3a 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00005.png and b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00005.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00006.png b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00006.png
deleted file mode 100644
index b1ff1b3a..00000000
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/confirm/00000.png b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/confirm/00000.png
new file mode 100644
index 00000000..d4e603a8
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/confirm/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00000.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00000.png
index f992e718..f1b35e47 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00000.png and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00001.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00001.png
index 107b38cc..0b2974b0 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00001.png and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00002.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00002.png
index ec36a96f..687a019c 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00002.png and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00003.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00003.png
index bc1ca938..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00003.png and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00004.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00004.png
index a21279c8..b1ff1b3a 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00004.png and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00005.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00005.png
deleted file mode 100644
index b1ff1b3a..00000000
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00005.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/confirm/00000.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/confirm/00000.png
new file mode 100644
index 00000000..d4e603a8
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_sign_blind_simple/confirm/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_eip_2930/00000.png b/tests/ragger/snapshots/stax/test_sign_eip_2930/00000.png
index 10cc8252..f33c2114 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_eip_2930/00000.png and b/tests/ragger/snapshots/stax/test_sign_eip_2930/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_eip_2930/00001.png b/tests/ragger/snapshots/stax/test_sign_eip_2930/00001.png
index 7009de19..a864b2e2 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_eip_2930/00001.png and b/tests/ragger/snapshots/stax/test_sign_eip_2930/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_eip_2930/00002.png b/tests/ragger/snapshots/stax/test_sign_eip_2930/00002.png
index a27b17e4..7142a7b2 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_eip_2930/00002.png and b/tests/ragger/snapshots/stax/test_sign_eip_2930/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_eip_2930/00003.png b/tests/ragger/snapshots/stax/test_sign_eip_2930/00003.png
index c47bf6c2..2615f01e 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_eip_2930/00003.png and b/tests/ragger/snapshots/stax/test_sign_eip_2930/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_eip_2930/00004.png b/tests/ragger/snapshots/stax/test_sign_eip_2930/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_eip_2930/00004.png and b/tests/ragger/snapshots/stax/test_sign_eip_2930/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00000.png b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00000.png
index f992e718..b22161fe 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00000.png and b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00001.png b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00001.png
index 915fb9ca..7963e8c0 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00001.png and b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00002.png b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00002.png
index 2833c238..3d10272b 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00002.png and b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00003.png b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00003.png
index 687a019c..c19f5135 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00003.png and b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00004.png b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00004.png and b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_nonce_display/00000.png b/tests/ragger/snapshots/stax/test_sign_nonce_display/00000.png
index f992e718..b22161fe 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_nonce_display/00000.png and b/tests/ragger/snapshots/stax/test_sign_nonce_display/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_nonce_display/00001.png b/tests/ragger/snapshots/stax/test_sign_nonce_display/00001.png
index 37f64b16..b3afcfdf 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_nonce_display/00001.png and b/tests/ragger/snapshots/stax/test_sign_nonce_display/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_nonce_display/00002.png b/tests/ragger/snapshots/stax/test_sign_nonce_display/00002.png
index d4429dd5..637827a1 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_nonce_display/00002.png and b/tests/ragger/snapshots/stax/test_sign_nonce_display/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_nonce_display/00003.png b/tests/ragger/snapshots/stax/test_sign_nonce_display/00003.png
index 687a019c..c19f5135 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_nonce_display/00003.png and b/tests/ragger/snapshots/stax/test_sign_nonce_display/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_nonce_display/00004.png b/tests/ragger/snapshots/stax/test_sign_nonce_display/00004.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_nonce_display/00004.png and b/tests/ragger/snapshots/stax/test_sign_nonce_display/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_reject/00000.png b/tests/ragger/snapshots/stax/test_sign_reject/00000.png
index f992e718..f1b35e47 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_reject/00000.png and b/tests/ragger/snapshots/stax/test_sign_reject/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_reject/00001.png b/tests/ragger/snapshots/stax/test_sign_reject/00001.png
index ec36a96f..0b2974b0 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_reject/00001.png and b/tests/ragger/snapshots/stax/test_sign_reject/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_reject/00002.png b/tests/ragger/snapshots/stax/test_sign_reject/00002.png
index bc1ca938..687a019c 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_reject/00002.png and b/tests/ragger/snapshots/stax/test_sign_reject/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_reject/00003.png b/tests/ragger/snapshots/stax/test_sign_reject/00003.png
index 9d261148..babad989 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_reject/00003.png and b/tests/ragger/snapshots/stax/test_sign_reject/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_simple/00000.png b/tests/ragger/snapshots/stax/test_sign_simple/00000.png
index f992e718..f1b35e47 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_simple/00000.png and b/tests/ragger/snapshots/stax/test_sign_simple/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_simple/00001.png b/tests/ragger/snapshots/stax/test_sign_simple/00001.png
index ec36a96f..0b2974b0 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_simple/00001.png and b/tests/ragger/snapshots/stax/test_sign_simple/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_simple/00002.png b/tests/ragger/snapshots/stax/test_sign_simple/00002.png
index bc1ca938..687a019c 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_simple/00002.png and b/tests/ragger/snapshots/stax/test_sign_simple/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_simple/00003.png b/tests/ragger/snapshots/stax/test_sign_simple/00003.png
index a21279c8..2ba6d27d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_simple/00003.png and b/tests/ragger/snapshots/stax/test_sign_simple/00003.png differ
diff --git a/tests/ragger/test_sign.py b/tests/ragger/test_sign.py
index 04b94c85..98e3cf11 100644
--- a/tests/ragger/test_sign.py
+++ b/tests/ragger/test_sign.py
@@ -9,7 +9,7 @@ from client.utils import recover_transaction
 from ragger.error import ExceptionRAPDU
 from ragger.backend import BackendInterface
 from ragger.firmware import Firmware
-from ragger.navigator import Navigator
+from ragger.navigator import Navigator, NavInsID
 from ragger.navigator.navigation_scenario import NavigateWithScenario
 
 
@@ -32,11 +32,13 @@ AMOUNT2 = 0.31415
 
 def common(firmware: Firmware,
            backend: BackendInterface,
+           navigator: Navigator,
            scenario_navigator: NavigateWithScenario,
            default_screenshot_path: Path,
            tx_params: dict,
            test_name: str = "",
-           path: str = BIP32_PATH):
+           path: str = BIP32_PATH,
+           confirm: bool = False):
     app_client = EthAppClient(backend)
 
     with app_client.get_public_addr(bip32_path=path, display=False):
@@ -44,6 +46,12 @@ def common(firmware: Firmware,
     _, DEVICE_ADDR, _ = ResponseParser.pk_addr(app_client.response().data)
 
     with app_client.sign(path, tx_params):
+        if not firmware.device.startswith("nano") and confirm:
+            navigator.navigate_and_compare(default_screenshot_path,
+                                           f"{test_name}/confirm",
+                                           [NavInsID.USE_CASE_CHOICE_CONFIRM],
+                                           screen_change_after_last_instruction=False)
+
         if firmware.device.startswith("nano"):
             end_text = "Accept"
         else:
@@ -93,6 +101,7 @@ def common_fail(backend: BackendInterface,
 
 def test_legacy(firmware: Firmware,
                 backend: BackendInterface,
+                navigator: Navigator,
                 scenario_navigator: NavigateWithScenario,
                 default_screenshot_path: Path):
     tx_params: dict = {
@@ -103,7 +112,7 @@ def test_legacy(firmware: Firmware,
         "value": Web3.to_wei(AMOUNT, "ether"),
         "chainId": CHAIN_ID
     }
-    common(firmware, backend, scenario_navigator, default_screenshot_path, tx_params)
+    common(firmware, backend, navigator, scenario_navigator, default_screenshot_path, tx_params)
 
 
 # Transfer amount >= 2^87 Eth on Ethereum app should fail
@@ -122,6 +131,7 @@ def test_legacy_send_error(backend: BackendInterface):
 # Transfer bsc
 def test_legacy_send_bsc(firmware: Firmware,
                          backend: BackendInterface,
+                         navigator: Navigator,
                          scenario_navigator: NavigateWithScenario,
                          test_name: str,
                          default_screenshot_path: Path):
@@ -133,12 +143,13 @@ def test_legacy_send_bsc(firmware: Firmware,
         "value": Web3.to_wei(AMOUNT2, "ether"),
         "chainId": 56
     }
-    common(firmware, backend, scenario_navigator, default_screenshot_path, tx_params, test_name, BIP32_PATH2)
+    common(firmware, backend, navigator, scenario_navigator, default_screenshot_path, tx_params, test_name, BIP32_PATH2)
 
 
 # Transfer on network 112233445566 on Ethereum
 def test_legacy_chainid(firmware: Firmware,
                         backend: BackendInterface,
+                        navigator: Navigator,
                         scenario_navigator: NavigateWithScenario,
                         test_name: str,
                         default_screenshot_path: Path):
@@ -150,7 +161,7 @@ def test_legacy_chainid(firmware: Firmware,
         "value": Web3.to_wei(AMOUNT2, "ether"),
         "chainId": 112233445566
     }
-    common(firmware, backend, scenario_navigator, default_screenshot_path, tx_params, test_name, BIP32_PATH2)
+    common(firmware, backend, navigator, scenario_navigator, default_screenshot_path, tx_params, test_name, BIP32_PATH2)
 
 
 # Try to blind sign with setting disabled
@@ -168,6 +179,7 @@ def test_legacy_contract(backend: BackendInterface):
 
 def test_1559(firmware: Firmware,
               backend: BackendInterface,
+              navigator: Navigator,
               scenario_navigator: NavigateWithScenario,
               default_screenshot_path: Path):
     tx_params: dict = {
@@ -179,11 +191,12 @@ def test_1559(firmware: Firmware,
         "value": Web3.to_wei(AMOUNT, "ether"),
         "chainId": CHAIN_ID
     }
-    common(firmware, backend, scenario_navigator, default_screenshot_path, tx_params)
+    common(firmware, backend, navigator, scenario_navigator, default_screenshot_path, tx_params)
 
 
 def test_sign_simple(firmware: Firmware,
                      backend: BackendInterface,
+                     navigator: Navigator,
                      scenario_navigator: NavigateWithScenario,
                      test_name: str,
                      default_screenshot_path: Path):
@@ -195,11 +208,12 @@ def test_sign_simple(firmware: Firmware,
         "value": Web3.to_wei(AMOUNT2, "ether"),
         "chainId": CHAIN_ID
     }
-    common(firmware, backend, scenario_navigator, default_screenshot_path, tx_params, test_name, "m/44'/60'/1'/0/0")
+    common(firmware, backend, navigator, scenario_navigator, default_screenshot_path, tx_params, test_name, "m/44'/60'/1'/0/0")
 
 
 def test_sign_limit_nonce(firmware: Firmware,
                           backend: BackendInterface,
+                          navigator: Navigator,
                           scenario_navigator: NavigateWithScenario,
                           test_name: str,
                           default_screenshot_path: Path):
@@ -211,7 +225,7 @@ def test_sign_limit_nonce(firmware: Firmware,
         "value": 0x08762,
         "chainId": CHAIN_ID
     }
-    common(firmware, backend, scenario_navigator, default_screenshot_path, tx_params, test_name, "m/44'/60'/1'/0/0")
+    common(firmware, backend, navigator, scenario_navigator, default_screenshot_path, tx_params, test_name, "m/44'/60'/1'/0/0")
 
 
 def test_sign_nonce_display(firmware: Firmware,
@@ -231,7 +245,7 @@ def test_sign_nonce_display(firmware: Firmware,
         "value": Web3.to_wei(AMOUNT2, "ether"),
         "chainId": CHAIN_ID
     }
-    common(firmware, backend, scenario_navigator, default_screenshot_path, tx_params, test_name, "m/44'/60'/1'/0/0")
+    common(firmware, backend, navigator, scenario_navigator, default_screenshot_path, tx_params, test_name, "m/44'/60'/1'/0/0")
 
 
 def test_sign_blind_simple(firmware: Firmware,
@@ -252,7 +266,7 @@ def test_sign_blind_simple(firmware: Firmware,
         "chainId": CHAIN_ID,
         "data": data.encode('utf-8').hex()
     }
-    common(firmware, backend, scenario_navigator, default_screenshot_path, tx_params, test_name, "m/44'/60'/1'/0/0")
+    common(firmware, backend, navigator, scenario_navigator, default_screenshot_path, tx_params, test_name, "m/44'/60'/1'/0/0", True)
 
 
 def test_sign_blind_and_nonce_display(firmware: Firmware,
@@ -273,7 +287,7 @@ def test_sign_blind_and_nonce_display(firmware: Firmware,
         "chainId": CHAIN_ID,
         "data": data.encode('utf-8').hex()
     }
-    common(firmware, backend, scenario_navigator, default_screenshot_path, tx_params, test_name, "m/44'/60'/1'/0/0")
+    common(firmware, backend, navigator, scenario_navigator, default_screenshot_path, tx_params, test_name, "m/44'/60'/1'/0/0", True)
 
 
 def test_sign_reject(backend: BackendInterface,
@@ -330,6 +344,7 @@ def test_sign_blind_error_disabled(backend: BackendInterface):
 
 def test_sign_eip_2930(firmware: Firmware,
                        backend: BackendInterface,
+                       navigator: Navigator,
                        scenario_navigator: NavigateWithScenario,
                        test_name: str,
                        default_screenshot_path: Path):
@@ -350,4 +365,4 @@ def test_sign_eip_2930(firmware: Firmware,
             }
         ],
     }
-    common(firmware, backend, scenario_navigator, default_screenshot_path, tx_params, test_name)
+    common(firmware, backend, navigator, scenario_navigator, default_screenshot_path, tx_params, test_name)