diff --git a/client/src/ledger_app_clients/ethereum/settings.py b/client/src/ledger_app_clients/ethereum/settings.py
index 997d9e2..5ab26d4 100644
--- a/client/src/ledger_app_clients/ethereum/settings.py
+++ b/client/src/ledger_app_clients/ethereum/settings.py
@@ -37,8 +37,8 @@ def get_setting_position(device: str, setting: Union[NavInsID, SettingID]) -> tu
     settings_per_page = get_setting_per_page(device)
     if device == "stax":
         screen_height = 672  # px
-        header_height = 85  # px
-        footer_height = 132  # px
+        header_height = 88  # px
+        footer_height = 92  # px
         option_offset = 350  # px
     else:
         screen_height = 600  # px
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 992a25f..2e8a828 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 0e380a7..138bada 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 6c704ca..1d8135b 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 b954796..392165d 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_non_mainnet/00004.png b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00004.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_non_mainnet/00004.png and b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00004.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 a39bb82..b861aca 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 94a33f0..36cae6f 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 978bcbc..63f066b 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 c8918a9..e91c222 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 2ba6d27..392165d 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_unknown_chain/00005.png b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_unknown_chain/00005.png and b/tests/ragger/snapshots/stax/domain_name_unknown_chain/00005.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 b22161f..646ad0e 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 0e380a7..0129b92 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 637827a..d3fa2f4 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 c19f513..392165d 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_False/00004.png b/tests/ragger/snapshots/stax/domain_name_verbose_False/00004.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_False/00004.png and b/tests/ragger/snapshots/stax/domain_name_verbose_False/00004.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 b22161f..5638399 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 0e380a7..1ddf313 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 9b1f6c0..d6c26c7 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 c19f513..b5d99f6 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 2ba6d27..392165d 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_verbose_True/00005.png b/tests/ragger/snapshots/stax/domain_name_verbose_True/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_verbose_True/00005.png and b/tests/ragger/snapshots/stax/domain_name_verbose_True/00005.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 b22161f..646ad0e 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 f6dc513..a913de8 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 b9c2f91..d3fa2f4 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 c19f513..392165d 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/domain_name_wrong_addr/00004.png b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00004.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/domain_name_wrong_addr/00004.png and b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00004.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 a88f277..f1b9f80 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 f687233..43f68af 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 73e83df..f10dda9 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 079d916..15ac71a 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 0288c53..392165d 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_1/00005.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00005.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00005.png and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00006.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00000.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00000.png
index aa5486d..5afbca6 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 f687233..29267f7 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 630f614..1c6f5b5 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 7094b8b..2c45d20 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 0460b4a..392165d 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 2ba6d27..339db1b 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_137/00006.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_137/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00000.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00000.png
index 36f72be..6287c4f 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 f687233..29267f7 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 1ac57c4..a705c15 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 5f4abe8..48a5f5b 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 73b6969..392165d 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 2ba6d27..339db1b 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_safeBatchTransferFrom_5/00006.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00006.png and /dev/null 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 b59ebfa..9a0e146 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 f687233..43f68af 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 b586d7a..6ba7104 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 57ea99a..205e02a 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 56bea13..abc9677 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 babad98..2b66970 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-rejected/00006.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00006.png
index cebc8be..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00006.png and b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00006.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00007.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00007.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00007.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00000.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00000.png
index b59ebfa..9a0e146 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 f687233..43f68af 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 b586d7a..6ba7104 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 57ea99a..205e02a 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 56bea13..392165d 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 2ba6d27..339db1b 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_1/00006.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00000.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00000.png
index 70e15c5..b8f06d4 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 f687233..29267f7 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 2a6d464..01857eb 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 546dcd0..1e9a74f 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 cf3c47c..392165d 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 2ba6d27..339db1b 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_137/00006.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00000.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00000.png
index 14d6f22..111fb39 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 f687233..29267f7 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 f09bb7d..73c44ef 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 5d6b547..5ec9569 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 deb19bf..392165d 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 2ba6d27..339db1b 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_safeTransferFrom_5/00006.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00000.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00000.png
index a760f9d..7838b75 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 87ee05b..3f64a16 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 f0a22cb..b268e2a 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 2f6a574..ed27647 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 2ba6d27..392165d 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_1/00005.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00005.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00005.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 edf970e..ad2d747 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 18cdcb5..1fd5f83 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 9a68f57..5f2b12d 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 013d892..13a8a17 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 8dffb37..392165d 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_137/00005.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00005.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00005.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00006.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00000.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00000.png
index bbb6130..e15cfa6 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 18cdcb5..1fd5f83 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 8874aa1..f18835c 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 079d916..3399124 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 69e740d..392165d 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/erc1155_setApprovalForAll_5/00005.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00005.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00005.png and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00006.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_1/00000.png b/tests/ragger/snapshots/stax/erc721_approve_1/00000.png
index 99d3977..7838b75 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 6d3587c..06242c1 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 1d37810..ffdaeec 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 079d916..ed27647 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 38d1325..392165d 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_1/00005.png b/tests/ragger/snapshots/stax/erc721_approve_1/00005.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc721_approve_1/00005.png and b/tests/ragger/snapshots/stax/erc721_approve_1/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_1/00006.png b/tests/ragger/snapshots/stax/erc721_approve_1/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_approve_1/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_137/00000.png b/tests/ragger/snapshots/stax/erc721_approve_137/00000.png
index edf970e..ad2d747 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 6d3587c..cc31d88 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 c75f040..106b8af 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 7094b8b..13a8a17 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 8dffb37..392165d 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 2ba6d27..339db1b 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_137/00006.png b/tests/ragger/snapshots/stax/erc721_approve_137/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_approve_137/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_5/00000.png b/tests/ragger/snapshots/stax/erc721_approve_5/00000.png
index bbb6130..e15cfa6 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 6d3587c..f6753ed 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 57bff76..a217801 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 5f4abe8..3399124 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 69e740d..392165d 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 2ba6d27..339db1b 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_approve_5/00006.png b/tests/ragger/snapshots/stax/erc721_approve_5/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_approve_5/00006.png and /dev/null 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 b59ebfa..9a0e146 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 f687233..72ce397 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 f921643..ffdaeec 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 079d916..205e02a 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 56bea13..abc9677 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-rejected/00005.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00005.png
index babad98..2b66970 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00005.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00006.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00006.png
index cebc8be..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00006.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00006.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00007.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00007.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00007.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00000.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00000.png
index b59ebfa..9a0e146 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 f687233..72ce397 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 f921643..ffdaeec 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 079d916..205e02a 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 56bea13..392165d 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_1/00005.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00005.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00005.png and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00006.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00000.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00000.png
index 70e15c5..b8f06d4 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 f687233..76d10cb 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 3944ec8..106b8af 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 7094b8b..1e9a74f 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 cf3c47c..392165d 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 2ba6d27..339db1b 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_137/00006.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_137/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00000.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00000.png
index 14d6f22..111fb39 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 f687233..2020f0e 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 61efb0a..a217801 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 5f4abe8..5ec9569 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 deb19bf..392165d 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 2ba6d27..339db1b 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_safeTransferFrom_5/00006.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00000.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00000.png
index a760f9d..7838b75 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 87ee05b..8a53736 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 12223e2..4fb537c 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 2f6a574..ed27647 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 2ba6d27..392165d 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_1/00005.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00005.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00005.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 edf970e..ad2d747 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 18cdcb5..1f94ad4 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 9f8aa52..e8aa3ef 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 013d892..13a8a17 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 8dffb37..392165d 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_137/00005.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00005.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00005.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00006.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00000.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00000.png
index bbb6130..e15cfa6 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 18cdcb5..272200d 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 6bd5c51..0f0b663 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 079d916..3399124 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 69e740d..392165d 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_setApprovalForAll_5/00005.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00005.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00005.png and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00006.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00000.png b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00000.png
index b59ebfa..9a0e146 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 f687233..72ce397 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 f921643..ffdaeec 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 079d916..205e02a 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 56bea13..392165d 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_1/00005.png b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00005.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00005.png and b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00006.png b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00000.png b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00000.png
index 70e15c5..b8f06d4 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 f687233..76d10cb 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 3944ec8..106b8af 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 7094b8b..1e9a74f 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 cf3c47c..392165d 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 2ba6d27..339db1b 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_137/00006.png b/tests/ragger/snapshots/stax/erc721_transferFrom_137/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_137/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00000.png b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00000.png
index 14d6f22..111fb39 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 f687233..2020f0e 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 61efb0a..a217801 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 5f4abe8..5ec9569 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 deb19bf..392165d 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 2ba6d27..339db1b 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/erc721_transferFrom_5/00006.png b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00006.png
deleted file mode 100644
index b1ff1b3..0000000
Binary files a/tests/ragger/snapshots/stax/erc721_transferFrom_5/00006.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/get_pk_1/00000.png b/tests/ragger/snapshots/stax/get_pk_1/00000.png
index 0c6d19c..8b86980 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_1/00000.png and b/tests/ragger/snapshots/stax/get_pk_1/00000.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_1/00001.png b/tests/ragger/snapshots/stax/get_pk_1/00001.png
index a52cf1e..74e666d 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_1/00001.png and b/tests/ragger/snapshots/stax/get_pk_1/00001.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_1/00002.png b/tests/ragger/snapshots/stax/get_pk_1/00002.png
index 3f906b2..7a49478 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_1/00002.png and b/tests/ragger/snapshots/stax/get_pk_1/00002.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_1/00003.png b/tests/ragger/snapshots/stax/get_pk_1/00003.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_1/00003.png and b/tests/ragger/snapshots/stax/get_pk_1/00003.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_137/00000.png b/tests/ragger/snapshots/stax/get_pk_137/00000.png
index fe25cec..2713f4b 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_137/00000.png and b/tests/ragger/snapshots/stax/get_pk_137/00000.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_137/00001.png b/tests/ragger/snapshots/stax/get_pk_137/00001.png
index a52cf1e..74e666d 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_137/00001.png and b/tests/ragger/snapshots/stax/get_pk_137/00001.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_137/00002.png b/tests/ragger/snapshots/stax/get_pk_137/00002.png
index 3f906b2..7a49478 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_137/00002.png and b/tests/ragger/snapshots/stax/get_pk_137/00002.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_137/00003.png b/tests/ragger/snapshots/stax/get_pk_137/00003.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_137/00003.png and b/tests/ragger/snapshots/stax/get_pk_137/00003.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_2/00000.png b/tests/ragger/snapshots/stax/get_pk_2/00000.png
index eb0764c..499da81 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_2/00000.png and b/tests/ragger/snapshots/stax/get_pk_2/00000.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_2/00001.png b/tests/ragger/snapshots/stax/get_pk_2/00001.png
index a52cf1e..74e666d 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_2/00001.png and b/tests/ragger/snapshots/stax/get_pk_2/00001.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_2/00002.png b/tests/ragger/snapshots/stax/get_pk_2/00002.png
index 3f906b2..7a49478 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_2/00002.png and b/tests/ragger/snapshots/stax/get_pk_2/00002.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_2/00003.png b/tests/ragger/snapshots/stax/get_pk_2/00003.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_2/00003.png and b/tests/ragger/snapshots/stax/get_pk_2/00003.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_5/00000.png b/tests/ragger/snapshots/stax/get_pk_5/00000.png
index 686a173..4e0ec82 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_5/00000.png and b/tests/ragger/snapshots/stax/get_pk_5/00000.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_5/00001.png b/tests/ragger/snapshots/stax/get_pk_5/00001.png
index a52cf1e..74e666d 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_5/00001.png and b/tests/ragger/snapshots/stax/get_pk_5/00001.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_5/00002.png b/tests/ragger/snapshots/stax/get_pk_5/00002.png
index 3f906b2..7a49478 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_5/00002.png and b/tests/ragger/snapshots/stax/get_pk_5/00002.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_5/00003.png b/tests/ragger/snapshots/stax/get_pk_5/00003.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_5/00003.png and b/tests/ragger/snapshots/stax/get_pk_5/00003.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_None/00000.png b/tests/ragger/snapshots/stax/get_pk_None/00000.png
index 0c6d19c..8b86980 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_None/00000.png and b/tests/ragger/snapshots/stax/get_pk_None/00000.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_None/00001.png b/tests/ragger/snapshots/stax/get_pk_None/00001.png
index a52cf1e..74e666d 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_None/00001.png and b/tests/ragger/snapshots/stax/get_pk_None/00001.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_None/00002.png b/tests/ragger/snapshots/stax/get_pk_None/00002.png
index 3f906b2..7a49478 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_None/00002.png and b/tests/ragger/snapshots/stax/get_pk_None/00002.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_None/00003.png b/tests/ragger/snapshots/stax/get_pk_None/00003.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_None/00003.png and b/tests/ragger/snapshots/stax/get_pk_None/00003.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_rejected_60/00000.png b/tests/ragger/snapshots/stax/get_pk_rejected_60/00000.png
index 0c6d19c..8b86980 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_rejected_60/00000.png and b/tests/ragger/snapshots/stax/get_pk_rejected_60/00000.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_rejected_60/00001.png b/tests/ragger/snapshots/stax/get_pk_rejected_60/00001.png
index a52cf1e..74e666d 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_rejected_60/00001.png and b/tests/ragger/snapshots/stax/get_pk_rejected_60/00001.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_rejected_60/00002.png b/tests/ragger/snapshots/stax/get_pk_rejected_60/00002.png
index b0eba3f..94c91bb 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_rejected_60/00002.png and b/tests/ragger/snapshots/stax/get_pk_rejected_60/00002.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_rejected_60/00003.png b/tests/ragger/snapshots/stax/get_pk_rejected_60/00003.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_rejected_60/00003.png and b/tests/ragger/snapshots/stax/get_pk_rejected_60/00003.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_rejected_700/00000.png b/tests/ragger/snapshots/stax/get_pk_rejected_700/00000.png
index 0c6d19c..8b86980 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_rejected_700/00000.png and b/tests/ragger/snapshots/stax/get_pk_rejected_700/00000.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_rejected_700/00001.png b/tests/ragger/snapshots/stax/get_pk_rejected_700/00001.png
index ee7079c..59b34f6 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_rejected_700/00001.png and b/tests/ragger/snapshots/stax/get_pk_rejected_700/00001.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_rejected_700/00002.png b/tests/ragger/snapshots/stax/get_pk_rejected_700/00002.png
index b0eba3f..94c91bb 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_rejected_700/00002.png and b/tests/ragger/snapshots/stax/get_pk_rejected_700/00002.png differ
diff --git a/tests/ragger/snapshots/stax/get_pk_rejected_700/00003.png b/tests/ragger/snapshots/stax/get_pk_rejected_700/00003.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/get_pk_rejected_700/00003.png and b/tests/ragger/snapshots/stax/get_pk_rejected_700/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00000.png b/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00000.png
index ab4ddc3..a84d3f9 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00000.png and b/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00001.png b/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00001.png
index b1e4c82..193370d 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00001.png and b/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00002.png b/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00002.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00002.png and b/tests/ragger/snapshots/stax/test_blind_sign_reject_in_risk_review/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00000.png b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00000.png
index ab4ddc3..a84d3f9 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00000.png and b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00001.png b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00001.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00001.png and b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00000.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00000.png
index ab4ddc3..a84d3f9 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_signed/00000.png and b/tests/ragger/snapshots/stax/test_blind_sign_signed/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00001.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00001.png
index b1e4c82..193370d 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_signed/00001.png and b/tests/ragger/snapshots/stax/test_blind_sign_signed/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00002.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00002.png
index b22161f..d1b475b 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_signed/00002.png and b/tests/ragger/snapshots/stax/test_blind_sign_signed/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00003.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00003.png
index eff07e3..83bb1fe 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_signed/00003.png and b/tests/ragger/snapshots/stax/test_blind_sign_signed/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00004.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00004.png
index d47d19d..2a79919 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_signed/00004.png and b/tests/ragger/snapshots/stax/test_blind_sign_signed/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00005.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00005.png
index c19f513..392165d 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_signed/00005.png and b/tests/ragger/snapshots/stax/test_blind_sign_signed/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 1e18d3d..6528f4a 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 e389448..3be9c65 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 931b49d..9d7c316 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 997705c..392165d 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_clone_thundercore/00004.png b/tests/ragger/snapshots/stax/test_clone_thundercore/00004.png
index 2ba6d27..be4fbb0 100644
Binary files a/tests/ragger/snapshots/stax/test_clone_thundercore/00004.png and b/tests/ragger/snapshots/stax/test_clone_thundercore/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_clone_thundercore/00005.png b/tests/ragger/snapshots/stax/test_clone_thundercore/00005.png
deleted file mode 100644
index 048cd3a..0000000
Binary files a/tests/ragger/snapshots/stax/test_clone_thundercore/00005.png and /dev/null differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00000.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00000.png
index b47dc20..eb8072d 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00000.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00001.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00001.png
index 4877fb0..37698d3 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00001.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png
index 33f0806..91fa3b1 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00003.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00003.png
index 9c2fa5d..fbea72d 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00003.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png
index 54aba60..cfee3ae 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00000.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00000.png
index b47dc20..eb8072d 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00000.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00001.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00001.png
index 88c9c50..c57d9b8 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00001.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00002.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00002.png
index 9c2fa5d..fbea72d 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00002.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00003.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00003.png
index 54aba60..cfee3ae 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00003.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_permit/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00000.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00000.png
index b47dc20..eb8072d 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00000.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00001.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00001.png
index 62cd3fb..9d2c54e 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00001.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00002.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00002.png
index 9c2fa5d..fbea72d 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00002.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00003.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00003.png
index 54aba60..cfee3ae 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00003.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_unlimited/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_get_eth2_pk/00000.png b/tests/ragger/snapshots/stax/test_get_eth2_pk/00000.png
index ab44fe4..1115702 100644
Binary files a/tests/ragger/snapshots/stax/test_get_eth2_pk/00000.png and b/tests/ragger/snapshots/stax/test_get_eth2_pk/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_get_eth2_pk/00001.png b/tests/ragger/snapshots/stax/test_get_eth2_pk/00001.png
index ab8f331..4a25c17 100644
Binary files a/tests/ragger/snapshots/stax/test_get_eth2_pk/00001.png and b/tests/ragger/snapshots/stax/test_get_eth2_pk/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_get_eth2_pk/00002.png b/tests/ragger/snapshots/stax/test_get_eth2_pk/00002.png
index 3f906b2..7a49478 100644
Binary files a/tests/ragger/snapshots/stax/test_get_eth2_pk/00002.png and b/tests/ragger/snapshots/stax/test_get_eth2_pk/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_get_eth2_pk/00003.png b/tests/ragger/snapshots/stax/test_get_eth2_pk/00003.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_get_eth2_pk/00003.png and b/tests/ragger/snapshots/stax/test_get_eth2_pk/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 a39bb82..b861aca 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 5291d6f..91b08b4 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 1741806..d081f46 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 c8918a9..e91c222 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 2ba6d27..392165d 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_chainid/00005.png b/tests/ragger/snapshots/stax/test_legacy_chainid/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_chainid/00005.png and b/tests/ragger/snapshots/stax/test_legacy_chainid/00005.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 7d08135..2a42d69 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 5b82eac..5a3513e 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 93cb488..8c511b0 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 dfd5e78..f6640bf 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 2ba6d27..392165d 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_legacy_send_bsc/00005.png b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_legacy_send_bsc/00005.png and b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00005.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_metamask/00000.png b/tests/ragger/snapshots/stax/test_personal_sign_metamask/00000.png
index f739811..1e99907 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_metamask/00000.png and b/tests/ragger/snapshots/stax/test_personal_sign_metamask/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_metamask/00001.png b/tests/ragger/snapshots/stax/test_personal_sign_metamask/00001.png
index e964717..f96e3a2 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_metamask/00001.png and b/tests/ragger/snapshots/stax/test_personal_sign_metamask/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_metamask/00002.png b/tests/ragger/snapshots/stax/test_personal_sign_metamask/00002.png
index 83a0d80..c5bb9c6 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_metamask/00002.png and b/tests/ragger/snapshots/stax/test_personal_sign_metamask/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_metamask/00003.png b/tests/ragger/snapshots/stax/test_personal_sign_metamask/00003.png
index 1c2d6cd..3ecf0b8 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_metamask/00003.png and b/tests/ragger/snapshots/stax/test_personal_sign_metamask/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_metamask/00004.png b/tests/ragger/snapshots/stax/test_personal_sign_metamask/00004.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_metamask/00004.png and b/tests/ragger/snapshots/stax/test_personal_sign_metamask/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00000.png b/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00000.png
index f739811..1e99907 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00000.png and b/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00001.png b/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00001.png
index f5806b2..80c80e6 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00001.png and b/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00002.png b/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00002.png
index 83a0d80..c5bb9c6 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00002.png and b/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00003.png b/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00003.png
index 1c2d6cd..3ecf0b8 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00003.png and b/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00004.png b/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00004.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00004.png and b/tests/ragger/snapshots/stax/test_personal_sign_non_ascii/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00000.png b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00000.png
index f739811..1e99907 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00000.png and b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00001.png b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00001.png
index a499291..37d986e 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00001.png and b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00002.png b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00002.png
index bbf0532..8bf1c36 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00002.png and b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00003.png b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00003.png
index 83a0d80..dc876b3 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00003.png and b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00004.png b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00004.png
index 1c2d6cd..3ecf0b8 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00004.png and b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00005.png b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_opensea/00005.png and b/tests/ragger/snapshots/stax/test_personal_sign_opensea/00005.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_reject/00000.png b/tests/ragger/snapshots/stax/test_personal_sign_reject/00000.png
index f739811..1e99907 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_reject/00000.png and b/tests/ragger/snapshots/stax/test_personal_sign_reject/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_reject/00001.png b/tests/ragger/snapshots/stax/test_personal_sign_reject/00001.png
index 2f80635..f431ad8 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_reject/00001.png and b/tests/ragger/snapshots/stax/test_personal_sign_reject/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_reject/00002.png b/tests/ragger/snapshots/stax/test_personal_sign_reject/00002.png
index 83a0d80..c5bb9c6 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_reject/00002.png and b/tests/ragger/snapshots/stax/test_personal_sign_reject/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_reject/00003.png b/tests/ragger/snapshots/stax/test_personal_sign_reject/00003.png
index d4cf6af..45414d5 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_reject/00003.png and b/tests/ragger/snapshots/stax/test_personal_sign_reject/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_reject/00004.png b/tests/ragger/snapshots/stax/test_personal_sign_reject/00004.png
index df803b1..7ab1350 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_reject/00004.png and b/tests/ragger/snapshots/stax/test_personal_sign_reject/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_personal_sign_reject/00005.png b/tests/ragger/snapshots/stax/test_personal_sign_reject/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_personal_sign_reject/00005.png and b/tests/ragger/snapshots/stax/test_personal_sign_reject/00005.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 b22161f..5638399 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 93b8d9b..cf76c1e 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 ec34066..04b298b 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 c19f513..b5d99f6 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 2ba6d27..392165d 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_eip_2930/00005.png b/tests/ragger/snapshots/stax/test_sign_eip_2930/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_eip_2930/00005.png and b/tests/ragger/snapshots/stax/test_sign_eip_2930/00005.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 b22161f..5638399 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 25ae343..d03fac9 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 7441449..c7f4180 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 c19f513..b5d99f6 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 2ba6d27..392165d 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_limit_nonce/00005.png b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_limit_nonce/00005.png and b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00005.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 b22161f..5638399 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 a3014b2..2127bf1 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 69f255a..d6c26c7 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 c19f513..b5d99f6 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 2ba6d27..392165d 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_nonce_display/00005.png b/tests/ragger/snapshots/stax/test_sign_nonce_display/00005.png
index b1ff1b3..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_nonce_display/00005.png and b/tests/ragger/snapshots/stax/test_sign_nonce_display/00005.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00000.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00000.png
index 25b9d1e..1933067 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00000.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00001.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00001.png
index 7c87ed0..71e083b 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00001.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00002.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00002.png
index 888518c..bd673c4 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00002.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00003.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00003.png
index e4a279a..b8b5287 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00003.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00004.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00004.png
index a28f949..da2ee31 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00004.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00005.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00005.png
index cdad77c..732fcae 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00005.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00005.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00006.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00006.png
index e4a279a..b8b5287 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00006.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00006.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00007.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00007.png
index 9c42e08..05ddaee 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00007.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00007.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00008.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00008.png
index cdad77c..732fcae 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00008.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00008.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00009.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00009.png
index ab4ddc3..a84d3f9 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00009.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00009.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00010.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00010.png
index b1e4c82..193370d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00010.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00010.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00011.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00011.png
index b22161f..d1b475b 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00011.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00011.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00012.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00012.png
index eff07e3..83bb1fe 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00012.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00012.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00013.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00013.png
index d47d19d..2a79919 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00013.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00013.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00014.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00014.png
index c19f513..392165d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00014.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00014.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 b22161f..646ad0e 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 a3014b2..0c61971 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 ca94415..d3fa2f4 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 c19f513..abc9677 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_reject/00004.png b/tests/ragger/snapshots/stax/test_sign_reject/00004.png
index babad98..2b66970 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_reject/00004.png and b/tests/ragger/snapshots/stax/test_sign_reject/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_reject/00005.png b/tests/ragger/snapshots/stax/test_sign_reject/00005.png
index cebc8be..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_reject/00005.png and b/tests/ragger/snapshots/stax/test_sign_reject/00005.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 b22161f..646ad0e 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 a3014b2..0c61971 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 ca94415..d3fa2f4 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 c19f513..392165d 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/snapshots/stax/test_sign_simple/00004.png b/tests/ragger/snapshots/stax/test_sign_simple/00004.png
index 2ba6d27..339db1b 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_simple/00004.png and b/tests/ragger/snapshots/stax/test_sign_simple/00004.png differ
diff --git a/tests/ragger/test_blind_sign.py b/tests/ragger/test_blind_sign.py
index ea9c7d5..c058b9f 100644
--- a/tests/ragger/test_blind_sign.py
+++ b/tests/ragger/test_blind_sign.py
@@ -95,10 +95,14 @@ def test_blind_sign(firmware: Firmware,
                         moves += [NavInsID.RIGHT_CLICK] * 6
                     moves += [NavInsID.BOTH_CLICK]
             else:
+                if firmware.device == "stax":
+                    tap_number = 2
+                else:
+                    tap_number = 3
                 if sign:
                     moves += [NavInsID.USE_CASE_CHOICE_REJECT]
                     moves += [NavInsID.USE_CASE_CHOICE_CONFIRM]
-                    moves += [NavInsID.USE_CASE_REVIEW_TAP] * 3
+                    moves += [NavInsID.SWIPE_CENTER_TO_LEFT] * tap_number
                     moves += [NavInsID.USE_CASE_REVIEW_CONFIRM]
                 else:
                     moves += [NavInsID.USE_CASE_CHOICE_CONFIRM]
@@ -181,16 +185,19 @@ def test_sign_parameter_selector(firmware: Firmware,
             moves += [NavInsID.BOTH_CLICK]
 
             if firmware.device == "nanos":
-                pass
                 moves += [NavInsID.RIGHT_CLICK] * 9
             else:
                 moves += [NavInsID.RIGHT_CLICK] * 5
             moves += [NavInsID.BOTH_CLICK]
         else:
-            moves += ([NavInsID.USE_CASE_REVIEW_TAP] * 2 + [NavInsID.USE_CASE_REVIEW_CONFIRM]) * flows
+            if firmware.device == "stax":
+                tap_number = 2
+            else:
+                tap_number = 3
+            moves += ([NavInsID.SWIPE_CENTER_TO_LEFT] * 2 + [NavInsID.USE_CASE_REVIEW_CONFIRM]) * flows
             moves += [NavInsID.USE_CASE_CHOICE_REJECT]
             moves += [NavInsID.USE_CASE_CHOICE_CONFIRM]
-            moves += [NavInsID.USE_CASE_REVIEW_TAP] * 3
+            moves += [NavInsID.SWIPE_CENTER_TO_LEFT] * tap_number
             moves += [NavInsID.USE_CASE_REVIEW_CONFIRM]
         navigator.navigate_and_compare(default_screenshot_path,
                                        test_name,
diff --git a/tests/ragger/test_eip712.py b/tests/ragger/test_eip712.py
index 79953bd..4844d0d 100644
--- a/tests/ragger/test_eip712.py
+++ b/tests/ragger/test_eip712.py
@@ -93,7 +93,7 @@ def autonext(firmware: Firmware, navigator: Navigator, default_screenshot_path:
     if firmware.device.startswith("nano"):
         moves = [NavInsID.RIGHT_CLICK]
     else:
-        moves = [NavInsID.USE_CASE_REVIEW_TAP]
+        moves = [NavInsID.SWIPE_CENTER_TO_LEFT]
     if SNAPS_CONFIG is not None:
         navigator.navigate_and_compare(default_screenshot_path,
                                        SNAPS_CONFIG.test_name,
@@ -129,16 +129,25 @@ def eip712_new_common(firmware: Firmware,
                 moves = [NavInsID.RIGHT_CLICK] * 2
             moves += [NavInsID.BOTH_CLICK]
         else:
+            # this move is necessary most of the times, but can't be 100% sure with the fields grouping
+            moves += [NavInsID.SWIPE_CENTER_TO_LEFT]
             # need to skip the message hash
-            moves += [NavInsID.USE_CASE_REVIEW_TAP]
+            if not verbose and filters is None:
+                moves += [NavInsID.SWIPE_CENTER_TO_LEFT]
             moves += [NavInsID.USE_CASE_REVIEW_CONFIRM]
         if SNAPS_CONFIG is not None:
+            # Could break (time-out) if given a JSON that requires less moves
+            # TODO: Maybe take list of moves as input instead of trying to guess them ?
             navigator.navigate_and_compare(default_screenshot_path,
                                            SNAPS_CONFIG.test_name,
                                            moves,
                                            snap_start_idx=SNAPS_CONFIG.idx)
         else:
-            navigator.navigate(moves)
+            # Do them one-by-one to prevent an unnecessary move from timing-out and failing the test
+            for move in moves:
+                navigator.navigate([move],
+                                   screen_change_before_first_instruction=False,
+                                   screen_change_after_last_instruction=False)
     return ResponseParser.signature(app_client.response().data)