diff --git a/src_nbgl/ui_approve_tx.c b/src_nbgl/ui_approve_tx.c
index 8abcdf1..cd8cfa5 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 0108042..115c368 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 9c677e2..a20a36b 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 5bc6ddc..d87ae61 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 a21279c..2ba6d27 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 74fa840..a39bb82 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 5962c92..690fecc 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 285801c..8bf548c 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 aed7d33..c8918a9 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 a21279c..2ba6d27 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 f992e71..f1b35e4 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 b12e252..d5ab154 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 bc1ca93..687a019 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 a21279c..2ba6d27 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 f992e71..b22161f 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 0318492..de9fd7f 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 d4429dd..637827a 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 687a019..c19f513 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 a21279c..2ba6d27 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 f992e71..f1b35e4 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 4fdbc62..8b4da43 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 bc1ca93..687a019 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 a21279c..2ba6d27 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 a052cf5..9c2c875 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 fff290d..222e300 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 8a12928..15628d1 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 3add68c..c2497ee 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 a21279c..2ba6d27 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 793dc7c..aa5486d 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 ac999f4..4dd300c 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 ebba918..bfbf109 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 97b18b8..013d892 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 f1745c6..0460b4a 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 a21279c..2ba6d27 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 2f11ba6..36f72be 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 ac999f4..4dd300c 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 013c76c..4493c03 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 637827a..079d916 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 1ebf85c..73b6969 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 a21279c..2ba6d27 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 4db1d2e..b59ebfa 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 8e0349c..be47133 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 eb3fbaf..67388ea 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 637827a..079d916 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 2e4e974..56bea13 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 9d26114..babad98 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 4db1d2e..b59ebfa 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 8e0349c..be47133 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 eb3fbaf..67388ea 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 637827a..079d916 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 2e4e974..56bea13 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 a21279c..2ba6d27 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 84aef9b..70e15c5 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 ac999f4..4dd300c 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 c735e5b..aca2b29 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 31f1490..7094b8b 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 82b2b67..cf3c47c 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 a21279c..2ba6d27 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 b4c13a1..14d6f22 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 ac999f4..4dd300c 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 f8ef328..b373568 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 902eaba..5f4abe8 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 61c8576..deb19bf 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 a21279c..2ba6d27 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 3507984..a760f9d 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 d77ef27..d26b8b5 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 079bac2..39ea40f 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 4ea9006..2f6a574 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 a21279c..2ba6d27 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 ea3b044..02c71a8 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 783fdca..fab7beb 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 2889b80..6bf8e30 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 5aa28c7..6834841 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 a21279c..2ba6d27 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 7a48edd..8b58301 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 783fdca..fab7beb 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 50a0880..164914d 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 c51949c..7a02616 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 a21279c..2ba6d27 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 3507984..a760f9d 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 a479dee..6ceff71 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 ec7ce09..326765c 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 4ea9006..2f6a574 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 a21279c..2ba6d27 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 ea3b044..edf970e 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 8a1c953..cb4fb8e 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 4e99e67..312a8b8 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 97b18b8..013d892 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 1fc04a3..8dffb37 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 a21279c..2ba6d27 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 7a48edd..bbb6130 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 675b1ae..ad4aaa3 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 186b27c..a44ea98 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 637827a..079d916 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 107ce91..69e740d 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 a21279c..2ba6d27 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 4db1d2e..920729b 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 9488ed1..16fb738 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 ec7ce09..326765c 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 b73cefa..17f3b48 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 9d26114..babad98 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 4db1d2e..920729b 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 9488ed1..16fb738 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 ec7ce09..326765c 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 b73cefa..17f3b48 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 a21279c..2ba6d27 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 84aef9b..70e15c5 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 4d9ac34..fb0f7bb 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 4e99e67..312a8b8 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 97b18b8..013d892 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 82b2b67..cf3c47c 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 a21279c..2ba6d27 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 b4c13a1..14d6f22 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 759bdc4..c7063c4 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 186b27c..a44ea98 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 637827a..079d916 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 61c8576..deb19bf 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 a21279c..2ba6d27 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 3507984..a760f9d 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 d64e222..1c7c4bb 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 7de0c0e..52901c7 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 4ea9006..2f6a574 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 a21279c..2ba6d27 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 ea3b044..02c71a8 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 36791d8..125f695 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 7479cde..7d7f7e1 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 5aa28c7..6834841 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 a21279c..2ba6d27 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 7a48edd..8b58301 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 49d18f1..ac60009 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 acad067..8d8ae2e 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 c51949c..7a02616 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 a21279c..2ba6d27 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 4db1d2e..920729b 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 9488ed1..16fb738 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 ec7ce09..326765c 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 b73cefa..17f3b48 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 a21279c..2ba6d27 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 84aef9b..70e15c5 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 4d9ac34..fb0f7bb 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 4e99e67..312a8b8 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 97b18b8..013d892 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 82b2b67..cf3c47c 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 a21279c..2ba6d27 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 b4c13a1..14d6f22 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 759bdc4..c7063c4 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 186b27c..a44ea98 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 637827a..079d916 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 61c8576..deb19bf 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 a21279c..2ba6d27 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 f992e71..f1b35e4 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 aaf0745..5b58c61 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 bc1ca93..687a019 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 a21279c..2ba6d27 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 74fa840..a39bb82 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 6a59429..7c93eac 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 930dba7..c25fae2 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 aed7d33..c8918a9 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 a21279c..2ba6d27 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 5f9bab1..7d08135 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 f13c0f5..baa3da7 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 35c2653..6d7d00e 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 ff517f2..dfd5e78 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 a21279c..2ba6d27 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 f992e71..b22161f 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 107b38c..9cd93f0 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 24dbb3c..637827a 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 d4429dd..c19f513 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 687a019..2ba6d27 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 a21279c..b1ff1b3 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 b1ff1b3..0000000
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 0000000..d4e603a
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 f992e71..f1b35e4 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 107b38c..0b2974b 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 ec36a96..687a019 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 bc1ca93..2ba6d27 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 a21279c..b1ff1b3 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 b1ff1b3..0000000
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 0000000..d4e603a
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 10cc825..f33c211 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 7009de1..a864b2e 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 a27b17e..7142a7b 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 c47bf6c..2615f01 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 a21279c..2ba6d27 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 f992e71..b22161f 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 915fb9c..7963e8c 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 2833c23..3d10272 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 687a019..c19f513 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 a21279c..2ba6d27 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 f992e71..b22161f 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 37f64b1..b3afcfd 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 d4429dd..637827a 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 687a019..c19f513 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 a21279c..2ba6d27 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 f992e71..f1b35e4 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 ec36a96..0b2974b 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 bc1ca93..687a019 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 9d26114..babad98 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 f992e71..f1b35e4 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 ec36a96..0b2974b 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 bc1ca93..687a019 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 a21279c..2ba6d27 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 39c818b..e7f668f 100644
--- a/tests/ragger/test_sign.py
+++ b/tests/ragger/test_sign.py
@@ -4,7 +4,7 @@ from web3 import Web3
 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
 
 from client.client import EthAppClient, StatusWord
@@ -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
@@ -170,6 +181,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 = {
@@ -181,11 +193,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):
@@ -197,11 +210,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):
@@ -213,7 +227,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,
@@ -233,7 +247,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,
@@ -256,11 +270,13 @@ def test_sign_blind_simple(firmware: Firmware,
     }
     common(firmware,
            backend,
+           navigator,
            scenario_navigator,
            default_screenshot_path,
            tx_params,
            test_name,
-           "m/44'/60'/1'/0/0")
+           "m/44'/60'/1'/0/0",
+           True)
 
 
 def test_sign_blind_and_nonce_display(firmware: Firmware,
@@ -283,11 +299,13 @@ def test_sign_blind_and_nonce_display(firmware: Firmware,
     }
     common(firmware,
            backend,
+           navigator,
            scenario_navigator,
            default_screenshot_path,
            tx_params,
            test_name,
-           "m/44'/60'/1'/0/0")
+           "m/44'/60'/1'/0/0",
+           True)
 
 
 def test_sign_reject(backend: BackendInterface,
@@ -344,6 +362,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):
@@ -364,4 +383,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)