diff --git a/tests/ragger/snapshots/flex/blind-signed_approval/00001.png b/tests/ragger/snapshots/flex/blind-signed_approval/00001.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/blind-signed_approval/00001.png and b/tests/ragger/snapshots/flex/blind-signed_approval/00001.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00000.png b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00000.png
index fa7302c80..68e537983 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00000.png and b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00000.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00001.png b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00001.png
index 12fa12622..ef5f84efe 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00001.png and b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00001.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00002.png b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00002.png
index 3f81887f4..7fb3859f4 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00002.png and b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00002.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00003.png b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00003.png
index be51a9d55..a627b4e71 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00003.png and b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00003.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00004.png b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00004.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00004.png and b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00004.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_non_mainnet/00005.png b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00005.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/domain_name_non_mainnet/00005.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_unknown_chain/00000.png b/tests/ragger/snapshots/flex/domain_name_unknown_chain/00000.png
index 05caee2ed..099df73f1 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_unknown_chain/00000.png and b/tests/ragger/snapshots/flex/domain_name_unknown_chain/00000.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_unknown_chain/00001.png b/tests/ragger/snapshots/flex/domain_name_unknown_chain/00001.png
index abd370a77..d554b08d8 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_unknown_chain/00001.png and b/tests/ragger/snapshots/flex/domain_name_unknown_chain/00001.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_unknown_chain/00002.png b/tests/ragger/snapshots/flex/domain_name_unknown_chain/00002.png
index 892d37d47..ccd140af9 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_unknown_chain/00002.png and b/tests/ragger/snapshots/flex/domain_name_unknown_chain/00002.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_unknown_chain/00003.png b/tests/ragger/snapshots/flex/domain_name_unknown_chain/00003.png
index 026ac7aeb..876dc8796 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_unknown_chain/00003.png and b/tests/ragger/snapshots/flex/domain_name_unknown_chain/00003.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_unknown_chain/00005.png b/tests/ragger/snapshots/flex/domain_name_unknown_chain/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_unknown_chain/00005.png and b/tests/ragger/snapshots/flex/domain_name_unknown_chain/00005.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_False/00000.png b/tests/ragger/snapshots/flex/domain_name_verbose_False/00000.png
index 8019402a4..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_verbose_False/00000.png and b/tests/ragger/snapshots/flex/domain_name_verbose_False/00000.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_False/00001.png b/tests/ragger/snapshots/flex/domain_name_verbose_False/00001.png
index 65cb93509..ef5f84efe 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_verbose_False/00001.png and b/tests/ragger/snapshots/flex/domain_name_verbose_False/00001.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_False/00002.png b/tests/ragger/snapshots/flex/domain_name_verbose_False/00002.png
index 266f6201d..28fd7ee02 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_verbose_False/00002.png and b/tests/ragger/snapshots/flex/domain_name_verbose_False/00002.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_False/00003.png b/tests/ragger/snapshots/flex/domain_name_verbose_False/00003.png
index be51a9d55..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_verbose_False/00003.png and b/tests/ragger/snapshots/flex/domain_name_verbose_False/00003.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_False/00004.png b/tests/ragger/snapshots/flex/domain_name_verbose_False/00004.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_verbose_False/00004.png and b/tests/ragger/snapshots/flex/domain_name_verbose_False/00004.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_False/00005.png b/tests/ragger/snapshots/flex/domain_name_verbose_False/00005.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/domain_name_verbose_False/00005.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_True/00000.png b/tests/ragger/snapshots/flex/domain_name_verbose_True/00000.png
index 584afafce..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_verbose_True/00000.png and b/tests/ragger/snapshots/flex/domain_name_verbose_True/00000.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_True/00001.png b/tests/ragger/snapshots/flex/domain_name_verbose_True/00001.png
index 14f630647..ef5f84efe 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_verbose_True/00001.png and b/tests/ragger/snapshots/flex/domain_name_verbose_True/00001.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_True/00002.png b/tests/ragger/snapshots/flex/domain_name_verbose_True/00002.png
index f94b26f89..eb599ef38 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_verbose_True/00002.png and b/tests/ragger/snapshots/flex/domain_name_verbose_True/00002.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_True/00003.png b/tests/ragger/snapshots/flex/domain_name_verbose_True/00003.png
index 342aa2389..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_verbose_True/00003.png and b/tests/ragger/snapshots/flex/domain_name_verbose_True/00003.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_verbose_True/00005.png b/tests/ragger/snapshots/flex/domain_name_verbose_True/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_verbose_True/00005.png and b/tests/ragger/snapshots/flex/domain_name_verbose_True/00005.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00000.png b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00000.png
index 8019402a4..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00000.png and b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00000.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00001.png b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00001.png
index d0dc5f26e..62e7e3402 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00001.png and b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00001.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00002.png b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00002.png
index 266f6201d..73b9c7f38 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00002.png and b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00002.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00003.png b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00003.png
index be51a9d55..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00003.png and b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00003.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00004.png b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00004.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00004.png and b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00004.png differ
diff --git a/tests/ragger/snapshots/flex/domain_name_wrong_addr/00005.png b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00005.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/domain_name_wrong_addr/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00000.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00000.png
index fad84d96a..edd295ca8 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00000.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00001.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00001.png
index f8951fe9c..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00001.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00002.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00002.png
index fe2f8cda6..892e5f98f 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00002.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00003.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00003.png
index 6caf6e304..1d1e3258a 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00003.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00004.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00004.png
index be51a9d55..2f4849243 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00004.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00005.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00005.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00005.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00006.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00006.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00000.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00000.png
index e731aa273..c2dba19a9 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00000.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00001.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00001.png
index ab5027624..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00001.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00002.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00002.png
index fdedc0698..1aab0485f 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00002.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00003.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00003.png
index c1b10c688..1fef4651b 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00003.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00004.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00004.png
index c14801360..b300d8568 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00004.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00006.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00006.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00000.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00000.png
index f874b6b93..55d862aa4 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00000.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00001.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00001.png
index ab5027624..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00001.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00002.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00002.png
index 1175fc5f6..e83730b98 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00002.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00003.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00003.png
index 19c095ef1..60e6b4372 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00003.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00004.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00004.png
index 67c36af73..02119f56f 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00004.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00006.png b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00006.png and b/tests/ragger/snapshots/flex/erc1155_safeBatchTransferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00000.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00000.png
index b6ff371be..30635b183 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00000.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00001.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00001.png
index 9b1ed3947..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00001.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00002.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00002.png
index 626f61dfc..f75bcd2c3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00002.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00003.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00003.png
index 19c095ef1..c48713b1b 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00003.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00004.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00004.png
index f4fbb6e6c..a111804f6 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00004.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00007.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00007.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00007.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1-rejected/00007.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00000.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00000.png
index b6ff371be..30635b183 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00000.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00001.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00001.png
index 9b1ed3947..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00001.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00002.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00002.png
index 626f61dfc..f75bcd2c3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00002.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00003.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00003.png
index 19c095ef1..c48713b1b 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00003.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00004.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00004.png
index f4fbb6e6c..a111804f6 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00004.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00006.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00006.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00000.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00000.png
index 5efebd7f9..5d7947ebe 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00000.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00001.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00001.png
index ab5027624..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00001.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00002.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00002.png
index 9621da5af..d80480c30 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00002.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00003.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00003.png
index 75893c526..5880e731a 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00003.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00004.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00004.png
index fcbeafabc..dac1b7ef1 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00004.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00006.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00006.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00000.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00000.png
index f9a8acc48..cf14abd28 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00000.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00001.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00001.png
index ab5027624..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00001.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00002.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00002.png
index 4c598e730..20ce9a1f4 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00002.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00003.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00003.png
index c4ccec35b..6f04fa8d3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00003.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00004.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00004.png
index ab1c0d2da..5e112b68a 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00004.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00006.png b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00006.png and b/tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00000.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00000.png
index 11d8d6aac..02c47c1f6 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00000.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00001.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00001.png
index 6eec50728..cbce89291 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00001.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00002.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00002.png
index acb2f4426..be7b7cdd3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00002.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00003.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00003.png
index 54e01b76c..b40d51c51 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00003.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00005.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00005.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_1/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00000.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00000.png
index 117365668..f04c389c8 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00000.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00001.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00001.png
index fa0268798..01cc0fc39 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00001.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00002.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00002.png
index 7d1688a9c..a06e6ee8e 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00002.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00003.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00003.png
index 255579618..cafde45be 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00003.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00004.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00004.png
index be51a9d55..efc5499ad 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00004.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00005.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00005.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00005.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00006.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00006.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_137/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00000.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00000.png
index e35bfe77f..500e0b239 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00000.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00001.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00001.png
index fa0268798..01cc0fc39 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00001.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00002.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00002.png
index 9aabcd0cc..00e52d9a1 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00002.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00003.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00003.png
index 7f4e3c981..1d1e3258a 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00003.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00004.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00004.png
index be51a9d55..8ac5fee0c 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00004.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00005.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00005.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00005.png and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00006.png b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00006.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_1/00000.png b/tests/ragger/snapshots/flex/erc721_approve_1/00000.png
index 11d8d6aac..87f5040c6 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_1/00000.png and b/tests/ragger/snapshots/flex/erc721_approve_1/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_1/00001.png b/tests/ragger/snapshots/flex/erc721_approve_1/00001.png
index fe36aaca2..3e48385c1 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_1/00001.png and b/tests/ragger/snapshots/flex/erc721_approve_1/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_1/00002.png b/tests/ragger/snapshots/flex/erc721_approve_1/00002.png
index ab242bd17..06f5d2919 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_1/00002.png and b/tests/ragger/snapshots/flex/erc721_approve_1/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_1/00003.png b/tests/ragger/snapshots/flex/erc721_approve_1/00003.png
index 54e01b76c..1d1e3258a 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_1/00003.png and b/tests/ragger/snapshots/flex/erc721_approve_1/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_1/00004.png b/tests/ragger/snapshots/flex/erc721_approve_1/00004.png
index be51a9d55..5962ba68b 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_1/00004.png and b/tests/ragger/snapshots/flex/erc721_approve_1/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_1/00005.png b/tests/ragger/snapshots/flex/erc721_approve_1/00005.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_1/00005.png and b/tests/ragger/snapshots/flex/erc721_approve_1/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_1/00006.png b/tests/ragger/snapshots/flex/erc721_approve_1/00006.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/erc721_approve_1/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_137/00000.png b/tests/ragger/snapshots/flex/erc721_approve_137/00000.png
index 72c37d60f..f04c389c8 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_137/00000.png and b/tests/ragger/snapshots/flex/erc721_approve_137/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_137/00001.png b/tests/ragger/snapshots/flex/erc721_approve_137/00001.png
index cb9c8dfab..3e48385c1 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_137/00001.png and b/tests/ragger/snapshots/flex/erc721_approve_137/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_137/00002.png b/tests/ragger/snapshots/flex/erc721_approve_137/00002.png
index 4cfd36bd7..a887637d6 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_137/00002.png and b/tests/ragger/snapshots/flex/erc721_approve_137/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_137/00003.png b/tests/ragger/snapshots/flex/erc721_approve_137/00003.png
index c1b10c688..1fef4651b 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_137/00003.png and b/tests/ragger/snapshots/flex/erc721_approve_137/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_137/00004.png b/tests/ragger/snapshots/flex/erc721_approve_137/00004.png
index a9e886830..efc5499ad 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_137/00004.png and b/tests/ragger/snapshots/flex/erc721_approve_137/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_137/00006.png b/tests/ragger/snapshots/flex/erc721_approve_137/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_137/00006.png and b/tests/ragger/snapshots/flex/erc721_approve_137/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_5/00000.png b/tests/ragger/snapshots/flex/erc721_approve_5/00000.png
index b3a72855f..500e0b239 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_5/00000.png and b/tests/ragger/snapshots/flex/erc721_approve_5/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_5/00001.png b/tests/ragger/snapshots/flex/erc721_approve_5/00001.png
index be56badcf..3e48385c1 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_5/00001.png and b/tests/ragger/snapshots/flex/erc721_approve_5/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_5/00002.png b/tests/ragger/snapshots/flex/erc721_approve_5/00002.png
index 92cf74df6..73314646b 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_5/00002.png and b/tests/ragger/snapshots/flex/erc721_approve_5/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_5/00003.png b/tests/ragger/snapshots/flex/erc721_approve_5/00003.png
index 19c095ef1..60e6b4372 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_5/00003.png and b/tests/ragger/snapshots/flex/erc721_approve_5/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_5/00004.png b/tests/ragger/snapshots/flex/erc721_approve_5/00004.png
index 3ff8a9bbf..8ac5fee0c 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_5/00004.png and b/tests/ragger/snapshots/flex/erc721_approve_5/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_approve_5/00006.png b/tests/ragger/snapshots/flex/erc721_approve_5/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc721_approve_5/00006.png and b/tests/ragger/snapshots/flex/erc721_approve_5/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00000.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00000.png
index b2c011e04..30635b183 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00000.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00001.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00001.png
index c823c9412..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00001.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00002.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00002.png
index ab242bd17..3a6b2bcba 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00002.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00003.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00003.png
index aa73c27b9..1d1e3258a 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00003.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00004.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00004.png
index 08bca2231..a111804f6 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00004.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00005.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00005.png
index 6bbdf2ff3..08bca2231 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00005.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00006.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00006.png
index dabe7afea..6bbdf2ff3 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00006.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00007.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00007.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1-rejected/00007.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00000.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00000.png
index b2c011e04..30635b183 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00000.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00001.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00001.png
index c823c9412..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00001.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00002.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00002.png
index ab242bd17..3a6b2bcba 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00002.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00003.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00003.png
index aa73c27b9..1d1e3258a 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00003.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00004.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00004.png
index be51a9d55..a111804f6 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00004.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00005.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00005.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00005.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00006.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00006.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00000.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00000.png
index 5efebd7f9..5d7947ebe 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00000.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00001.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00001.png
index 4e1504e3c..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00001.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00002.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00002.png
index 4cfd36bd7..f5870da9e 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00002.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00003.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00003.png
index c1b10c688..1fef4651b 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00003.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00004.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00004.png
index fcbeafabc..dac1b7ef1 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00004.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00006.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00006.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00000.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00000.png
index f9a8acc48..cf14abd28 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00000.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00001.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00001.png
index 6935e94ac..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00001.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00002.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00002.png
index 92cf74df6..c17f934c4 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00002.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00003.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00003.png
index 19c095ef1..60e6b4372 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00003.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00004.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00004.png
index ab1c0d2da..5e112b68a 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00004.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00006.png b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00006.png and b/tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00000.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00000.png
index 11d8d6aac..02c47c1f6 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00000.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00001.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00001.png
index 4e6ffebce..cbce89291 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00001.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00002.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00002.png
index 1d7f085ac..0f4a5e544 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00002.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00003.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00003.png
index 54e01b76c..b40d51c51 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00003.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00005.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00005.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00000.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00000.png
index 117365668..f04c389c8 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00000.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00001.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00001.png
index 3afc3948f..01cc0fc39 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00001.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00002.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00002.png
index 6f3b87724..032fd10d6 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00002.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00003.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00003.png
index 255579618..cafde45be 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00003.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00004.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00004.png
index be51a9d55..efc5499ad 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00004.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00005.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00005.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00005.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00006.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00006.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00000.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00000.png
index e35bfe77f..500e0b239 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00000.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00001.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00001.png
index b2768cf28..01cc0fc39 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00001.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00002.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00002.png
index 13d2ed11a..423999c9f 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00002.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00003.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00003.png
index 7f4e3c981..1d1e3258a 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00003.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00004.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00004.png
index be51a9d55..8ac5fee0c 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00004.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00005.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00005.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00005.png and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00006.png b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00006.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00000.png b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00000.png
index b2c011e04..30635b183 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00000.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00001.png b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00001.png
index c823c9412..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00001.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00002.png b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00002.png
index ab242bd17..3a6b2bcba 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00002.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00003.png b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00003.png
index aa73c27b9..1d1e3258a 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00003.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00004.png b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00004.png
index be51a9d55..a111804f6 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00004.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00005.png b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00005.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00005.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_1/00006.png b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00006.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/erc721_transferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00000.png b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00000.png
index 5efebd7f9..5d7947ebe 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00000.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00001.png b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00001.png
index 4e1504e3c..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00001.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00002.png b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00002.png
index 4cfd36bd7..f5870da9e 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00002.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00003.png b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00003.png
index c1b10c688..1fef4651b 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00003.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00004.png b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00004.png
index fcbeafabc..dac1b7ef1 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00004.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00006.png b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_137/00006.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00000.png b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00000.png
index f9a8acc48..cf14abd28 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00000.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00000.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00001.png b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00001.png
index 6935e94ac..d54e5c3de 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00001.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00001.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00002.png b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00002.png
index 92cf74df6..c17f934c4 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00002.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00003.png b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00003.png
index 19c095ef1..60e6b4372 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00003.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00004.png b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00004.png
index ab1c0d2da..5e112b68a 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00004.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00006.png b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00006.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/erc721_transferFrom_5/00006.png and b/tests/ragger/snapshots/flex/erc721_transferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_1/00000.png b/tests/ragger/snapshots/flex/get_pk_1/00000.png
index 0650ae361..a396ad612 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_1/00000.png and b/tests/ragger/snapshots/flex/get_pk_1/00000.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_1/00001.png b/tests/ragger/snapshots/flex/get_pk_1/00001.png
index 4f06089f4..e43bff2c6 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_1/00001.png and b/tests/ragger/snapshots/flex/get_pk_1/00001.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_1/00003.png b/tests/ragger/snapshots/flex/get_pk_1/00003.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_1/00003.png and b/tests/ragger/snapshots/flex/get_pk_1/00003.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_137/00000.png b/tests/ragger/snapshots/flex/get_pk_137/00000.png
index 5458a8402..a550ebe19 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_137/00000.png and b/tests/ragger/snapshots/flex/get_pk_137/00000.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_137/00001.png b/tests/ragger/snapshots/flex/get_pk_137/00001.png
index 4f06089f4..e43bff2c6 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_137/00001.png and b/tests/ragger/snapshots/flex/get_pk_137/00001.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_137/00003.png b/tests/ragger/snapshots/flex/get_pk_137/00003.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_137/00003.png and b/tests/ragger/snapshots/flex/get_pk_137/00003.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_2/00000.png b/tests/ragger/snapshots/flex/get_pk_2/00000.png
index 5045e6a12..19d5bd7ec 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_2/00000.png and b/tests/ragger/snapshots/flex/get_pk_2/00000.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_2/00001.png b/tests/ragger/snapshots/flex/get_pk_2/00001.png
index 4f06089f4..e43bff2c6 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_2/00001.png and b/tests/ragger/snapshots/flex/get_pk_2/00001.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_2/00003.png b/tests/ragger/snapshots/flex/get_pk_2/00003.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_2/00003.png and b/tests/ragger/snapshots/flex/get_pk_2/00003.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_5/00000.png b/tests/ragger/snapshots/flex/get_pk_5/00000.png
index fe881c820..ce4abff5e 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_5/00000.png and b/tests/ragger/snapshots/flex/get_pk_5/00000.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_5/00001.png b/tests/ragger/snapshots/flex/get_pk_5/00001.png
index 4f06089f4..e43bff2c6 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_5/00001.png and b/tests/ragger/snapshots/flex/get_pk_5/00001.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_5/00003.png b/tests/ragger/snapshots/flex/get_pk_5/00003.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_5/00003.png and b/tests/ragger/snapshots/flex/get_pk_5/00003.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_None/00000.png b/tests/ragger/snapshots/flex/get_pk_None/00000.png
index 0650ae361..a396ad612 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_None/00000.png and b/tests/ragger/snapshots/flex/get_pk_None/00000.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_None/00001.png b/tests/ragger/snapshots/flex/get_pk_None/00001.png
index 4f06089f4..e43bff2c6 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_None/00001.png and b/tests/ragger/snapshots/flex/get_pk_None/00001.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_None/00003.png b/tests/ragger/snapshots/flex/get_pk_None/00003.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_None/00003.png and b/tests/ragger/snapshots/flex/get_pk_None/00003.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_rejected_60/00000.png b/tests/ragger/snapshots/flex/get_pk_rejected_60/00000.png
index 0650ae361..a396ad612 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_rejected_60/00000.png and b/tests/ragger/snapshots/flex/get_pk_rejected_60/00000.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_rejected_60/00001.png b/tests/ragger/snapshots/flex/get_pk_rejected_60/00001.png
index 4f06089f4..e43bff2c6 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_rejected_60/00001.png and b/tests/ragger/snapshots/flex/get_pk_rejected_60/00001.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_rejected_60/00003.png b/tests/ragger/snapshots/flex/get_pk_rejected_60/00003.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_rejected_60/00003.png and b/tests/ragger/snapshots/flex/get_pk_rejected_60/00003.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_rejected_700/00000.png b/tests/ragger/snapshots/flex/get_pk_rejected_700/00000.png
index 0650ae361..a396ad612 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_rejected_700/00000.png and b/tests/ragger/snapshots/flex/get_pk_rejected_700/00000.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_rejected_700/00001.png b/tests/ragger/snapshots/flex/get_pk_rejected_700/00001.png
index 8b2cfa612..64a74d63a 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_rejected_700/00001.png and b/tests/ragger/snapshots/flex/get_pk_rejected_700/00001.png differ
diff --git a/tests/ragger/snapshots/flex/get_pk_rejected_700/00003.png b/tests/ragger/snapshots/flex/get_pk_rejected_700/00003.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/get_pk_rejected_700/00003.png and b/tests/ragger/snapshots/flex/get_pk_rejected_700/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00000.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00000.png
index 8019402a4..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/test_clone_thundercore/00000.png and b/tests/ragger/snapshots/flex/test_clone_thundercore/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00001.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00001.png
index dc4efacb9..bcc9dced4 100644
Binary files a/tests/ragger/snapshots/flex/test_clone_thundercore/00001.png and b/tests/ragger/snapshots/flex/test_clone_thundercore/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00002.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00002.png
index 266f6201d..681a3c675 100644
Binary files a/tests/ragger/snapshots/flex/test_clone_thundercore/00002.png and b/tests/ragger/snapshots/flex/test_clone_thundercore/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00003.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00003.png
index be51a9d55..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/test_clone_thundercore/00003.png and b/tests/ragger/snapshots/flex/test_clone_thundercore/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00004.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00004.png
index 83689ecd4..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/test_clone_thundercore/00004.png and b/tests/ragger/snapshots/flex/test_clone_thundercore/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00005.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00005.png
new file mode 100644
index 000000000..6987f4b72
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_clone_thundercore/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00000.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00000.png
index a1879da44..ea9d875a6 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00000.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00001.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00001.png
index 227282ae5..f199c83b6 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00001.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png
index aedc03daa..cab5e3d4c 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00003.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00003.png
index 719efad3c..9ea496caf 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00003.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png
index 796998eda..1a9cca4e9 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00005.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00005.png
index feade3815..a7ee33520 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00005.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00006.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00006.png
index cbaa88901..cb969d2e0 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00006.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00006.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00000.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00000.png
index a1879da44..ea9d875a6 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00000.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00001.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00001.png
index 96525be1b..4ef1e1e35 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00001.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00002.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00002.png
index fcd385eef..37e5aac7a 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00002.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00003.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00003.png
index 24e709709..fc49e9f5b 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00003.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00004.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00004.png
index d7f125ee9..54aa47f95 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00004.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00005.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00005.png
index 39cd55838..22b67fb02 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00005.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00006.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00006.png
index 5af63c121..18823f012 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00006.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00006.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png
index d8be8494b..3ad890983 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png
index fe777571f..d70a04594 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png
index 97fe3ffab..cf3477485 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png
index e1e50fd4e..18e7efe80 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png
index 462b9d606..4dae047e9 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png
index 1fe5517f0..8f2642df1 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00013.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00013.png
index cbaa88901..cb969d2e0 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00013.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00013.png differ
diff --git a/tests/ragger/snapshots/flex/test_get_eth2_pk/00000.png b/tests/ragger/snapshots/flex/test_get_eth2_pk/00000.png
index 43aa62b22..0b202db34 100644
Binary files a/tests/ragger/snapshots/flex/test_get_eth2_pk/00000.png and b/tests/ragger/snapshots/flex/test_get_eth2_pk/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_get_eth2_pk/00001.png b/tests/ragger/snapshots/flex/test_get_eth2_pk/00001.png
index 6cafee84f..f9454efee 100644
Binary files a/tests/ragger/snapshots/flex/test_get_eth2_pk/00001.png and b/tests/ragger/snapshots/flex/test_get_eth2_pk/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_get_eth2_pk/00003.png b/tests/ragger/snapshots/flex/test_get_eth2_pk/00003.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/test_get_eth2_pk/00003.png and b/tests/ragger/snapshots/flex/test_get_eth2_pk/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_legacy_chainid/00000.png b/tests/ragger/snapshots/flex/test_legacy_chainid/00000.png
index 05caee2ed..099df73f1 100644
Binary files a/tests/ragger/snapshots/flex/test_legacy_chainid/00000.png and b/tests/ragger/snapshots/flex/test_legacy_chainid/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_legacy_chainid/00001.png b/tests/ragger/snapshots/flex/test_legacy_chainid/00001.png
index de0a74a87..1cc854cf5 100644
Binary files a/tests/ragger/snapshots/flex/test_legacy_chainid/00001.png and b/tests/ragger/snapshots/flex/test_legacy_chainid/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_legacy_chainid/00002.png b/tests/ragger/snapshots/flex/test_legacy_chainid/00002.png
index faf354874..72668b5d1 100644
Binary files a/tests/ragger/snapshots/flex/test_legacy_chainid/00002.png and b/tests/ragger/snapshots/flex/test_legacy_chainid/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_legacy_chainid/00003.png b/tests/ragger/snapshots/flex/test_legacy_chainid/00003.png
index 026ac7aeb..876dc8796 100644
Binary files a/tests/ragger/snapshots/flex/test_legacy_chainid/00003.png and b/tests/ragger/snapshots/flex/test_legacy_chainid/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_legacy_chainid/00005.png b/tests/ragger/snapshots/flex/test_legacy_chainid/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/test_legacy_chainid/00005.png and b/tests/ragger/snapshots/flex/test_legacy_chainid/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_legacy_send_bsc/00000.png b/tests/ragger/snapshots/flex/test_legacy_send_bsc/00000.png
index 5750844a2..e6d9ce99d 100644
Binary files a/tests/ragger/snapshots/flex/test_legacy_send_bsc/00000.png and b/tests/ragger/snapshots/flex/test_legacy_send_bsc/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_legacy_send_bsc/00001.png b/tests/ragger/snapshots/flex/test_legacy_send_bsc/00001.png
index d4b914468..809a1138e 100644
Binary files a/tests/ragger/snapshots/flex/test_legacy_send_bsc/00001.png and b/tests/ragger/snapshots/flex/test_legacy_send_bsc/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_legacy_send_bsc/00002.png b/tests/ragger/snapshots/flex/test_legacy_send_bsc/00002.png
index e8c479b69..b6f3644dc 100644
Binary files a/tests/ragger/snapshots/flex/test_legacy_send_bsc/00002.png and b/tests/ragger/snapshots/flex/test_legacy_send_bsc/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_legacy_send_bsc/00003.png b/tests/ragger/snapshots/flex/test_legacy_send_bsc/00003.png
index 246807a8e..f56bc8161 100644
Binary files a/tests/ragger/snapshots/flex/test_legacy_send_bsc/00003.png and b/tests/ragger/snapshots/flex/test_legacy_send_bsc/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_legacy_send_bsc/00005.png b/tests/ragger/snapshots/flex/test_legacy_send_bsc/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/test_legacy_send_bsc/00005.png and b/tests/ragger/snapshots/flex/test_legacy_send_bsc/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_metamask/00000.png b/tests/ragger/snapshots/flex/test_personal_sign_metamask/00000.png
index 71f2167a0..281c55a8a 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_metamask/00000.png and b/tests/ragger/snapshots/flex/test_personal_sign_metamask/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_metamask/00001.png b/tests/ragger/snapshots/flex/test_personal_sign_metamask/00001.png
index 4a46331dc..cb8ed3248 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_metamask/00001.png and b/tests/ragger/snapshots/flex/test_personal_sign_metamask/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_metamask/00002.png b/tests/ragger/snapshots/flex/test_personal_sign_metamask/00002.png
index 1b1120133..2394aed93 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_metamask/00002.png and b/tests/ragger/snapshots/flex/test_personal_sign_metamask/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_metamask/00004.png b/tests/ragger/snapshots/flex/test_personal_sign_metamask/00004.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_metamask/00004.png and b/tests/ragger/snapshots/flex/test_personal_sign_metamask/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00000.png b/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00000.png
index 71f2167a0..281c55a8a 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00000.png and b/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00001.png b/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00001.png
index 360cb2e08..bf55e0697 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00001.png and b/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00002.png b/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00002.png
index 1b1120133..2394aed93 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00002.png and b/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00004.png b/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00004.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00004.png and b/tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_opensea/00000.png b/tests/ragger/snapshots/flex/test_personal_sign_opensea/00000.png
index 71f2167a0..281c55a8a 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_opensea/00000.png and b/tests/ragger/snapshots/flex/test_personal_sign_opensea/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_opensea/00001.png b/tests/ragger/snapshots/flex/test_personal_sign_opensea/00001.png
index 3fa69bde5..8a7f8997f 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_opensea/00001.png and b/tests/ragger/snapshots/flex/test_personal_sign_opensea/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_opensea/00002.png b/tests/ragger/snapshots/flex/test_personal_sign_opensea/00002.png
index 72c27f028..9469d10b2 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_opensea/00002.png and b/tests/ragger/snapshots/flex/test_personal_sign_opensea/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_opensea/00003.png b/tests/ragger/snapshots/flex/test_personal_sign_opensea/00003.png
index 1b1120133..2394aed93 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_opensea/00003.png and b/tests/ragger/snapshots/flex/test_personal_sign_opensea/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_opensea/00005.png b/tests/ragger/snapshots/flex/test_personal_sign_opensea/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_opensea/00005.png and b/tests/ragger/snapshots/flex/test_personal_sign_opensea/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_reject/00000.png b/tests/ragger/snapshots/flex/test_personal_sign_reject/00000.png
index 71f2167a0..281c55a8a 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_reject/00000.png and b/tests/ragger/snapshots/flex/test_personal_sign_reject/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_reject/00001.png b/tests/ragger/snapshots/flex/test_personal_sign_reject/00001.png
index 98dbbf24a..e10449fe8 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_reject/00001.png and b/tests/ragger/snapshots/flex/test_personal_sign_reject/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_reject/00002.png b/tests/ragger/snapshots/flex/test_personal_sign_reject/00002.png
index 1b1120133..2394aed93 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_reject/00002.png and b/tests/ragger/snapshots/flex/test_personal_sign_reject/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_personal_sign_reject/00005.png b/tests/ragger/snapshots/flex/test_personal_sign_reject/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/test_personal_sign_reject/00005.png and b/tests/ragger/snapshots/flex/test_personal_sign_reject/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00000.png b/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00000.png
index 584afafce..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00000.png and b/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00001.png b/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00001.png
index c64c9693d..5b3d8c9ae 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00001.png and b/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00002.png b/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00002.png
index f94b26f89..7edbcba81 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00002.png and b/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00003.png b/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00003.png
index 342aa2389..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00003.png and b/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00005.png b/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00005.png and b/tests/ragger/snapshots/flex/test_sign_blind_and_nonce_display/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_simple/00000.png b/tests/ragger/snapshots/flex/test_sign_blind_simple/00000.png
index 8019402a4..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_blind_simple/00000.png and b/tests/ragger/snapshots/flex/test_sign_blind_simple/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_simple/00001.png b/tests/ragger/snapshots/flex/test_sign_blind_simple/00001.png
index 3eb60cdab..5b3d8c9ae 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_blind_simple/00001.png and b/tests/ragger/snapshots/flex/test_sign_blind_simple/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_simple/00002.png b/tests/ragger/snapshots/flex/test_sign_blind_simple/00002.png
index 266f6201d..9e7ca3458 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_blind_simple/00002.png and b/tests/ragger/snapshots/flex/test_sign_blind_simple/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_simple/00003.png b/tests/ragger/snapshots/flex/test_sign_blind_simple/00003.png
index be51a9d55..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_blind_simple/00003.png and b/tests/ragger/snapshots/flex/test_sign_blind_simple/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_simple/00004.png b/tests/ragger/snapshots/flex/test_sign_blind_simple/00004.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_blind_simple/00004.png and b/tests/ragger/snapshots/flex/test_sign_blind_simple/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_blind_simple/00005.png b/tests/ragger/snapshots/flex/test_sign_blind_simple/00005.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_sign_blind_simple/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_eip_2930/00000.png b/tests/ragger/snapshots/flex/test_sign_eip_2930/00000.png
index f5d57ba98..fd5e0025f 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_eip_2930/00000.png and b/tests/ragger/snapshots/flex/test_sign_eip_2930/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_eip_2930/00001.png b/tests/ragger/snapshots/flex/test_sign_eip_2930/00001.png
index 933608268..c12403452 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_eip_2930/00001.png and b/tests/ragger/snapshots/flex/test_sign_eip_2930/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_eip_2930/00002.png b/tests/ragger/snapshots/flex/test_sign_eip_2930/00002.png
index cd8894ca0..9656d40e6 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_eip_2930/00002.png and b/tests/ragger/snapshots/flex/test_sign_eip_2930/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_eip_2930/00003.png b/tests/ragger/snapshots/flex/test_sign_eip_2930/00003.png
index c9fe3fd12..5971411fd 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_eip_2930/00003.png and b/tests/ragger/snapshots/flex/test_sign_eip_2930/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_eip_2930/00005.png b/tests/ragger/snapshots/flex/test_sign_eip_2930/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_eip_2930/00005.png and b/tests/ragger/snapshots/flex/test_sign_eip_2930/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00000.png b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00000.png
index 8019402a4..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00000.png and b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00001.png b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00001.png
index 31b586c1d..6f23873ed 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00001.png and b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00002.png b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00002.png
index 266f6201d..118daa92e 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00002.png and b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00003.png b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00003.png
index be51a9d55..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00003.png and b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00004.png b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00004.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00004.png and b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_limit_nonce/00005.png b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00005.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_sign_limit_nonce/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_nonce_display/00000.png b/tests/ragger/snapshots/flex/test_sign_nonce_display/00000.png
index 584afafce..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_nonce_display/00000.png and b/tests/ragger/snapshots/flex/test_sign_nonce_display/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_nonce_display/00001.png b/tests/ragger/snapshots/flex/test_sign_nonce_display/00001.png
index 6256beb4d..5b3d8c9ae 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_nonce_display/00001.png and b/tests/ragger/snapshots/flex/test_sign_nonce_display/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_nonce_display/00002.png b/tests/ragger/snapshots/flex/test_sign_nonce_display/00002.png
index f94b26f89..2c9411134 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_nonce_display/00002.png and b/tests/ragger/snapshots/flex/test_sign_nonce_display/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_nonce_display/00003.png b/tests/ragger/snapshots/flex/test_sign_nonce_display/00003.png
index 342aa2389..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_nonce_display/00003.png and b/tests/ragger/snapshots/flex/test_sign_nonce_display/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_nonce_display/00005.png b/tests/ragger/snapshots/flex/test_sign_nonce_display/00005.png
index dabe7afea..f5b3e29a3 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_nonce_display/00005.png and b/tests/ragger/snapshots/flex/test_sign_nonce_display/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00000.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00000.png
index 6264f4161..c7b64bdbb 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00000.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00001.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00001.png
index b991ceb21..3ace25d36 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00001.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00002.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00002.png
index 2a9f6523a..9f0b89f97 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00002.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_0/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00000.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00000.png
index 3b199167c..4d7945f4e 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00000.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00001.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00001.png
index d1bf336fe..5a8ffeb7b 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00001.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00002.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00002.png
index e91f9a01b..869b785ca 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00002.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_1/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00000.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00000.png
index 3b199167c..4d7945f4e 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00000.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00001.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00001.png
index 5cf8178e8..c48dd9d7f 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00001.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00002.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00002.png
index e91f9a01b..869b785ca 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00002.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_2/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00000.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00000.png
index 8019402a4..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00000.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00001.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00001.png
index c44fc88ac..f4ec9f000 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00001.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00002.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00002.png
index 266f6201d..ffd7c8f36 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00002.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00003.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00003.png
index be51a9d55..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00003.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00004.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00004.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00004.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00005.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00005.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/step_3/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_reject/00000.png b/tests/ragger/snapshots/flex/test_sign_reject/00000.png
index 8019402a4..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_reject/00000.png and b/tests/ragger/snapshots/flex/test_sign_reject/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_reject/00001.png b/tests/ragger/snapshots/flex/test_sign_reject/00001.png
index 3eb60cdab..5b3d8c9ae 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_reject/00001.png and b/tests/ragger/snapshots/flex/test_sign_reject/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_reject/00002.png b/tests/ragger/snapshots/flex/test_sign_reject/00002.png
index 266f6201d..9e7ca3458 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_reject/00002.png and b/tests/ragger/snapshots/flex/test_sign_reject/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_reject/00003.png b/tests/ragger/snapshots/flex/test_sign_reject/00003.png
index 08bca2231..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_reject/00003.png and b/tests/ragger/snapshots/flex/test_sign_reject/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_reject/00004.png b/tests/ragger/snapshots/flex/test_sign_reject/00004.png
index 6bbdf2ff3..08bca2231 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_reject/00004.png and b/tests/ragger/snapshots/flex/test_sign_reject/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_reject/00005.png b/tests/ragger/snapshots/flex/test_sign_reject/00005.png
index dabe7afea..6bbdf2ff3 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_reject/00005.png and b/tests/ragger/snapshots/flex/test_sign_reject/00005.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_reject/00006.png b/tests/ragger/snapshots/flex/test_sign_reject/00006.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_sign_reject/00006.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_simple/00000.png b/tests/ragger/snapshots/flex/test_sign_simple/00000.png
index 8019402a4..2fa6f1c81 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_simple/00000.png and b/tests/ragger/snapshots/flex/test_sign_simple/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_simple/00001.png b/tests/ragger/snapshots/flex/test_sign_simple/00001.png
index 3eb60cdab..5b3d8c9ae 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_simple/00001.png and b/tests/ragger/snapshots/flex/test_sign_simple/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_simple/00002.png b/tests/ragger/snapshots/flex/test_sign_simple/00002.png
index 266f6201d..9e7ca3458 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_simple/00002.png and b/tests/ragger/snapshots/flex/test_sign_simple/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_simple/00003.png b/tests/ragger/snapshots/flex/test_sign_simple/00003.png
index be51a9d55..9fa70e5a5 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_simple/00003.png and b/tests/ragger/snapshots/flex/test_sign_simple/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_simple/00004.png b/tests/ragger/snapshots/flex/test_sign_simple/00004.png
index dabe7afea..be51a9d55 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_simple/00004.png and b/tests/ragger/snapshots/flex/test_sign_simple/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_simple/00005.png b/tests/ragger/snapshots/flex/test_sign_simple/00005.png
new file mode 100644
index 000000000..f5b3e29a3
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_sign_simple/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_clone_thundercore/00001.png b/tests/ragger/snapshots/nanos/test_clone_thundercore/00001.png
index 98c2086b4..83c38d97a 100644
Binary files a/tests/ragger/snapshots/nanos/test_clone_thundercore/00001.png and b/tests/ragger/snapshots/nanos/test_clone_thundercore/00001.png differ
diff --git a/tests/ragger/snapshots/nanos/test_clone_thundercore/00002.png b/tests/ragger/snapshots/nanos/test_clone_thundercore/00002.png
index 8656b8175..b874a7f6d 100644
Binary files a/tests/ragger/snapshots/nanos/test_clone_thundercore/00002.png and b/tests/ragger/snapshots/nanos/test_clone_thundercore/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_clone_thundercore/00003.png b/tests/ragger/snapshots/nanos/test_clone_thundercore/00003.png
index fd3155c0d..a433722c5 100644
Binary files a/tests/ragger/snapshots/nanos/test_clone_thundercore/00003.png and b/tests/ragger/snapshots/nanos/test_clone_thundercore/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_clone_thundercore/00004.png b/tests/ragger/snapshots/nanos/test_clone_thundercore/00004.png
index c63f25f8d..98c2086b4 100644
Binary files a/tests/ragger/snapshots/nanos/test_clone_thundercore/00004.png and b/tests/ragger/snapshots/nanos/test_clone_thundercore/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_clone_thundercore/00005.png b/tests/ragger/snapshots/nanos/test_clone_thundercore/00005.png
index c55dc1194..682555ca2 100644
Binary files a/tests/ragger/snapshots/nanos/test_clone_thundercore/00005.png and b/tests/ragger/snapshots/nanos/test_clone_thundercore/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_clone_thundercore/00006.png b/tests/ragger/snapshots/nanos/test_clone_thundercore/00006.png
index 1c9156c31..7ec3b48f0 100644
Binary files a/tests/ragger/snapshots/nanos/test_clone_thundercore/00006.png and b/tests/ragger/snapshots/nanos/test_clone_thundercore/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_clone_thundercore/00007.png b/tests/ragger/snapshots/nanos/test_clone_thundercore/00007.png
index ce795f34e..89f3a23e3 100644
Binary files a/tests/ragger/snapshots/nanos/test_clone_thundercore/00007.png and b/tests/ragger/snapshots/nanos/test_clone_thundercore/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_clone_thundercore/00008.png b/tests/ragger/snapshots/nanos/test_clone_thundercore/00008.png
index 1c9156c31..c55dc1194 100644
Binary files a/tests/ragger/snapshots/nanos/test_clone_thundercore/00008.png and b/tests/ragger/snapshots/nanos/test_clone_thundercore/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_clone_thundercore/00009.png b/tests/ragger/snapshots/nanos/test_clone_thundercore/00009.png
index ce795f34e..1c9156c31 100644
Binary files a/tests/ragger/snapshots/nanos/test_clone_thundercore/00009.png and b/tests/ragger/snapshots/nanos/test_clone_thundercore/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00001.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00001.png
index 67d53e362..3bae8ed8f 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_chainid/00001.png and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00001.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00002.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00002.png
index 8656b8175..debf3a13c 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_chainid/00002.png and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00003.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00003.png
index fd3155c0d..b80c1e448 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_chainid/00003.png and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00004.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00004.png
index c63f25f8d..67d53e362 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_chainid/00004.png and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00005.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00005.png
index 8e15de5dd..682555ca2 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_chainid/00005.png and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00006.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00006.png
index fff41ba06..7ec3b48f0 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_chainid/00006.png and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00007.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00007.png
index 1c9156c31..89f3a23e3 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_chainid/00007.png and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00008.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00008.png
index ce795f34e..8e15de5dd 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_chainid/00008.png and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00009.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00009.png
index 1c9156c31..fff41ba06 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_chainid/00009.png and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00010.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00010.png
index ce795f34e..1c9156c31 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_chainid/00010.png and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_chainid/00011.png b/tests/ragger/snapshots/nanos/test_legacy_chainid/00011.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_legacy_chainid/00011.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00001.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00001.png
index 29e50386e..3bae8ed8f 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00001.png and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00001.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00002.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00002.png
index 8656b8175..debf3a13c 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00002.png and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00003.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00003.png
index fd3155c0d..b80c1e448 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00003.png and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00004.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00004.png
index c63f25f8d..29e50386e 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00004.png and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00005.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00005.png
index 371c12699..682555ca2 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00005.png and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00006.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00006.png
index 95e7fbbe6..7ec3b48f0 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00006.png and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00007.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00007.png
index 1c9156c31..89f3a23e3 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00007.png and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00008.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00008.png
index ce795f34e..371c12699 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00008.png and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00009.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00009.png
index 1c9156c31..95e7fbbe6 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00009.png and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00010.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00010.png
index ce795f34e..1c9156c31 100644
Binary files a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00010.png and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00011.png b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00011.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_legacy_send_bsc/00011.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00002.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00002.png
index 10706b86e..3bae8ed8f 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00002.png and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00003.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00003.png
index 8656b8175..debf3a13c 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00003.png and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00004.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00004.png
index fd3155c0d..b80c1e448 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00004.png and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00005.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00005.png
index c63f25f8d..10706b86e 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00005.png and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00006.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00006.png
index 0aa6e196a..682555ca2 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00006.png and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00007.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00007.png
index c84d3ec3e..7ec3b48f0 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00007.png and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00008.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00008.png
index 1c9156c31..89f3a23e3 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00008.png and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00009.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00009.png
index ce795f34e..0aa6e196a 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00009.png and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00010.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00010.png
index 1c9156c31..c84d3ec3e 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00010.png and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00011.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00011.png
index ce795f34e..1c9156c31 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00011.png and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00011.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00012.png b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00012.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_blind_and_nonce_display/00012.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00002.png b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00002.png
index 10706b86e..3bae8ed8f 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00002.png and b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00003.png b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00003.png
index 8656b8175..debf3a13c 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00003.png and b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00004.png b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00004.png
index fd3155c0d..b80c1e448 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00004.png and b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00005.png b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00005.png
index c63f25f8d..10706b86e 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00005.png and b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00006.png b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00006.png
index c84d3ec3e..682555ca2 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00006.png and b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00007.png b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00007.png
index 1c9156c31..7ec3b48f0 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00007.png and b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00008.png b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00008.png
index ce795f34e..89f3a23e3 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00008.png and b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00009.png b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00009.png
index 1c9156c31..c84d3ec3e 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00009.png and b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00010.png b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00010.png
index ce795f34e..1c9156c31 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00010.png and b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_blind_simple/00011.png b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00011.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_blind_simple/00011.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00001.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00001.png
index 68b7cb31d..0a6a82343 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00001.png and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00001.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00002.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00002.png
index 304f99e5f..04f6b02d7 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00002.png and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00003.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00003.png
index cdb80b744..8a8c617ae 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00003.png and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00004.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00004.png
index 39f91a14a..68b7cb31d 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00004.png and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00005.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00005.png
index 2f61fc967..2b0602507 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00005.png and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00006.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00006.png
index 493527e1d..c60719499 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00006.png and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00007.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00007.png
index 1c9156c31..0e77a58a8 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00007.png and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00008.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00008.png
index ce795f34e..2f61fc967 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00008.png and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00009.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00009.png
new file mode 100644
index 000000000..493527e1d
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00010.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00010.png
new file mode 100644
index 000000000..1c9156c31
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_eip_2930/00011.png b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00011.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_eip_2930/00011.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00001.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00001.png
index 7ebda4f3a..3bae8ed8f 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00001.png and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00001.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00002.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00002.png
index eaf18d9f7..debf3a13c 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00002.png and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00003.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00003.png
index 87688c673..b80c1e448 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00003.png and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00004.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00004.png
index 8656b8175..7ebda4f3a 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00004.png and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00005.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00005.png
index fd3155c0d..eaf18d9f7 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00005.png and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00006.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00006.png
index c63f25f8d..87688c673 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00006.png and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00007.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00007.png
index 933691b4e..682555ca2 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00007.png and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00008.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00008.png
index 1c9156c31..7ec3b48f0 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00008.png and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00009.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00009.png
index ce795f34e..89f3a23e3 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00009.png and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00010.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00010.png
new file mode 100644
index 000000000..933691b4e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00011.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00011.png
new file mode 100644
index 000000000..1c9156c31
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00011.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00012.png b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00012.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_limit_nonce/00012.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00001.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00001.png
index 10706b86e..3bae8ed8f 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00001.png and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00001.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00002.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00002.png
index 8656b8175..debf3a13c 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00002.png and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00003.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00003.png
index fd3155c0d..b80c1e448 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00003.png and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00004.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00004.png
index c63f25f8d..10706b86e 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00004.png and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00005.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00005.png
index 46e1645eb..682555ca2 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00005.png and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00006.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00006.png
index c84d3ec3e..7ec3b48f0 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00006.png and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00007.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00007.png
index 1c9156c31..89f3a23e3 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00007.png and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00008.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00008.png
index ce795f34e..46e1645eb 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00008.png and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00009.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00009.png
index 1c9156c31..c84d3ec3e 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00009.png and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00010.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00010.png
index ce795f34e..1c9156c31 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00010.png and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_nonce_display/00011.png b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00011.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_nonce_display/00011.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00001.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00001.png
index 9f2651390..0a6a82343 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00001.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00001.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00002.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00002.png
index 346ae5ebe..04f6b02d7 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00002.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00003.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00003.png
index e845325b9..8a8c617ae 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00003.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00004.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00004.png
index b5b0f1e34..9f2651390 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00004.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00005.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00005.png
index cc968dc82..424902998 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00005.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00006.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00006.png
index 1c9156c31..bb4b73f5c 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00006.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00007.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00007.png
index ce795f34e..b7a5302cd 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00007.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00008.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00008.png
new file mode 100644
index 000000000..cc968dc82
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00009.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00009.png
new file mode 100644
index 000000000..1c9156c31
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00010.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00010.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/step_3/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00001.png b/tests/ragger/snapshots/nanos/test_sign_reject/00001.png
index 10706b86e..3bae8ed8f 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_reject/00001.png and b/tests/ragger/snapshots/nanos/test_sign_reject/00001.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00002.png b/tests/ragger/snapshots/nanos/test_sign_reject/00002.png
index 8656b8175..debf3a13c 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_reject/00002.png and b/tests/ragger/snapshots/nanos/test_sign_reject/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00003.png b/tests/ragger/snapshots/nanos/test_sign_reject/00003.png
index fd3155c0d..b80c1e448 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_reject/00003.png and b/tests/ragger/snapshots/nanos/test_sign_reject/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00004.png b/tests/ragger/snapshots/nanos/test_sign_reject/00004.png
index c63f25f8d..10706b86e 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_reject/00004.png and b/tests/ragger/snapshots/nanos/test_sign_reject/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00005.png b/tests/ragger/snapshots/nanos/test_sign_reject/00005.png
index c84d3ec3e..682555ca2 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_reject/00005.png and b/tests/ragger/snapshots/nanos/test_sign_reject/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00006.png b/tests/ragger/snapshots/nanos/test_sign_reject/00006.png
index 1c9156c31..7ec3b48f0 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_reject/00006.png and b/tests/ragger/snapshots/nanos/test_sign_reject/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00007.png b/tests/ragger/snapshots/nanos/test_sign_reject/00007.png
index 9c7e7049c..89f3a23e3 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_reject/00007.png and b/tests/ragger/snapshots/nanos/test_sign_reject/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00008.png b/tests/ragger/snapshots/nanos/test_sign_reject/00008.png
index ce795f34e..c84d3ec3e 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_reject/00008.png and b/tests/ragger/snapshots/nanos/test_sign_reject/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00009.png b/tests/ragger/snapshots/nanos/test_sign_reject/00009.png
index 9c7e7049c..1c9156c31 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_reject/00009.png and b/tests/ragger/snapshots/nanos/test_sign_reject/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00010.png b/tests/ragger/snapshots/nanos/test_sign_reject/00010.png
index ce795f34e..9c7e7049c 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_reject/00010.png and b/tests/ragger/snapshots/nanos/test_sign_reject/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_reject/00011.png b/tests/ragger/snapshots/nanos/test_sign_reject/00011.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_reject/00011.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_simple/00001.png b/tests/ragger/snapshots/nanos/test_sign_simple/00001.png
index 10706b86e..3bae8ed8f 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_simple/00001.png and b/tests/ragger/snapshots/nanos/test_sign_simple/00001.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_simple/00002.png b/tests/ragger/snapshots/nanos/test_sign_simple/00002.png
index 8656b8175..debf3a13c 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_simple/00002.png and b/tests/ragger/snapshots/nanos/test_sign_simple/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_simple/00003.png b/tests/ragger/snapshots/nanos/test_sign_simple/00003.png
index fd3155c0d..b80c1e448 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_simple/00003.png and b/tests/ragger/snapshots/nanos/test_sign_simple/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_simple/00004.png b/tests/ragger/snapshots/nanos/test_sign_simple/00004.png
index c63f25f8d..10706b86e 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_simple/00004.png and b/tests/ragger/snapshots/nanos/test_sign_simple/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_simple/00005.png b/tests/ragger/snapshots/nanos/test_sign_simple/00005.png
index c84d3ec3e..682555ca2 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_simple/00005.png and b/tests/ragger/snapshots/nanos/test_sign_simple/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_simple/00006.png b/tests/ragger/snapshots/nanos/test_sign_simple/00006.png
index 1c9156c31..7ec3b48f0 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_simple/00006.png and b/tests/ragger/snapshots/nanos/test_sign_simple/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_simple/00007.png b/tests/ragger/snapshots/nanos/test_sign_simple/00007.png
index ce795f34e..89f3a23e3 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_simple/00007.png and b/tests/ragger/snapshots/nanos/test_sign_simple/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_simple/00008.png b/tests/ragger/snapshots/nanos/test_sign_simple/00008.png
index 1c9156c31..c84d3ec3e 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_simple/00008.png and b/tests/ragger/snapshots/nanos/test_sign_simple/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_simple/00009.png b/tests/ragger/snapshots/nanos/test_sign_simple/00009.png
index ce795f34e..1c9156c31 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_simple/00009.png and b/tests/ragger/snapshots/nanos/test_sign_simple/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_simple/00010.png b/tests/ragger/snapshots/nanos/test_sign_simple/00010.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_simple/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00001.png b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00001.png
index f9840e3ab..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00001.png and b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00001.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00002.png b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00002.png
index 6af0ec54b..f9840e3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00002.png and b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00003.png b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00003.png
index 93112b3ab..a74d347ce 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00003.png and b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00004.png b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00004.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00004.png and b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00005.png b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00005.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00005.png and b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00006.png b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00006.png and b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00007.png b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/domain_name_non_mainnet/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00001.png b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00001.png
index 23d61ed89..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00001.png and b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00001.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00002.png b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00002.png
index 6a5a9d64a..23d61ed89 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00002.png and b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00003.png b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00003.png
index 85a797b91..375301fcc 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00003.png and b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00004.png b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00004.png
index c2a8d9070..85a797b91 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00004.png and b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00005.png b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00005.png
index 570ce28d5..c2a8d9070 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00005.png and b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00006.png b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00006.png and b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00007.png b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/domain_name_unknown_chain/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00001.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00001.png
index f9840e3ab..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00001.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00001.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00002.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00002.png
index 6af0ec54b..f9840e3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00002.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00003.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00003.png
index 1bcb78761..a74d347ce 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00003.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00004.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00004.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00004.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00005.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00005.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00005.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00006.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00006.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/domain_name_verbose_False/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00001.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00001.png
index f9840e3ab..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00001.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00001.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00002.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00002.png
index 6af0ec54b..f9840e3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00002.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00003.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00003.png
index 6a5a9d64a..a74d347ce 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00003.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00004.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00004.png
index 1bcb78761..375301fcc 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00004.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00005.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00005.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00005.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00006.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00006.png and b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00007.png b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/domain_name_verbose_True/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00001.png b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00001.png
index f9840e3ab..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00001.png and b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00001.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00002.png b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00002.png
index 639e4214e..f9840e3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00002.png and b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00003.png b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00003.png
index 1bcb78761..24397c21c 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00003.png and b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00004.png b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00004.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00004.png and b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00005.png b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00005.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00005.png and b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00006.png b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00006.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/domain_name_wrong_addr/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00002.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00002.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00003.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00003.png
index 950fd72aa..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00003.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00004.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00004.png
index 5906d1967..950fd72aa 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00004.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00005.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00005.png
index 1a9d80bd0..5906d1967 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00005.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00006.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00006.png
index 1bcb78761..1a9d80bd0 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00006.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00007.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00007.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00008.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00008.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00009.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_1/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00002.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00002.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00003.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00003.png
index 402128bbd..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00003.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00004.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00004.png
index 6e50574d2..402128bbd 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00004.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00005.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00005.png
index 1a9d80bd0..6e50574d2 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00005.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00006.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00006.png
index 66ebda506..1a9d80bd0 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00006.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00007.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00007.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00007.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00008.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00008.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00008.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00009.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00009.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00010.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_137/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00002.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00002.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00003.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00003.png
index 402128bbd..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00003.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00004.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00004.png
index 417f99b10..402128bbd 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00004.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00005.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00005.png
index 1a9d80bd0..417f99b10 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00005.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00006.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00006.png
index 93112b3ab..1a9d80bd0 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00006.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00007.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00007.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00007.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00008.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00008.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00009.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00009.png and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00010.png b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc1155_safeBatchTransferFrom_5/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00002.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00002.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00003.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00003.png
index 950fd72aa..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00003.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00004.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00004.png
index 5906d1967..950fd72aa 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00004.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00005.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00005.png
index b0804b03e..5906d1967 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00005.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00006.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00006.png
index 55ce94fdd..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00006.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00007.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00007.png
index 1bcb78761..55ce94fdd 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00007.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00008.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00008.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00009.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00009.png
index e90cd9db3..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00009.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00010.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00010.png
index 657887225..e90cd9db3 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00010.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00011.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00011.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1-rejected/00011.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00002.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00002.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00003.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00003.png
index 950fd72aa..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00003.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00004.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00004.png
index 5906d1967..950fd72aa 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00004.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00005.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00005.png
index b0804b03e..5906d1967 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00005.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00006.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00006.png
index 55ce94fdd..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00006.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00007.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00007.png
index 1bcb78761..55ce94fdd 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00007.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00008.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00008.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00009.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00009.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00010.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_1/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00002.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00002.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00003.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00003.png
index 402128bbd..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00003.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00004.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00004.png
index 6e50574d2..402128bbd 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00004.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00005.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00005.png
index b0804b03e..6e50574d2 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00005.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00006.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00006.png
index 55ce94fdd..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00006.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00007.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00007.png
index 66ebda506..55ce94fdd 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00007.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00008.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00008.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00008.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00009.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00009.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00009.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00010.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00010.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00010.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00011.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00011.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_137/00011.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00002.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00002.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00003.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00003.png
index 402128bbd..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00003.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00004.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00004.png
index 417f99b10..402128bbd 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00004.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00005.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00005.png
index b0804b03e..417f99b10 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00005.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00006.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00006.png
index 55ce94fdd..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00006.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00007.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00007.png
index 93112b3ab..55ce94fdd 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00007.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00008.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00008.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00008.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00009.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00009.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00009.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00010.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00010.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00010.png and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00011.png b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00011.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc1155_safeTransferFrom_5/00011.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00002.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00002.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00003.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00003.png
index c5b41a354..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00003.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00004.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00004.png
index 5906d1967..c5b41a354 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00004.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00005.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00005.png
index 1bcb78761..5906d1967 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00005.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00006.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00006.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00006.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00007.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00007.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00007.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00008.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00008.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00002.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00002.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00003.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00003.png
index e3e9c918d..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00003.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00004.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00004.png
index 6e50574d2..e3e9c918d 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00004.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00005.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00005.png
index 66ebda506..6e50574d2 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00005.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00006.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00006.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00006.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00007.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00007.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00007.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00008.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00008.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00009.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00002.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00002.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00003.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00003.png
index e3e9c918d..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00003.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00004.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00004.png
index 417f99b10..e3e9c918d 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00004.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00005.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00005.png
index 93112b3ab..417f99b10 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00005.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00006.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00006.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00006.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00007.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00007.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00008.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00008.png and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00009.png b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc1155_setApprovalForAll_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_1/00002.png b/tests/ragger/snapshots/nanosp/erc721_approve_1/00002.png
index ef84a421e..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_1/00002.png and b/tests/ragger/snapshots/nanosp/erc721_approve_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_1/00003.png b/tests/ragger/snapshots/nanosp/erc721_approve_1/00003.png
index 02c6fc77c..ef84a421e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_1/00003.png and b/tests/ragger/snapshots/nanosp/erc721_approve_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_1/00004.png b/tests/ragger/snapshots/nanosp/erc721_approve_1/00004.png
index 185581ea3..02c6fc77c 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_1/00004.png and b/tests/ragger/snapshots/nanosp/erc721_approve_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_1/00005.png b/tests/ragger/snapshots/nanosp/erc721_approve_1/00005.png
index b0804b03e..185581ea3 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_1/00005.png and b/tests/ragger/snapshots/nanosp/erc721_approve_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_1/00006.png b/tests/ragger/snapshots/nanosp/erc721_approve_1/00006.png
index 1bcb78761..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_1/00006.png and b/tests/ragger/snapshots/nanosp/erc721_approve_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_1/00007.png b/tests/ragger/snapshots/nanosp/erc721_approve_1/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_1/00007.png and b/tests/ragger/snapshots/nanosp/erc721_approve_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_1/00008.png b/tests/ragger/snapshots/nanosp/erc721_approve_1/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_1/00008.png and b/tests/ragger/snapshots/nanosp/erc721_approve_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_1/00009.png b/tests/ragger/snapshots/nanosp/erc721_approve_1/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_approve_1/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_137/00002.png b/tests/ragger/snapshots/nanosp/erc721_approve_137/00002.png
index ef84a421e..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_137/00002.png and b/tests/ragger/snapshots/nanosp/erc721_approve_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_137/00003.png b/tests/ragger/snapshots/nanosp/erc721_approve_137/00003.png
index 4ef9c7d27..ef84a421e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_137/00003.png and b/tests/ragger/snapshots/nanosp/erc721_approve_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_137/00004.png b/tests/ragger/snapshots/nanosp/erc721_approve_137/00004.png
index 5ec458c27..4ef9c7d27 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_137/00004.png and b/tests/ragger/snapshots/nanosp/erc721_approve_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_137/00005.png b/tests/ragger/snapshots/nanosp/erc721_approve_137/00005.png
index b0804b03e..5ec458c27 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_137/00005.png and b/tests/ragger/snapshots/nanosp/erc721_approve_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_137/00006.png b/tests/ragger/snapshots/nanosp/erc721_approve_137/00006.png
index 66ebda506..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_137/00006.png and b/tests/ragger/snapshots/nanosp/erc721_approve_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_137/00007.png b/tests/ragger/snapshots/nanosp/erc721_approve_137/00007.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_137/00007.png and b/tests/ragger/snapshots/nanosp/erc721_approve_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_137/00008.png b/tests/ragger/snapshots/nanosp/erc721_approve_137/00008.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_137/00008.png and b/tests/ragger/snapshots/nanosp/erc721_approve_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_137/00009.png b/tests/ragger/snapshots/nanosp/erc721_approve_137/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_137/00009.png and b/tests/ragger/snapshots/nanosp/erc721_approve_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_137/00010.png b/tests/ragger/snapshots/nanosp/erc721_approve_137/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_approve_137/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_5/00002.png b/tests/ragger/snapshots/nanosp/erc721_approve_5/00002.png
index ef84a421e..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_5/00002.png and b/tests/ragger/snapshots/nanosp/erc721_approve_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_5/00003.png b/tests/ragger/snapshots/nanosp/erc721_approve_5/00003.png
index 994363ff0..ef84a421e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_5/00003.png and b/tests/ragger/snapshots/nanosp/erc721_approve_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_5/00004.png b/tests/ragger/snapshots/nanosp/erc721_approve_5/00004.png
index 694eda507..994363ff0 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_5/00004.png and b/tests/ragger/snapshots/nanosp/erc721_approve_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_5/00005.png b/tests/ragger/snapshots/nanosp/erc721_approve_5/00005.png
index b0804b03e..694eda507 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_5/00005.png and b/tests/ragger/snapshots/nanosp/erc721_approve_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_5/00006.png b/tests/ragger/snapshots/nanosp/erc721_approve_5/00006.png
index 93112b3ab..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_5/00006.png and b/tests/ragger/snapshots/nanosp/erc721_approve_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_5/00007.png b/tests/ragger/snapshots/nanosp/erc721_approve_5/00007.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_5/00007.png and b/tests/ragger/snapshots/nanosp/erc721_approve_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_5/00008.png b/tests/ragger/snapshots/nanosp/erc721_approve_5/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_5/00008.png and b/tests/ragger/snapshots/nanosp/erc721_approve_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_5/00009.png b/tests/ragger/snapshots/nanosp/erc721_approve_5/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_approve_5/00009.png and b/tests/ragger/snapshots/nanosp/erc721_approve_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_approve_5/00010.png b/tests/ragger/snapshots/nanosp/erc721_approve_5/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_approve_5/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00002.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00002.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00003.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00003.png
index b1d7a7b57..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00003.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00004.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00004.png
index 185581ea3..b1d7a7b57 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00004.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00005.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00005.png
index b0804b03e..185581ea3 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00005.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00006.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00006.png
index 1bcb78761..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00006.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00007.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00007.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00008.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00008.png
index e90cd9db3..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00008.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00009.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00009.png
index 657887225..e90cd9db3 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00009.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00010.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1-rejected/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00002.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00002.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00003.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00003.png
index b1d7a7b57..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00003.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00004.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00004.png
index 185581ea3..b1d7a7b57 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00004.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00005.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00005.png
index b0804b03e..185581ea3 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00005.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00006.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00006.png
index 1bcb78761..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00006.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00007.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00007.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00008.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00008.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00009.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_1/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00002.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00002.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00003.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00003.png
index 74c9ac0e7..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00003.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00004.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00004.png
index 5ec458c27..74c9ac0e7 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00004.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00005.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00005.png
index b0804b03e..5ec458c27 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00005.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00006.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00006.png
index 66ebda506..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00006.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00007.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00007.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00007.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00008.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00008.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00008.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00009.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00009.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00010.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_137/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00002.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00002.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00003.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00003.png
index 3d7d224d3..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00003.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00004.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00004.png
index 694eda507..3d7d224d3 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00004.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00005.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00005.png
index b0804b03e..694eda507 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00005.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00006.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00006.png
index 93112b3ab..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00006.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00007.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00007.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00007.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00008.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00008.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00009.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00009.png and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00010.png b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_safeTransferFrom_5/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00002.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00002.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00003.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00003.png
index d22cc8c57..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00003.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00004.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00004.png
index 185581ea3..d22cc8c57 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00004.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00005.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00005.png
index 1bcb78761..185581ea3 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00005.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00006.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00006.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00006.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00007.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00007.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00007.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00008.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00008.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00002.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00002.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00003.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00003.png
index b5fdf8b83..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00003.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00004.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00004.png
index 5ec458c27..b5fdf8b83 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00004.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00005.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00005.png
index 66ebda506..5ec458c27 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00005.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00006.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00006.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00006.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00007.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00007.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00007.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00008.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00008.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00009.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00002.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00002.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00003.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00003.png
index 63ae03f4f..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00003.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00004.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00004.png
index 694eda507..63ae03f4f 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00004.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00005.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00005.png
index 93112b3ab..694eda507 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00005.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00006.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00006.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00006.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00007.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00007.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00008.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00008.png and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00009.png b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_setApprovalForAll_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00002.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00002.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00003.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00003.png
index b1d7a7b57..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00003.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00004.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00004.png
index 185581ea3..b1d7a7b57 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00004.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00005.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00005.png
index b0804b03e..185581ea3 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00005.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00006.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00006.png
index 1bcb78761..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00006.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00007.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00007.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00008.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00008.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00009.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_1/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00002.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00002.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00003.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00003.png
index 74c9ac0e7..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00003.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00004.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00004.png
index 5ec458c27..74c9ac0e7 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00004.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00005.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00005.png
index b0804b03e..5ec458c27 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00005.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00006.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00006.png
index 66ebda506..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00006.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00007.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00007.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00007.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00008.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00008.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00008.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00009.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00009.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00010.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_137/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00002.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00002.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00003.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00003.png
index 3d7d224d3..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00003.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00004.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00004.png
index 694eda507..3d7d224d3 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00004.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00005.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00005.png
index b0804b03e..694eda507 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00005.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00006.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00006.png
index 93112b3ab..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00006.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00007.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00007.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00007.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00008.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00008.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00009.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00009.png and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00010.png b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/erc721_transferFrom_5/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00001.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00001.png
index cdcc19d05..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00001.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00001.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00002.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00002.png
index c07ea9622..cdcc19d05 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00002.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00003.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00003.png
index 0fd18b254..d704566c0 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00003.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00004.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00004.png
index 570ce28d5..0fd18b254 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00004.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00005.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00005.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00005.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00006.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00006.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/step_3/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00001.png b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00001.png
index f9840e3ab..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00001.png and b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00002.png b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00002.png
index 6af0ec54b..f9840e3ab 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00002.png and b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00003.png b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00003.png
index 93112b3ab..a74d347ce 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00003.png and b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00004.png b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00004.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00004.png and b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00005.png b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00005.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00005.png and b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00006.png b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00006.png and b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00007.png b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/domain_name_non_mainnet/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00001.png b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00001.png
index 23d61ed89..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00001.png and b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00002.png b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00002.png
index 6a5a9d64a..23d61ed89 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00002.png and b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00003.png b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00003.png
index 85a797b91..375301fcc 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00003.png and b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00004.png b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00004.png
index c2a8d9070..85a797b91 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00004.png and b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00005.png b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00005.png
index 570ce28d5..c2a8d9070 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00005.png and b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00006.png b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00006.png and b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00007.png b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/domain_name_unknown_chain/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00001.png b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00001.png
index f9840e3ab..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00001.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00002.png b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00002.png
index 6af0ec54b..f9840e3ab 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00002.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00003.png b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00003.png
index 1bcb78761..a74d347ce 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00003.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00004.png b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00004.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00004.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00005.png b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00005.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00005.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_False/00006.png b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00006.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/domain_name_verbose_False/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00001.png b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00001.png
index f9840e3ab..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00001.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00002.png b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00002.png
index 6af0ec54b..f9840e3ab 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00002.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00003.png b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00003.png
index 6a5a9d64a..a74d347ce 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00003.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00004.png b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00004.png
index 1bcb78761..375301fcc 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00004.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00005.png b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00005.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00005.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00006.png b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00006.png and b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_verbose_True/00007.png b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/domain_name_verbose_True/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00001.png b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00001.png
index f9840e3ab..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00001.png and b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00002.png b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00002.png
index 639e4214e..f9840e3ab 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00002.png and b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00003.png b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00003.png
index 1bcb78761..24397c21c 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00003.png and b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00004.png b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00004.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00004.png and b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00005.png b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00005.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00005.png and b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00006.png b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00006.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/domain_name_wrong_addr/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00002.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00002.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00003.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00003.png
index 950fd72aa..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00003.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00004.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00004.png
index 5906d1967..950fd72aa 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00004.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00005.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00005.png
index 1a9d80bd0..5906d1967 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00005.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00006.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00006.png
index 1bcb78761..1a9d80bd0 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00006.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00007.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00007.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00008.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00008.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00009.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_1/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00002.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00002.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00003.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00003.png
index 402128bbd..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00003.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00004.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00004.png
index 6e50574d2..402128bbd 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00004.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00005.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00005.png
index 1a9d80bd0..6e50574d2 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00005.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00006.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00006.png
index 66ebda506..1a9d80bd0 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00006.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00007.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00007.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00007.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00008.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00008.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00008.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00009.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00009.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00010.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_137/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00002.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00002.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00003.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00003.png
index 402128bbd..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00003.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00004.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00004.png
index 417f99b10..402128bbd 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00004.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00005.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00005.png
index 1a9d80bd0..417f99b10 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00005.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00006.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00006.png
index 93112b3ab..1a9d80bd0 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00006.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00007.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00007.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00007.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00008.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00008.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00009.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00009.png and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00010.png b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc1155_safeBatchTransferFrom_5/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00002.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00002.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00003.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00003.png
index 950fd72aa..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00003.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00004.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00004.png
index 5906d1967..950fd72aa 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00004.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00005.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00005.png
index b0804b03e..5906d1967 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00005.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00006.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00006.png
index 55ce94fdd..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00006.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00007.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00007.png
index 1bcb78761..55ce94fdd 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00007.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00008.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00008.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00009.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00009.png
index e90cd9db3..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00009.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00010.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00010.png
index 657887225..e90cd9db3 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00010.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00011.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00011.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1-rejected/00011.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00002.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00002.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00003.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00003.png
index 950fd72aa..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00003.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00004.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00004.png
index 5906d1967..950fd72aa 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00004.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00005.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00005.png
index b0804b03e..5906d1967 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00005.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00006.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00006.png
index 55ce94fdd..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00006.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00007.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00007.png
index 1bcb78761..55ce94fdd 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00007.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00008.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00008.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00009.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00009.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00010.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_1/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00002.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00002.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00003.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00003.png
index 402128bbd..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00003.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00004.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00004.png
index 6e50574d2..402128bbd 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00004.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00005.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00005.png
index b0804b03e..6e50574d2 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00005.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00006.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00006.png
index 55ce94fdd..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00006.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00007.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00007.png
index 66ebda506..55ce94fdd 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00007.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00008.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00008.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00008.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00009.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00009.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00009.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00010.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00010.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00010.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00011.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00011.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_137/00011.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00002.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00002.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00003.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00003.png
index 402128bbd..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00003.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00004.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00004.png
index 417f99b10..402128bbd 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00004.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00005.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00005.png
index b0804b03e..417f99b10 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00005.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00006.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00006.png
index 55ce94fdd..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00006.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00007.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00007.png
index 93112b3ab..55ce94fdd 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00007.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00008.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00008.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00008.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00009.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00009.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00009.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00010.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00010.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00010.png and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00011.png b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00011.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc1155_safeTransferFrom_5/00011.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00002.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00002.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00003.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00003.png
index c5b41a354..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00003.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00004.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00004.png
index 5906d1967..c5b41a354 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00004.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00005.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00005.png
index 1bcb78761..5906d1967 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00005.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00006.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00006.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00006.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00007.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00007.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00007.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00008.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00008.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00002.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00002.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00003.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00003.png
index e3e9c918d..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00003.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00004.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00004.png
index 6e50574d2..e3e9c918d 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00004.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00005.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00005.png
index 66ebda506..6e50574d2 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00005.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00006.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00006.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00006.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00007.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00007.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00007.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00008.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00008.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00009.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00002.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00002.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00003.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00003.png
index e3e9c918d..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00003.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00004.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00004.png
index 417f99b10..e3e9c918d 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00004.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00005.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00005.png
index 93112b3ab..417f99b10 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00005.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00006.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00006.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00006.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00007.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00007.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00008.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00008.png and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00009.png b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc1155_setApprovalForAll_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_1/00002.png b/tests/ragger/snapshots/nanox/erc721_approve_1/00002.png
index ef84a421e..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_1/00002.png and b/tests/ragger/snapshots/nanox/erc721_approve_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_1/00003.png b/tests/ragger/snapshots/nanox/erc721_approve_1/00003.png
index 02c6fc77c..ef84a421e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_1/00003.png and b/tests/ragger/snapshots/nanox/erc721_approve_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_1/00004.png b/tests/ragger/snapshots/nanox/erc721_approve_1/00004.png
index 185581ea3..02c6fc77c 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_1/00004.png and b/tests/ragger/snapshots/nanox/erc721_approve_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_1/00005.png b/tests/ragger/snapshots/nanox/erc721_approve_1/00005.png
index b0804b03e..185581ea3 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_1/00005.png and b/tests/ragger/snapshots/nanox/erc721_approve_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_1/00006.png b/tests/ragger/snapshots/nanox/erc721_approve_1/00006.png
index 1bcb78761..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_1/00006.png and b/tests/ragger/snapshots/nanox/erc721_approve_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_1/00007.png b/tests/ragger/snapshots/nanox/erc721_approve_1/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_1/00007.png and b/tests/ragger/snapshots/nanox/erc721_approve_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_1/00008.png b/tests/ragger/snapshots/nanox/erc721_approve_1/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_1/00008.png and b/tests/ragger/snapshots/nanox/erc721_approve_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_1/00009.png b/tests/ragger/snapshots/nanox/erc721_approve_1/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_approve_1/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_137/00002.png b/tests/ragger/snapshots/nanox/erc721_approve_137/00002.png
index ef84a421e..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_137/00002.png and b/tests/ragger/snapshots/nanox/erc721_approve_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_137/00003.png b/tests/ragger/snapshots/nanox/erc721_approve_137/00003.png
index 4ef9c7d27..ef84a421e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_137/00003.png and b/tests/ragger/snapshots/nanox/erc721_approve_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_137/00004.png b/tests/ragger/snapshots/nanox/erc721_approve_137/00004.png
index 5ec458c27..4ef9c7d27 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_137/00004.png and b/tests/ragger/snapshots/nanox/erc721_approve_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_137/00005.png b/tests/ragger/snapshots/nanox/erc721_approve_137/00005.png
index b0804b03e..5ec458c27 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_137/00005.png and b/tests/ragger/snapshots/nanox/erc721_approve_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_137/00006.png b/tests/ragger/snapshots/nanox/erc721_approve_137/00006.png
index 66ebda506..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_137/00006.png and b/tests/ragger/snapshots/nanox/erc721_approve_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_137/00007.png b/tests/ragger/snapshots/nanox/erc721_approve_137/00007.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_137/00007.png and b/tests/ragger/snapshots/nanox/erc721_approve_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_137/00008.png b/tests/ragger/snapshots/nanox/erc721_approve_137/00008.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_137/00008.png and b/tests/ragger/snapshots/nanox/erc721_approve_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_137/00009.png b/tests/ragger/snapshots/nanox/erc721_approve_137/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_137/00009.png and b/tests/ragger/snapshots/nanox/erc721_approve_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_137/00010.png b/tests/ragger/snapshots/nanox/erc721_approve_137/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_approve_137/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_5/00002.png b/tests/ragger/snapshots/nanox/erc721_approve_5/00002.png
index ef84a421e..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_5/00002.png and b/tests/ragger/snapshots/nanox/erc721_approve_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_5/00003.png b/tests/ragger/snapshots/nanox/erc721_approve_5/00003.png
index 994363ff0..ef84a421e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_5/00003.png and b/tests/ragger/snapshots/nanox/erc721_approve_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_5/00004.png b/tests/ragger/snapshots/nanox/erc721_approve_5/00004.png
index 694eda507..994363ff0 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_5/00004.png and b/tests/ragger/snapshots/nanox/erc721_approve_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_5/00005.png b/tests/ragger/snapshots/nanox/erc721_approve_5/00005.png
index b0804b03e..694eda507 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_5/00005.png and b/tests/ragger/snapshots/nanox/erc721_approve_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_5/00006.png b/tests/ragger/snapshots/nanox/erc721_approve_5/00006.png
index 93112b3ab..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_5/00006.png and b/tests/ragger/snapshots/nanox/erc721_approve_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_5/00007.png b/tests/ragger/snapshots/nanox/erc721_approve_5/00007.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_5/00007.png and b/tests/ragger/snapshots/nanox/erc721_approve_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_5/00008.png b/tests/ragger/snapshots/nanox/erc721_approve_5/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_5/00008.png and b/tests/ragger/snapshots/nanox/erc721_approve_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_5/00009.png b/tests/ragger/snapshots/nanox/erc721_approve_5/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_approve_5/00009.png and b/tests/ragger/snapshots/nanox/erc721_approve_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_approve_5/00010.png b/tests/ragger/snapshots/nanox/erc721_approve_5/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_approve_5/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00002.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00002.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00003.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00003.png
index b1d7a7b57..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00003.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00004.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00004.png
index 185581ea3..b1d7a7b57 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00004.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00005.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00005.png
index b0804b03e..185581ea3 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00005.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00006.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00006.png
index 1bcb78761..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00006.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00007.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00007.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00008.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00008.png
index e90cd9db3..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00008.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00009.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00009.png
index 657887225..e90cd9db3 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00009.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00010.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1-rejected/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00002.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00002.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00003.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00003.png
index b1d7a7b57..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00003.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00004.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00004.png
index 185581ea3..b1d7a7b57 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00004.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00005.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00005.png
index b0804b03e..185581ea3 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00005.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00006.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00006.png
index 1bcb78761..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00006.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00007.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00007.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00008.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00008.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00009.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_1/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00002.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00002.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00003.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00003.png
index 74c9ac0e7..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00003.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00004.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00004.png
index 5ec458c27..74c9ac0e7 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00004.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00005.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00005.png
index b0804b03e..5ec458c27 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00005.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00006.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00006.png
index 66ebda506..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00006.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00007.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00007.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00007.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00008.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00008.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00008.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00009.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00009.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00010.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_137/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00002.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00002.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00003.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00003.png
index 3d7d224d3..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00003.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00004.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00004.png
index 694eda507..3d7d224d3 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00004.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00005.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00005.png
index b0804b03e..694eda507 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00005.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00006.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00006.png
index 93112b3ab..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00006.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00007.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00007.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00007.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00008.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00008.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00009.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00009.png and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00010.png b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_safeTransferFrom_5/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00002.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00002.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00003.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00003.png
index d22cc8c57..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00003.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00004.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00004.png
index 185581ea3..d22cc8c57 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00004.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00005.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00005.png
index 1bcb78761..185581ea3 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00005.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00006.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00006.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00006.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00007.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00007.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00007.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00008.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00008.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00002.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00002.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00003.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00003.png
index b5fdf8b83..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00003.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00004.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00004.png
index 5ec458c27..b5fdf8b83 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00004.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00005.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00005.png
index 66ebda506..5ec458c27 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00005.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00006.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00006.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00006.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00007.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00007.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00007.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00008.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00008.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00009.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00002.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00002.png
index 4524ac5c7..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00002.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00003.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00003.png
index 63ae03f4f..4524ac5c7 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00003.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00004.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00004.png
index 694eda507..63ae03f4f 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00004.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00005.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00005.png
index 93112b3ab..694eda507 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00005.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00006.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00006.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00006.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00007.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00007.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00008.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00008.png and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00009.png b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_setApprovalForAll_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00002.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00002.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00003.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00003.png
index b1d7a7b57..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00003.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00004.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00004.png
index 185581ea3..b1d7a7b57 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00004.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00005.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00005.png
index b0804b03e..185581ea3 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00005.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00006.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00006.png
index 1bcb78761..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00006.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00007.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00007.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00007.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00008.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00008.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00008.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00009.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00009.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_transferFrom_1/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00002.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00002.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00003.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00003.png
index 74c9ac0e7..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00003.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00004.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00004.png
index 5ec458c27..74c9ac0e7 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00004.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00005.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00005.png
index b0804b03e..5ec458c27 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00005.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00006.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00006.png
index 66ebda506..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00006.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00007.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00007.png
index 73d6bb75d..66ebda506 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00007.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00008.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00008.png
index 570ce28d5..73d6bb75d 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00008.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00009.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00009.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00010.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_transferFrom_137/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00002.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00002.png
index 79e2760ee..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00002.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00003.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00003.png
index 3d7d224d3..79e2760ee 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00003.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00004.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00004.png
index 694eda507..3d7d224d3 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00004.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00005.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00005.png
index b0804b03e..694eda507 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00005.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00006.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00006.png
index 93112b3ab..b0804b03e 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00006.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00007.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00007.png
index 1bcb78761..93112b3ab 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00007.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00008.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00008.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00008.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00009.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00009.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00009.png and b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00010.png b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00010.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/erc721_transferFrom_5/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/test_clone_thundercore/00001.png b/tests/ragger/snapshots/nanox/test_clone_thundercore/00001.png
index af5ca55bb..09e00c6bb 100644
Binary files a/tests/ragger/snapshots/nanox/test_clone_thundercore/00001.png and b/tests/ragger/snapshots/nanox/test_clone_thundercore/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_clone_thundercore/00002.png b/tests/ragger/snapshots/nanox/test_clone_thundercore/00002.png
index 0f18eeec9..af5ca55bb 100644
Binary files a/tests/ragger/snapshots/nanox/test_clone_thundercore/00002.png and b/tests/ragger/snapshots/nanox/test_clone_thundercore/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_clone_thundercore/00003.png b/tests/ragger/snapshots/nanox/test_clone_thundercore/00003.png
index 16fbf15df..eb15b7263 100644
Binary files a/tests/ragger/snapshots/nanox/test_clone_thundercore/00003.png and b/tests/ragger/snapshots/nanox/test_clone_thundercore/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_clone_thundercore/00004.png b/tests/ragger/snapshots/nanox/test_clone_thundercore/00004.png
index 570ce28d5..16fbf15df 100644
Binary files a/tests/ragger/snapshots/nanox/test_clone_thundercore/00004.png and b/tests/ragger/snapshots/nanox/test_clone_thundercore/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_clone_thundercore/00005.png b/tests/ragger/snapshots/nanox/test_clone_thundercore/00005.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_clone_thundercore/00005.png and b/tests/ragger/snapshots/nanox/test_clone_thundercore/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid/00001.png b/tests/ragger/snapshots/nanox/test_legacy_chainid/00001.png
index 86eecc0a1..b8e2d057a 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_chainid/00001.png and b/tests/ragger/snapshots/nanox/test_legacy_chainid/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid/00002.png b/tests/ragger/snapshots/nanox/test_legacy_chainid/00002.png
index 0f18eeec9..86eecc0a1 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_chainid/00002.png and b/tests/ragger/snapshots/nanox/test_legacy_chainid/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid/00003.png b/tests/ragger/snapshots/nanox/test_legacy_chainid/00003.png
index 10989ee8d..eb15b7263 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_chainid/00003.png and b/tests/ragger/snapshots/nanox/test_legacy_chainid/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid/00004.png b/tests/ragger/snapshots/nanox/test_legacy_chainid/00004.png
index c2a8d9070..10989ee8d 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_chainid/00004.png and b/tests/ragger/snapshots/nanox/test_legacy_chainid/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid/00005.png b/tests/ragger/snapshots/nanox/test_legacy_chainid/00005.png
index 570ce28d5..c2a8d9070 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_chainid/00005.png and b/tests/ragger/snapshots/nanox/test_legacy_chainid/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid/00006.png b/tests/ragger/snapshots/nanox/test_legacy_chainid/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_chainid/00006.png and b/tests/ragger/snapshots/nanox/test_legacy_chainid/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid/00007.png b/tests/ragger/snapshots/nanox/test_legacy_chainid/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_legacy_chainid/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00001.png b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00001.png
index 1d220e0dc..b8e2d057a 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00001.png and b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00002.png b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00002.png
index 0f18eeec9..1d220e0dc 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00002.png and b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00003.png b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00003.png
index 0d6794d38..eb15b7263 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00003.png and b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00004.png b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00004.png
index cf48bdfc0..0d6794d38 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00004.png and b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00005.png b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00005.png
index 570ce28d5..cf48bdfc0 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00005.png and b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00006.png b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00006.png and b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00007.png b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_legacy_send_bsc/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00002.png b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00002.png
index 36ecb93f5..b8e2d057a 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00002.png and b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00003.png b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00003.png
index 0f18eeec9..36ecb93f5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00003.png and b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00004.png b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00004.png
index 61f368707..eb15b7263 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00004.png and b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00005.png b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00005.png
index 1bcb78761..61f368707 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00005.png and b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00006.png b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00006.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00006.png and b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00007.png b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00007.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00007.png and b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00008.png b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00008.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_sign_blind_and_nonce_display/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00002.png b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00002.png
index 36ecb93f5..b8e2d057a 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00002.png and b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00003.png b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00003.png
index 0f18eeec9..36ecb93f5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00003.png and b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00004.png b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00004.png
index 1bcb78761..eb15b7263 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00004.png and b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00005.png b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00005.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00005.png and b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00006.png b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00006.png and b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_blind_simple/00007.png b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_sign_blind_simple/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00001.png b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00001.png
index 1a0c6c3d0..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00001.png and b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00002.png b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00002.png
index 8588465ac..1a0c6c3d0 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00002.png and b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00003.png b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00003.png
index b2dc741ab..3c307204a 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00003.png and b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00004.png b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00004.png
index 1039cd005..b2dc741ab 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00004.png and b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00005.png b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00005.png
index 570ce28d5..1039cd005 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00005.png and b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00006.png b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00006.png and b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_eip_2930/00007.png b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_sign_eip_2930/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00001.png b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00001.png
index 84aba2c71..b8e2d057a 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00001.png and b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00002.png b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00002.png
index 0f18eeec9..84aba2c71 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00002.png and b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00003.png b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00003.png
index 50135b20b..eb15b7263 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00003.png and b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00004.png b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00004.png
index 570ce28d5..50135b20b 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00004.png and b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00005.png b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00005.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00005.png and b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00006.png b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00006.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_sign_limit_nonce/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00001.png b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00001.png
index 36ecb93f5..b8e2d057a 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00001.png and b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00002.png b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00002.png
index 0f18eeec9..36ecb93f5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00002.png and b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00003.png b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00003.png
index 45b4d1304..eb15b7263 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00003.png and b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00004.png b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00004.png
index 1bcb78761..45b4d1304 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00004.png and b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00005.png b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00005.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00005.png and b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00006.png b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00006.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00006.png and b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_nonce_display/00007.png b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_sign_nonce_display/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00001.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00001.png
index cdcc19d05..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00001.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00002.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00002.png
index c07ea9622..cdcc19d05 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00002.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00003.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00003.png
index 0fd18b254..d704566c0 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00003.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00004.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00004.png
index 570ce28d5..0fd18b254 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00004.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00005.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00005.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00005.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00006.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00006.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/step_3/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_reject/00001.png b/tests/ragger/snapshots/nanox/test_sign_reject/00001.png
index 36ecb93f5..b8e2d057a 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_reject/00001.png and b/tests/ragger/snapshots/nanox/test_sign_reject/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_reject/00002.png b/tests/ragger/snapshots/nanox/test_sign_reject/00002.png
index 0f18eeec9..36ecb93f5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_reject/00002.png and b/tests/ragger/snapshots/nanox/test_sign_reject/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_reject/00003.png b/tests/ragger/snapshots/nanox/test_sign_reject/00003.png
index 1bcb78761..eb15b7263 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_reject/00003.png and b/tests/ragger/snapshots/nanox/test_sign_reject/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_reject/00004.png b/tests/ragger/snapshots/nanox/test_sign_reject/00004.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_reject/00004.png and b/tests/ragger/snapshots/nanox/test_sign_reject/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_reject/00005.png b/tests/ragger/snapshots/nanox/test_sign_reject/00005.png
index e90cd9db3..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_reject/00005.png and b/tests/ragger/snapshots/nanox/test_sign_reject/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_reject/00006.png b/tests/ragger/snapshots/nanox/test_sign_reject/00006.png
index 657887225..e90cd9db3 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_reject/00006.png and b/tests/ragger/snapshots/nanox/test_sign_reject/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_reject/00007.png b/tests/ragger/snapshots/nanox/test_sign_reject/00007.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_sign_reject/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_simple/00001.png b/tests/ragger/snapshots/nanox/test_sign_simple/00001.png
index 36ecb93f5..b8e2d057a 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_simple/00001.png and b/tests/ragger/snapshots/nanox/test_sign_simple/00001.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_simple/00002.png b/tests/ragger/snapshots/nanox/test_sign_simple/00002.png
index 0f18eeec9..36ecb93f5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_simple/00002.png and b/tests/ragger/snapshots/nanox/test_sign_simple/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_simple/00003.png b/tests/ragger/snapshots/nanox/test_sign_simple/00003.png
index 1bcb78761..eb15b7263 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_simple/00003.png and b/tests/ragger/snapshots/nanox/test_sign_simple/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_simple/00004.png b/tests/ragger/snapshots/nanox/test_sign_simple/00004.png
index 570ce28d5..1bcb78761 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_simple/00004.png and b/tests/ragger/snapshots/nanox/test_sign_simple/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_simple/00005.png b/tests/ragger/snapshots/nanox/test_sign_simple/00005.png
index 657887225..570ce28d5 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_simple/00005.png and b/tests/ragger/snapshots/nanox/test_sign_simple/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_simple/00006.png b/tests/ragger/snapshots/nanox/test_sign_simple/00006.png
new file mode 100644
index 000000000..657887225
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_sign_simple/00006.png differ
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 115c3686f..992a25f53 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 a20a36b26..0e380a777 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 d87ae6187..6c704ca33 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 2ba6d27d5..b95479683 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 b1ff1b3ab..2ba6d27d5 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_non_mainnet/00005.png b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00005.png
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/domain_name_non_mainnet/00005.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 690fecc5e..94a33f02b 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 8bf548caa..978bcbce1 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_verbose_False/00000.png b/tests/ragger/snapshots/stax/domain_name_verbose_False/00000.png
index f1b35e477..b22161fe1 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 d5ab1544d..0e380a777 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 687a019ce..637827a11 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 2ba6d27d5..c19f5135d 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 b1ff1b3ab..2ba6d27d5 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_False/00005.png b/tests/ragger/snapshots/stax/domain_name_verbose_False/00005.png
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/domain_name_verbose_False/00005.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 de9fd7f52..0e380a777 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 637827a11..9b1f6c083 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_wrong_addr/00000.png b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00000.png
index f1b35e477..b22161fe1 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 8b4da43ca..f6dc51332 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 687a019ce..b9c2f916a 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 2ba6d27d5..c19f5135d 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 b1ff1b3ab..2ba6d27d5 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/domain_name_wrong_addr/00005.png b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00005.png
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/domain_name_wrong_addr/00005.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 9c2c87596..a88f277f8 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 222e30039..f687233bd 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 15628d142..73e83df22 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 c2497ee06..079d916ef 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 2ba6d27d5..0288c53c2 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 b1ff1b3ab..2ba6d27d5 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
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_1/00006.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 4dd300cf9..f687233bd 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 bfbf1090d..630f61459 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 013d892f0..7094b8bbd 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_5/00001.png b/tests/ragger/snapshots/stax/erc1155_safeBatchTransferFrom_5/00001.png
index 4dd300cf9..f687233bd 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 4493c03ce..1ac57c49a 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 079d916ef..5f4abe87e 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_safeTransferFrom_1-rejected/00001.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1-rejected/00001.png
index be471333a..f687233bd 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 67388ea42..b586d7af2 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 079d916ef..57ea99a80 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/00001.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_1/00001.png
index be471333a..f687233bd 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 67388ea42..b586d7af2 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 079d916ef..57ea99a80 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_137/00001.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_137/00001.png
index 4dd300cf9..f687233bd 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 aca2b296d..2a6d4646c 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 7094b8bbd..546dcd07c 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_5/00001.png b/tests/ragger/snapshots/stax/erc1155_safeTransferFrom_5/00001.png
index 4dd300cf9..f687233bd 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 b3735685f..f09bb7d1a 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 5f4abe87e..5d6b54774 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_setApprovalForAll_1/00001.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_1/00001.png
index d26b8b577..87ee05b60 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 39ea40ff8..f0a22cbe4 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_137/00000.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00000.png
index 02c71a880..edf970eec 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 fab7beb13..18cdcb54c 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 6bf8e30ec..9a68f57d2 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 683484136..013d892f0 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 2ba6d27d5..8dffb3779 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 b1ff1b3ab..2ba6d27d5 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
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_137/00006.png differ
diff --git a/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00000.png b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00000.png
index 8b5830162..bbb6130d8 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 fab7beb13..18cdcb54c 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 164914dfd..8874aa17f 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 7a02616f5..079d916ef 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 2ba6d27d5..69e740dfd 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 b1ff1b3ab..2ba6d27d5 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
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/erc1155_setApprovalForAll_5/00006.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_approve_1/00000.png b/tests/ragger/snapshots/stax/erc721_approve_1/00000.png
index a760f9d81..99d39777b 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 6ceff71cf..6d3587cfd 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 326765cca..1d378102c 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 2f6a57433..079d916ef 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 2ba6d27d5..38d13259f 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 b1ff1b3ab..2ba6d27d5 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
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/erc721_approve_1/00006.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 cb4fb8e71..6d3587cfd 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 312a8b85c..c75f040bb 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 013d892f0..7094b8bbd 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_5/00001.png b/tests/ragger/snapshots/stax/erc721_approve_5/00001.png
index ad4aaa33b..6d3587cfd 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 a44ea9847..57bff762d 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 079d916ef..5f4abe87e 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_safeTransferFrom_1-rejected/00000.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00000.png
index 920729b5e..b59ebfa38 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 16fb73830..f687233bd 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 326765cca..f9216432c 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 17f3b48a2..079d916ef 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 babad9890..56bea13ae 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 cebc8bede..babad9890 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 b1ff1b3ab..cebc8bede 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
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1-rejected/00007.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00000.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00000.png
index 920729b5e..b59ebfa38 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 16fb73830..f687233bd 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 326765cca..f9216432c 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 17f3b48a2..079d916ef 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 2ba6d27d5..56bea13ae 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 b1ff1b3ab..2ba6d27d5 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
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_1/00006.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 fb0f7bbc3..f687233bd 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 312a8b85c..3944ec8a0 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 013d892f0..7094b8bbd 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_5/00001.png b/tests/ragger/snapshots/stax/erc721_safeTransferFrom_5/00001.png
index c7063c443..f687233bd 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 a44ea9847..61efb0a7a 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 079d916ef..5f4abe87e 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_setApprovalForAll_1/00001.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_1/00001.png
index 1c7c4bb6d..87ee05b60 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 52901c710..12223e260 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_137/00000.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00000.png
index 02c71a880..edf970eec 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 125f695a0..18cdcb54c 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 7d7f7e18b..9f8aa5295 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 683484136..013d892f0 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 2ba6d27d5..8dffb3779 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 b1ff1b3ab..2ba6d27d5 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
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_137/00006.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00000.png b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00000.png
index 8b5830162..bbb6130d8 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 ac60009d1..18cdcb54c 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 8d8ae2e26..6bd5c511f 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 7a02616f5..079d916ef 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 2ba6d27d5..69e740dfd 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 b1ff1b3ab..2ba6d27d5 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
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/erc721_setApprovalForAll_5/00006.png differ
diff --git a/tests/ragger/snapshots/stax/erc721_transferFrom_1/00000.png b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00000.png
index 920729b5e..b59ebfa38 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 16fb73830..f687233bd 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 326765cca..f9216432c 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 17f3b48a2..079d916ef 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 2ba6d27d5..56bea13ae 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 b1ff1b3ab..2ba6d27d5 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
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/erc721_transferFrom_1/00006.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 fb0f7bbc3..f687233bd 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 312a8b85c..3944ec8a0 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 013d892f0..7094b8bbd 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_5/00001.png b/tests/ragger/snapshots/stax/erc721_transferFrom_5/00001.png
index c7063c443..f687233bd 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 a44ea9847..61efb0a7a 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 079d916ef..5f4abe87e 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/test_clone_thundercore/00000.png b/tests/ragger/snapshots/stax/test_clone_thundercore/00000.png
index f1b35e477..b22161fe1 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 5b58c6101..e389448c2 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 687a019ce..931b49d71 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 2ba6d27d5..c19f5135d 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 048cd3a93..2ba6d27d5 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
new file mode 100644
index 000000000..048cd3a93
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_clone_thundercore/00005.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00013.png b/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00013.png
new file mode 100644
index 000000000..1c2d6cd43
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_eip712_address_substitution_verbose/00013.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 7c93eac30..5291d6f31 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 c25fae264..17418065b 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_send_bsc/00001.png b/tests/ragger/snapshots/stax/test_legacy_send_bsc/00001.png
index baa3da77f..5b82eacab 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 6d7d00e9f..93cb4880b 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_sign_blind_and_nonce_display/00001.png b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00001.png
index 9cd93f0d1..a3014b232 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00001.png and b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00002.png b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00002.png
index 637827a11..58a17e242 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00002.png and b/tests/ragger/snapshots/stax/test_sign_blind_and_nonce_display/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00000.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00000.png
index f1b35e477..b22161fe1 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00000.png and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00001.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00001.png
index 0b2974b08..a3014b232 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00001.png and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00002.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00002.png
index 687a019ce..ca944151b 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00002.png and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00003.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00003.png
index 2ba6d27d5..c19f5135d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00003.png and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00004.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00004.png
index b1ff1b3ab..2ba6d27d5 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_blind_simple/00004.png and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_blind_simple/00005.png b/tests/ragger/snapshots/stax/test_sign_blind_simple/00005.png
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_sign_blind_simple/00005.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 a864b2e27..93b8d9bcc 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 7142a7b29..ec3406662 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_limit_nonce/00001.png b/tests/ragger/snapshots/stax/test_sign_limit_nonce/00001.png
index 7963e8c0d..25ae343d4 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 3d10272b6..744144979 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_nonce_display/00001.png b/tests/ragger/snapshots/stax/test_sign_nonce_display/00001.png
index b3afcfdf6..a3014b232 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 637827a11..69f255ab7 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_parameter_selector/step_3/00000.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00000.png
index f1b35e477..b22161fe1 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00000.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00001.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00001.png
index 51bb23267..eff07e35f 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00001.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00002.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00002.png
index 687a019ce..d47d19d2d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00002.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00003.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00003.png
index 2ba6d27d5..c19f5135d 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00003.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00004.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00004.png
index b1ff1b3ab..2ba6d27d5 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00004.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00005.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00005.png
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/step_3/00005.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 f1b35e477..b22161fe1 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 0b2974b08..a3014b232 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 687a019ce..ca944151b 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 babad9890..c19f5135d 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 cebc8bede..babad9890 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 b1ff1b3ab..cebc8bede 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_reject/00006.png b/tests/ragger/snapshots/stax/test_sign_reject/00006.png
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_sign_reject/00006.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 f1b35e477..b22161fe1 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 0b2974b08..a3014b232 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 687a019ce..ca944151b 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 2ba6d27d5..c19f5135d 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 b1ff1b3ab..2ba6d27d5 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/snapshots/stax/test_sign_simple/00005.png b/tests/ragger/snapshots/stax/test_sign_simple/00005.png
new file mode 100644
index 000000000..b1ff1b3ab
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_sign_simple/00005.png differ