diff --git a/app/Makefile.version b/app/Makefile.version
index df8e92cf..d9ead377 100644
--- a/app/Makefile.version
+++ b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=0
 # This is the minor version of this release
 APPVERSION_N=23
 # This is the patch version of this release
-APPVERSION_P=13
+APPVERSION_P=14
diff --git a/tests_zemu/snapshots/s-change_owner/00002.png b/tests_zemu/snapshots/s-change_owner/00002.png
index b585bd5c..9a1d1a9d 100644
Binary files a/tests_zemu/snapshots/s-change_owner/00002.png and b/tests_zemu/snapshots/s-change_owner/00002.png differ
diff --git a/tests_zemu/snapshots/s-change_owner/00003.png b/tests_zemu/snapshots/s-change_owner/00003.png
index ab621fcc..caba8fb6 100644
Binary files a/tests_zemu/snapshots/s-change_owner/00003.png and b/tests_zemu/snapshots/s-change_owner/00003.png differ
diff --git a/tests_zemu/snapshots/s-change_owner/00004.png b/tests_zemu/snapshots/s-change_owner/00004.png
index 317ec93d..d4dc8b70 100644
Binary files a/tests_zemu/snapshots/s-change_owner/00004.png and b/tests_zemu/snapshots/s-change_owner/00004.png differ
diff --git a/tests_zemu/snapshots/s-eth-erc20_transfer/00000.png b/tests_zemu/snapshots/s-eth-erc20_transfer/00000.png
index 2facd160..f5051c60 100644
Binary files a/tests_zemu/snapshots/s-eth-erc20_transfer/00000.png and b/tests_zemu/snapshots/s-eth-erc20_transfer/00000.png differ
diff --git a/tests_zemu/snapshots/s-eth-erc20_transfer/00001.png b/tests_zemu/snapshots/s-eth-erc20_transfer/00001.png
index 5f10dc24..296228de 100644
Binary files a/tests_zemu/snapshots/s-eth-erc20_transfer/00001.png and b/tests_zemu/snapshots/s-eth-erc20_transfer/00001.png differ
diff --git a/tests_zemu/snapshots/s-eth-erc20_transfer/00002.png b/tests_zemu/snapshots/s-eth-erc20_transfer/00002.png
index 854201e2..412b4350 100644
Binary files a/tests_zemu/snapshots/s-eth-erc20_transfer/00002.png and b/tests_zemu/snapshots/s-eth-erc20_transfer/00002.png differ
diff --git a/tests_zemu/snapshots/s-eth-erc20_transfer/00003.png b/tests_zemu/snapshots/s-eth-erc20_transfer/00003.png
index 71512699..c6827d88 100644
Binary files a/tests_zemu/snapshots/s-eth-erc20_transfer/00003.png and b/tests_zemu/snapshots/s-eth-erc20_transfer/00003.png differ
diff --git a/tests_zemu/snapshots/s-eth-erc20_transfer/00004.png b/tests_zemu/snapshots/s-eth-erc20_transfer/00004.png
index 3653c78b..58b5e0c7 100644
Binary files a/tests_zemu/snapshots/s-eth-erc20_transfer/00004.png and b/tests_zemu/snapshots/s-eth-erc20_transfer/00004.png differ
diff --git a/tests_zemu/snapshots/s-eth-erc20_transfer/00005.png b/tests_zemu/snapshots/s-eth-erc20_transfer/00005.png
index cdf8aef9..71512699 100644
Binary files a/tests_zemu/snapshots/s-eth-erc20_transfer/00005.png and b/tests_zemu/snapshots/s-eth-erc20_transfer/00005.png differ
diff --git a/tests_zemu/snapshots/s-eth-erc20_transfer/00006.png b/tests_zemu/snapshots/s-eth-erc20_transfer/00006.png
index 006c26ab..3653c78b 100644
Binary files a/tests_zemu/snapshots/s-eth-erc20_transfer/00006.png and b/tests_zemu/snapshots/s-eth-erc20_transfer/00006.png differ
diff --git a/tests_zemu/snapshots/s-eth-erc20_transfer/00007.png b/tests_zemu/snapshots/s-eth-erc20_transfer/00007.png
index f57d1dce..cdf8aef9 100644
Binary files a/tests_zemu/snapshots/s-eth-erc20_transfer/00007.png and b/tests_zemu/snapshots/s-eth-erc20_transfer/00007.png differ
diff --git a/tests_zemu/snapshots/s-eth-erc20_transfer/00008.png b/tests_zemu/snapshots/s-eth-erc20_transfer/00008.png
new file mode 100644
index 00000000..006c26ab
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-erc20_transfer/00008.png differ
diff --git a/tests_zemu/snapshots/s-eth-erc20_transfer/00009.png b/tests_zemu/snapshots/s-eth-erc20_transfer/00009.png
new file mode 100644
index 00000000..f57d1dce
Binary files /dev/null and b/tests_zemu/snapshots/s-eth-erc20_transfer/00009.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
index fb04a427..3b3f83d6 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and b/tests_zemu/snapshots/s-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
index fb04a427..3b3f83d6 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00010.png and b/tests_zemu/snapshots/s-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_approve/00003.png b/tests_zemu/snapshots/s-sign-multisig_approve/00003.png
index b585bd5c..9a1d1a9d 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_approve/00003.png and b/tests_zemu/snapshots/s-sign-multisig_approve/00003.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_approve/00004.png b/tests_zemu/snapshots/s-sign-multisig_approve/00004.png
index 2654d8a0..09f15416 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_approve/00004.png and b/tests_zemu/snapshots/s-sign-multisig_approve/00004.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_approve/00005.png b/tests_zemu/snapshots/s-sign-multisig_approve/00005.png
index 2fb41a2b..92191fac 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_approve/00005.png and b/tests_zemu/snapshots/s-sign-multisig_approve/00005.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_approve/00006.png b/tests_zemu/snapshots/s-sign-multisig_approve/00006.png
index e65fef61..70976b99 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_approve/00006.png and b/tests_zemu/snapshots/s-sign-multisig_approve/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_cancel/00003.png b/tests_zemu/snapshots/s-sign-multisig_cancel/00003.png
index b585bd5c..9a1d1a9d 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_cancel/00003.png and b/tests_zemu/snapshots/s-sign-multisig_cancel/00003.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_cancel/00004.png b/tests_zemu/snapshots/s-sign-multisig_cancel/00004.png
index 2654d8a0..09f15416 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_cancel/00004.png and b/tests_zemu/snapshots/s-sign-multisig_cancel/00004.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_cancel/00005.png b/tests_zemu/snapshots/s-sign-multisig_cancel/00005.png
index 2fb41a2b..92191fac 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_cancel/00005.png and b/tests_zemu/snapshots/s-sign-multisig_cancel/00005.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_cancel/00006.png b/tests_zemu/snapshots/s-sign-multisig_cancel/00006.png
index e65fef61..70976b99 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_cancel/00006.png and b/tests_zemu/snapshots/s-sign-multisig_cancel/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_create/00003.png b/tests_zemu/snapshots/s-sign-multisig_create/00003.png
index af25dbcd..820e5e5e 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_create/00003.png and b/tests_zemu/snapshots/s-sign-multisig_create/00003.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_create/00004.png b/tests_zemu/snapshots/s-sign-multisig_create/00004.png
index 2654d8a0..09f15416 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_create/00004.png and b/tests_zemu/snapshots/s-sign-multisig_create/00004.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_create/00005.png b/tests_zemu/snapshots/s-sign-multisig_create/00005.png
index 2fb41a2b..92191fac 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_create/00005.png and b/tests_zemu/snapshots/s-sign-multisig_create/00005.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_create/00006.png b/tests_zemu/snapshots/s-sign-multisig_create/00006.png
index e65fef61..70976b99 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_create/00006.png and b/tests_zemu/snapshots/s-sign-multisig_create/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_propose/00003.png b/tests_zemu/snapshots/s-sign-multisig_propose/00003.png
index b585bd5c..9a1d1a9d 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_propose/00003.png and b/tests_zemu/snapshots/s-sign-multisig_propose/00003.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_propose/00004.png b/tests_zemu/snapshots/s-sign-multisig_propose/00004.png
index 2654d8a0..09f15416 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_propose/00004.png and b/tests_zemu/snapshots/s-sign-multisig_propose/00004.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_propose/00005.png b/tests_zemu/snapshots/s-sign-multisig_propose/00005.png
index 2fb41a2b..92191fac 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_propose/00005.png and b/tests_zemu/snapshots/s-sign-multisig_propose/00005.png differ
diff --git a/tests_zemu/snapshots/s-sign-multisig_propose/00006.png b/tests_zemu/snapshots/s-sign-multisig_propose/00006.png
index e65fef61..70976b99 100644
Binary files a/tests_zemu/snapshots/s-sign-multisig_propose/00006.png and b/tests_zemu/snapshots/s-sign-multisig_propose/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00006.png b/tests_zemu/snapshots/s-sign_basic/00006.png
index 6c785ae1..9628c7d5 100644
Binary files a/tests_zemu/snapshots/s-sign_basic/00006.png and b/tests_zemu/snapshots/s-sign_basic/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00007.png b/tests_zemu/snapshots/s-sign_basic/00007.png
index d0bf666d..4804273c 100644
Binary files a/tests_zemu/snapshots/s-sign_basic/00007.png and b/tests_zemu/snapshots/s-sign_basic/00007.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00008.png b/tests_zemu/snapshots/s-sign_basic/00008.png
index 2fb41a2b..92191fac 100644
Binary files a/tests_zemu/snapshots/s-sign_basic/00008.png and b/tests_zemu/snapshots/s-sign_basic/00008.png differ
diff --git a/tests_zemu/snapshots/s-sign_client_deal/00010.png b/tests_zemu/snapshots/s-sign_client_deal/00010.png
index f51b5071..e0c67293 100644
Binary files a/tests_zemu/snapshots/s-sign_client_deal/00010.png and b/tests_zemu/snapshots/s-sign_client_deal/00010.png differ
diff --git a/tests_zemu/snapshots/s-sign_client_deal/00011.png b/tests_zemu/snapshots/s-sign_client_deal/00011.png
index 398fea99..7650680e 100644
Binary files a/tests_zemu/snapshots/s-sign_client_deal/00011.png and b/tests_zemu/snapshots/s-sign_client_deal/00011.png differ
diff --git a/tests_zemu/snapshots/s-sign_erc20_transfer/00000.png b/tests_zemu/snapshots/s-sign_erc20_transfer/00000.png
new file mode 100644
index 00000000..af40f055
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_erc20_transfer/00000.png differ
diff --git a/tests_zemu/snapshots/s-sign_erc20_transfer/00001.png b/tests_zemu/snapshots/s-sign_erc20_transfer/00001.png
new file mode 100644
index 00000000..5c924346
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_erc20_transfer/00001.png differ
diff --git a/tests_zemu/snapshots/s-sign_erc20_transfer/00002.png b/tests_zemu/snapshots/s-sign_erc20_transfer/00002.png
new file mode 100644
index 00000000..28b4b5c3
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_erc20_transfer/00002.png differ
diff --git a/tests_zemu/snapshots/s-sign_erc20_transfer/00003.png b/tests_zemu/snapshots/s-sign_erc20_transfer/00003.png
new file mode 100644
index 00000000..6fd92c76
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_erc20_transfer/00003.png differ
diff --git a/tests_zemu/snapshots/s-sign_erc20_transfer/00004.png b/tests_zemu/snapshots/s-sign_erc20_transfer/00004.png
new file mode 100644
index 00000000..58da7723
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_erc20_transfer/00004.png differ
diff --git a/tests_zemu/snapshots/s-sign_erc20_transfer/00005.png b/tests_zemu/snapshots/s-sign_erc20_transfer/00005.png
new file mode 100644
index 00000000..006c26ab
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_erc20_transfer/00005.png differ
diff --git a/tests_zemu/snapshots/s-sign_erc20_transfer/00006.png b/tests_zemu/snapshots/s-sign_erc20_transfer/00006.png
new file mode 100644
index 00000000..f57d1dce
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_erc20_transfer/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00003.png b/tests_zemu/snapshots/s-sign_proposal_expert/00003.png
index b585bd5c..9a1d1a9d 100644
Binary files a/tests_zemu/snapshots/s-sign_proposal_expert/00003.png and b/tests_zemu/snapshots/s-sign_proposal_expert/00003.png differ
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00005.png b/tests_zemu/snapshots/s-sign_proposal_expert/00005.png
index 2fb41a2b..92191fac 100644
Binary files a/tests_zemu/snapshots/s-sign_proposal_expert/00005.png and b/tests_zemu/snapshots/s-sign_proposal_expert/00005.png differ
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00006.png b/tests_zemu/snapshots/s-sign_proposal_expert/00006.png
index e65fef61..70976b99 100644
Binary files a/tests_zemu/snapshots/s-sign_proposal_expert/00006.png and b/tests_zemu/snapshots/s-sign_proposal_expert/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign_remove_datacap/00002.png b/tests_zemu/snapshots/s-sign_remove_datacap/00002.png
index aa1e0f21..fef0db60 100644
Binary files a/tests_zemu/snapshots/s-sign_remove_datacap/00002.png and b/tests_zemu/snapshots/s-sign_remove_datacap/00002.png differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_protocol4/00008.png b/tests_zemu/snapshots/s-sign_transfer_protocol4/00008.png
index 6c785ae1..9628c7d5 100644
Binary files a/tests_zemu/snapshots/s-sign_transfer_protocol4/00008.png and b/tests_zemu/snapshots/s-sign_transfer_protocol4/00008.png differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_protocol4/00009.png b/tests_zemu/snapshots/s-sign_transfer_protocol4/00009.png
index d0bf666d..4804273c 100644
Binary files a/tests_zemu/snapshots/s-sign_transfer_protocol4/00009.png and b/tests_zemu/snapshots/s-sign_transfer_protocol4/00009.png differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_protocol4/00010.png b/tests_zemu/snapshots/s-sign_transfer_protocol4/00010.png
index a7e1ae71..98df34ed 100644
Binary files a/tests_zemu/snapshots/s-sign_transfer_protocol4/00010.png and b/tests_zemu/snapshots/s-sign_transfer_protocol4/00010.png differ
diff --git a/tests_zemu/snapshots/sp-change_owner/00001.png b/tests_zemu/snapshots/sp-change_owner/00001.png
index 5af16004..da634b22 100644
Binary files a/tests_zemu/snapshots/sp-change_owner/00001.png and b/tests_zemu/snapshots/sp-change_owner/00001.png differ
diff --git a/tests_zemu/snapshots/sp-change_owner/00003.png b/tests_zemu/snapshots/sp-change_owner/00003.png
index aad3faa3..7dddb729 100644
Binary files a/tests_zemu/snapshots/sp-change_owner/00003.png and b/tests_zemu/snapshots/sp-change_owner/00003.png differ
diff --git a/tests_zemu/snapshots/sp-change_owner/00004.png b/tests_zemu/snapshots/sp-change_owner/00004.png
index 7e5917e6..5b25cd99 100644
Binary files a/tests_zemu/snapshots/sp-change_owner/00004.png and b/tests_zemu/snapshots/sp-change_owner/00004.png differ
diff --git a/tests_zemu/snapshots/sp-change_owner/00005.png b/tests_zemu/snapshots/sp-change_owner/00005.png
index 44af7507..d33dce53 100644
Binary files a/tests_zemu/snapshots/sp-change_owner/00005.png and b/tests_zemu/snapshots/sp-change_owner/00005.png differ
diff --git a/tests_zemu/snapshots/sp-change_owner/00007.png b/tests_zemu/snapshots/sp-change_owner/00007.png
index f264e105..d549121f 100644
Binary files a/tests_zemu/snapshots/sp-change_owner/00007.png and b/tests_zemu/snapshots/sp-change_owner/00007.png differ
diff --git a/tests_zemu/snapshots/sp-eth-asset_deposit/00001.png b/tests_zemu/snapshots/sp-eth-asset_deposit/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-asset_deposit/00001.png and b/tests_zemu/snapshots/sp-eth-asset_deposit/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-asset_deposit/00002.png b/tests_zemu/snapshots/sp-eth-asset_deposit/00002.png
index 60d36cbb..10b70224 100644
Binary files a/tests_zemu/snapshots/sp-eth-asset_deposit/00002.png and b/tests_zemu/snapshots/sp-eth-asset_deposit/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-asset_deposit/00003.png b/tests_zemu/snapshots/sp-eth-asset_deposit/00003.png
index 5974ce44..7a6d594a 100644
Binary files a/tests_zemu/snapshots/sp-eth-asset_deposit/00003.png and b/tests_zemu/snapshots/sp-eth-asset_deposit/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-asset_transfer/00001.png b/tests_zemu/snapshots/sp-eth-asset_transfer/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-asset_transfer/00001.png and b/tests_zemu/snapshots/sp-eth-asset_transfer/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-asset_transfer/00002.png b/tests_zemu/snapshots/sp-eth-asset_transfer/00002.png
index 60d36cbb..10b70224 100644
Binary files a/tests_zemu/snapshots/sp-eth-asset_transfer/00002.png and b/tests_zemu/snapshots/sp-eth-asset_transfer/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-asset_transfer/00003.png b/tests_zemu/snapshots/sp-eth-asset_transfer/00003.png
index 5974ce44..7a6d594a 100644
Binary files a/tests_zemu/snapshots/sp-eth-asset_transfer/00003.png and b/tests_zemu/snapshots/sp-eth-asset_transfer/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-basic_transfer/00001.png b/tests_zemu/snapshots/sp-eth-basic_transfer/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-basic_transfer/00001.png and b/tests_zemu/snapshots/sp-eth-basic_transfer/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-basic_transfer/00002.png b/tests_zemu/snapshots/sp-eth-basic_transfer/00002.png
index 16446d23..80bb220f 100644
Binary files a/tests_zemu/snapshots/sp-eth-basic_transfer/00002.png and b/tests_zemu/snapshots/sp-eth-basic_transfer/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-basic_transfer/00003.png b/tests_zemu/snapshots/sp-eth-basic_transfer/00003.png
index 5770195a..ee914724 100644
Binary files a/tests_zemu/snapshots/sp-eth-basic_transfer/00003.png and b/tests_zemu/snapshots/sp-eth-basic_transfer/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00001.png b/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00001.png and b/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00002.png b/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00002.png
index e065addb..cbcdbfed 100644
Binary files a/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00002.png and b/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00003.png b/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00003.png
index 97799a52..6aba0ed8 100644
Binary files a/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00003.png and b/tests_zemu/snapshots/sp-eth-basic_transfer_no_eip155/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00001.png b/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00001.png and b/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00002.png b/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00002.png
index 1cae0f48..fff17856 100644
Binary files a/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00002.png and b/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00003.png b/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00003.png
index 504d6443..1e2c4f2d 100644
Binary files a/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00003.png and b/tests_zemu/snapshots/sp-eth-contract_deploy_no_eip155/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc20_transfer/00001.png b/tests_zemu/snapshots/sp-eth-erc20_transfer/00001.png
index c21618bd..b44a5188 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc20_transfer/00001.png and b/tests_zemu/snapshots/sp-eth-erc20_transfer/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc20_transfer/00002.png b/tests_zemu/snapshots/sp-eth-erc20_transfer/00002.png
index f92f306d..a2db8fa4 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc20_transfer/00002.png and b/tests_zemu/snapshots/sp-eth-erc20_transfer/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc20_transfer/00003.png b/tests_zemu/snapshots/sp-eth-erc20_transfer/00003.png
index b146df2f..2f67f3b0 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc20_transfer/00003.png and b/tests_zemu/snapshots/sp-eth-erc20_transfer/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc20_transfer/00004.png b/tests_zemu/snapshots/sp-eth-erc20_transfer/00004.png
index 2348ba0c..b146df2f 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc20_transfer/00004.png and b/tests_zemu/snapshots/sp-eth-erc20_transfer/00004.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc20_transfer/00005.png b/tests_zemu/snapshots/sp-eth-erc20_transfer/00005.png
index 05e0b94d..e25bff14 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc20_transfer/00005.png and b/tests_zemu/snapshots/sp-eth-erc20_transfer/00005.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc20_transfer/00006.png b/tests_zemu/snapshots/sp-eth-erc20_transfer/00006.png
index 1e4be699..fd51cc13 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc20_transfer/00006.png and b/tests_zemu/snapshots/sp-eth-erc20_transfer/00006.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc20_transfer/00007.png b/tests_zemu/snapshots/sp-eth-erc20_transfer/00007.png
index c88c5d4e..1e4be699 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc20_transfer/00007.png and b/tests_zemu/snapshots/sp-eth-erc20_transfer/00007.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc20_transfer/00008.png b/tests_zemu/snapshots/sp-eth-erc20_transfer/00008.png
new file mode 100644
index 00000000..c88c5d4e
Binary files /dev/null and b/tests_zemu/snapshots/sp-eth-erc20_transfer/00008.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00001.png b/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00001.png and b/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00002.png b/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00002.png
index e9563d05..7ca7638b 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00002.png and b/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00003.png b/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00003.png
index 0189e523..ce7f330d 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00003.png and b/tests_zemu/snapshots/sp-eth-erc721_approve_for_all/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00001.png b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00001.png and b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00002.png b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00002.png
index dcf57d01..67dfbfc3 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00002.png and b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00003.png b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00003.png
index e9b74f02..f5be9b78 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00003.png and b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00001.png b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00001.png and b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00002.png b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00002.png
index ed60b84c..b67aa9e6 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00002.png and b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00003.png b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00003.png
index 71bc1494..49d0021e 100644
Binary files a/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00003.png and b/tests_zemu/snapshots/sp-eth-erc721_safe_transfer_from_data/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-legacy_contract_call/00001.png b/tests_zemu/snapshots/sp-eth-legacy_contract_call/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-legacy_contract_call/00001.png and b/tests_zemu/snapshots/sp-eth-legacy_contract_call/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-legacy_contract_call/00002.png b/tests_zemu/snapshots/sp-eth-legacy_contract_call/00002.png
index 7aae1149..83e35a09 100644
Binary files a/tests_zemu/snapshots/sp-eth-legacy_contract_call/00002.png and b/tests_zemu/snapshots/sp-eth-legacy_contract_call/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-legacy_contract_call/00003.png b/tests_zemu/snapshots/sp-eth-legacy_contract_call/00003.png
index c57de74b..b6f43fc1 100644
Binary files a/tests_zemu/snapshots/sp-eth-legacy_contract_call/00003.png and b/tests_zemu/snapshots/sp-eth-legacy_contract_call/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00001.png b/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00001.png and b/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00002.png b/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00002.png
index 0ba1277f..2da77cfb 100644
Binary files a/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00002.png and b/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00003.png b/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00003.png
index 400cf6e4..bc3ee727 100644
Binary files a/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00003.png and b/tests_zemu/snapshots/sp-eth-legacy_contract_deploy/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-legacy_transfer/00001.png b/tests_zemu/snapshots/sp-eth-legacy_transfer/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-legacy_transfer/00001.png and b/tests_zemu/snapshots/sp-eth-legacy_transfer/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-legacy_transfer/00002.png b/tests_zemu/snapshots/sp-eth-legacy_transfer/00002.png
index 84f2b87d..aab46916 100644
Binary files a/tests_zemu/snapshots/sp-eth-legacy_transfer/00002.png and b/tests_zemu/snapshots/sp-eth-legacy_transfer/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-legacy_transfer/00003.png b/tests_zemu/snapshots/sp-eth-legacy_transfer/00003.png
index fa4ea5ac..4f33ff6f 100644
Binary files a/tests_zemu/snapshots/sp-eth-legacy_transfer/00003.png and b/tests_zemu/snapshots/sp-eth-legacy_transfer/00003.png differ
diff --git a/tests_zemu/snapshots/sp-eth-transfer/00001.png b/tests_zemu/snapshots/sp-eth-transfer/00001.png
index e642da4f..3abb5235 100644
Binary files a/tests_zemu/snapshots/sp-eth-transfer/00001.png and b/tests_zemu/snapshots/sp-eth-transfer/00001.png differ
diff --git a/tests_zemu/snapshots/sp-eth-transfer/00002.png b/tests_zemu/snapshots/sp-eth-transfer/00002.png
index 0c60a4e0..58c2f0ba 100644
Binary files a/tests_zemu/snapshots/sp-eth-transfer/00002.png and b/tests_zemu/snapshots/sp-eth-transfer/00002.png differ
diff --git a/tests_zemu/snapshots/sp-eth-transfer/00003.png b/tests_zemu/snapshots/sp-eth-transfer/00003.png
index a68dc30a..64196352 100644
Binary files a/tests_zemu/snapshots/sp-eth-transfer/00003.png and b/tests_zemu/snapshots/sp-eth-transfer/00003.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00001.png b/tests_zemu/snapshots/sp-mainmenu/00001.png
index e10e0049..8472e5d9 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00001.png and b/tests_zemu/snapshots/sp-mainmenu/00001.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00002.png b/tests_zemu/snapshots/sp-mainmenu/00002.png
index 7e236da6..f7921677 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00002.png and b/tests_zemu/snapshots/sp-mainmenu/00002.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00003.png b/tests_zemu/snapshots/sp-mainmenu/00003.png
index e10e0049..8472e5d9 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00003.png and b/tests_zemu/snapshots/sp-mainmenu/00003.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
index b9db8c5b..5b6d2589 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00004.png and b/tests_zemu/snapshots/sp-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
index b9db8c5b..5b6d2589 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00010.png and b/tests_zemu/snapshots/sp-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00011.png b/tests_zemu/snapshots/sp-mainmenu/00011.png
index e10e0049..8472e5d9 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00011.png and b/tests_zemu/snapshots/sp-mainmenu/00011.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_approve/00001.png b/tests_zemu/snapshots/sp-sign-multisig_approve/00001.png
index 1e829bb7..4716ba41 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_approve/00001.png and b/tests_zemu/snapshots/sp-sign-multisig_approve/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_approve/00003.png b/tests_zemu/snapshots/sp-sign-multisig_approve/00003.png
index aad3faa3..7dddb729 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_approve/00003.png and b/tests_zemu/snapshots/sp-sign-multisig_approve/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_approve/00004.png b/tests_zemu/snapshots/sp-sign-multisig_approve/00004.png
index c5bc67b9..b25bdd3a 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_approve/00004.png and b/tests_zemu/snapshots/sp-sign-multisig_approve/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_approve/00005.png b/tests_zemu/snapshots/sp-sign-multisig_approve/00005.png
index 54f9b816..3303dd7a 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_approve/00005.png and b/tests_zemu/snapshots/sp-sign-multisig_approve/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_approve/00006.png b/tests_zemu/snapshots/sp-sign-multisig_approve/00006.png
index 3f980851..55eab389 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_approve/00006.png and b/tests_zemu/snapshots/sp-sign-multisig_approve/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_approve/00009.png b/tests_zemu/snapshots/sp-sign-multisig_approve/00009.png
index 4076ba4f..f1676e54 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_approve/00009.png and b/tests_zemu/snapshots/sp-sign-multisig_approve/00009.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_approve/00010.png b/tests_zemu/snapshots/sp-sign-multisig_approve/00010.png
index a85c2f13..44c2cdee 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_approve/00010.png and b/tests_zemu/snapshots/sp-sign-multisig_approve/00010.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_approve/00011.png b/tests_zemu/snapshots/sp-sign-multisig_approve/00011.png
index 08fe4344..aa2cf4b1 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_approve/00011.png and b/tests_zemu/snapshots/sp-sign-multisig_approve/00011.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_cancel/00001.png b/tests_zemu/snapshots/sp-sign-multisig_cancel/00001.png
index 1e829bb7..4716ba41 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_cancel/00001.png and b/tests_zemu/snapshots/sp-sign-multisig_cancel/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_cancel/00003.png b/tests_zemu/snapshots/sp-sign-multisig_cancel/00003.png
index aad3faa3..7dddb729 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_cancel/00003.png and b/tests_zemu/snapshots/sp-sign-multisig_cancel/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_cancel/00004.png b/tests_zemu/snapshots/sp-sign-multisig_cancel/00004.png
index c5bc67b9..b25bdd3a 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_cancel/00004.png and b/tests_zemu/snapshots/sp-sign-multisig_cancel/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_cancel/00005.png b/tests_zemu/snapshots/sp-sign-multisig_cancel/00005.png
index 54f9b816..3303dd7a 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_cancel/00005.png and b/tests_zemu/snapshots/sp-sign-multisig_cancel/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_cancel/00006.png b/tests_zemu/snapshots/sp-sign-multisig_cancel/00006.png
index 3f980851..55eab389 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_cancel/00006.png and b/tests_zemu/snapshots/sp-sign-multisig_cancel/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_cancel/00009.png b/tests_zemu/snapshots/sp-sign-multisig_cancel/00009.png
index 4076ba4f..f1676e54 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_cancel/00009.png and b/tests_zemu/snapshots/sp-sign-multisig_cancel/00009.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_cancel/00010.png b/tests_zemu/snapshots/sp-sign-multisig_cancel/00010.png
index a85c2f13..44c2cdee 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_cancel/00010.png and b/tests_zemu/snapshots/sp-sign-multisig_cancel/00010.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_cancel/00011.png b/tests_zemu/snapshots/sp-sign-multisig_cancel/00011.png
index 08fe4344..aa2cf4b1 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_cancel/00011.png and b/tests_zemu/snapshots/sp-sign-multisig_cancel/00011.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_create/00001.png b/tests_zemu/snapshots/sp-sign-multisig_create/00001.png
index 511b11cd..b70aa8b3 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_create/00001.png and b/tests_zemu/snapshots/sp-sign-multisig_create/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_create/00003.png b/tests_zemu/snapshots/sp-sign-multisig_create/00003.png
index 22a629d4..80e7d5ef 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_create/00003.png and b/tests_zemu/snapshots/sp-sign-multisig_create/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_create/00004.png b/tests_zemu/snapshots/sp-sign-multisig_create/00004.png
index c5bc67b9..b25bdd3a 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_create/00004.png and b/tests_zemu/snapshots/sp-sign-multisig_create/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_create/00005.png b/tests_zemu/snapshots/sp-sign-multisig_create/00005.png
index 54f9b816..3303dd7a 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_create/00005.png and b/tests_zemu/snapshots/sp-sign-multisig_create/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_create/00006.png b/tests_zemu/snapshots/sp-sign-multisig_create/00006.png
index 3f980851..55eab389 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_create/00006.png and b/tests_zemu/snapshots/sp-sign-multisig_create/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_create/00009.png b/tests_zemu/snapshots/sp-sign-multisig_create/00009.png
index 9c4a19bb..6ebdab92 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_create/00009.png and b/tests_zemu/snapshots/sp-sign-multisig_create/00009.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_create/00010.png b/tests_zemu/snapshots/sp-sign-multisig_create/00010.png
index b470e174..670aa72d 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_create/00010.png and b/tests_zemu/snapshots/sp-sign-multisig_create/00010.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_create/00011.png b/tests_zemu/snapshots/sp-sign-multisig_create/00011.png
index aa4d6c89..6a3e5593 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_create/00011.png and b/tests_zemu/snapshots/sp-sign-multisig_create/00011.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_create/00012.png b/tests_zemu/snapshots/sp-sign-multisig_create/00012.png
index fb8cb6d2..45e1a7c2 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_create/00012.png and b/tests_zemu/snapshots/sp-sign-multisig_create/00012.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_propose/00001.png b/tests_zemu/snapshots/sp-sign-multisig_propose/00001.png
index 1e829bb7..4716ba41 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_propose/00001.png and b/tests_zemu/snapshots/sp-sign-multisig_propose/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_propose/00003.png b/tests_zemu/snapshots/sp-sign-multisig_propose/00003.png
index aad3faa3..7dddb729 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_propose/00003.png and b/tests_zemu/snapshots/sp-sign-multisig_propose/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_propose/00004.png b/tests_zemu/snapshots/sp-sign-multisig_propose/00004.png
index c5bc67b9..b25bdd3a 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_propose/00004.png and b/tests_zemu/snapshots/sp-sign-multisig_propose/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_propose/00005.png b/tests_zemu/snapshots/sp-sign-multisig_propose/00005.png
index 54f9b816..3303dd7a 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_propose/00005.png and b/tests_zemu/snapshots/sp-sign-multisig_propose/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_propose/00006.png b/tests_zemu/snapshots/sp-sign-multisig_propose/00006.png
index 3f980851..55eab389 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_propose/00006.png and b/tests_zemu/snapshots/sp-sign-multisig_propose/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_propose/00009.png b/tests_zemu/snapshots/sp-sign-multisig_propose/00009.png
index 95475f62..385365e8 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_propose/00009.png and b/tests_zemu/snapshots/sp-sign-multisig_propose/00009.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_propose/00010.png b/tests_zemu/snapshots/sp-sign-multisig_propose/00010.png
index 60948386..6dd015eb 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_propose/00010.png and b/tests_zemu/snapshots/sp-sign-multisig_propose/00010.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_propose/00011.png b/tests_zemu/snapshots/sp-sign-multisig_propose/00011.png
index d72713ee..a29ef1fb 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_propose/00011.png and b/tests_zemu/snapshots/sp-sign-multisig_propose/00011.png differ
diff --git a/tests_zemu/snapshots/sp-sign-multisig_propose/00012.png b/tests_zemu/snapshots/sp-sign-multisig_propose/00012.png
index d2f16900..4bd91521 100644
Binary files a/tests_zemu/snapshots/sp-sign-multisig_propose/00012.png and b/tests_zemu/snapshots/sp-sign-multisig_propose/00012.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00001.png b/tests_zemu/snapshots/sp-sign_basic/00001.png
index 471c7abf..cabcc2f3 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00001.png and b/tests_zemu/snapshots/sp-sign_basic/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00002.png b/tests_zemu/snapshots/sp-sign_basic/00002.png
index 78849b3d..2c5de65c 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00002.png and b/tests_zemu/snapshots/sp-sign_basic/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00003.png b/tests_zemu/snapshots/sp-sign_basic/00003.png
index 08fd7a7d..0afcbf38 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00003.png and b/tests_zemu/snapshots/sp-sign_basic/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00004.png b/tests_zemu/snapshots/sp-sign_basic/00004.png
index 2a14ee4d..9fa556c7 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00004.png and b/tests_zemu/snapshots/sp-sign_basic/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00005.png b/tests_zemu/snapshots/sp-sign_basic/00005.png
index e0a58960..aa2d6a3f 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00005.png and b/tests_zemu/snapshots/sp-sign_basic/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00006.png b/tests_zemu/snapshots/sp-sign_basic/00006.png
index d9c4d77d..2aa4a12b 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00006.png and b/tests_zemu/snapshots/sp-sign_basic/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00007.png b/tests_zemu/snapshots/sp-sign_basic/00007.png
index 54f9b816..3303dd7a 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00007.png and b/tests_zemu/snapshots/sp-sign_basic/00007.png differ
diff --git a/tests_zemu/snapshots/sp-sign_client_deal/00001.png b/tests_zemu/snapshots/sp-sign_client_deal/00001.png
index 469caa4a..a40ce79c 100644
Binary files a/tests_zemu/snapshots/sp-sign_client_deal/00001.png and b/tests_zemu/snapshots/sp-sign_client_deal/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign_client_deal/00003.png b/tests_zemu/snapshots/sp-sign_client_deal/00003.png
index e0293061..21161a88 100644
Binary files a/tests_zemu/snapshots/sp-sign_client_deal/00003.png and b/tests_zemu/snapshots/sp-sign_client_deal/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign_client_deal/00004.png b/tests_zemu/snapshots/sp-sign_client_deal/00004.png
index 31f39a03..2590bd63 100644
Binary files a/tests_zemu/snapshots/sp-sign_client_deal/00004.png and b/tests_zemu/snapshots/sp-sign_client_deal/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign_client_deal/00005.png b/tests_zemu/snapshots/sp-sign_client_deal/00005.png
index d432479c..850d0c73 100644
Binary files a/tests_zemu/snapshots/sp-sign_client_deal/00005.png and b/tests_zemu/snapshots/sp-sign_client_deal/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign_client_deal/00006.png b/tests_zemu/snapshots/sp-sign_client_deal/00006.png
index bbfe060e..371c7090 100644
Binary files a/tests_zemu/snapshots/sp-sign_client_deal/00006.png and b/tests_zemu/snapshots/sp-sign_client_deal/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign_client_deal/00007.png b/tests_zemu/snapshots/sp-sign_client_deal/00007.png
index 72e8c5e6..ddfae310 100644
Binary files a/tests_zemu/snapshots/sp-sign_client_deal/00007.png and b/tests_zemu/snapshots/sp-sign_client_deal/00007.png differ
diff --git a/tests_zemu/snapshots/sp-sign_client_deal/00009.png b/tests_zemu/snapshots/sp-sign_client_deal/00009.png
index 3a3b3e42..c9e5cbc1 100644
Binary files a/tests_zemu/snapshots/sp-sign_client_deal/00009.png and b/tests_zemu/snapshots/sp-sign_client_deal/00009.png differ
diff --git a/tests_zemu/snapshots/sp-sign_client_deal/00010.png b/tests_zemu/snapshots/sp-sign_client_deal/00010.png
index 0da777ae..3d45cdc4 100644
Binary files a/tests_zemu/snapshots/sp-sign_client_deal/00010.png and b/tests_zemu/snapshots/sp-sign_client_deal/00010.png differ
diff --git a/tests_zemu/snapshots/sp-sign_erc20_transfer/00000.png b/tests_zemu/snapshots/sp-sign_erc20_transfer/00000.png
new file mode 100644
index 00000000..6c93916b
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_erc20_transfer/00000.png differ
diff --git a/tests_zemu/snapshots/sp-sign_erc20_transfer/00001.png b/tests_zemu/snapshots/sp-sign_erc20_transfer/00001.png
new file mode 100644
index 00000000..ff1cd05f
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_erc20_transfer/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign_erc20_transfer/00002.png b/tests_zemu/snapshots/sp-sign_erc20_transfer/00002.png
new file mode 100644
index 00000000..bc1ae7d4
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_erc20_transfer/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign_erc20_transfer/00003.png b/tests_zemu/snapshots/sp-sign_erc20_transfer/00003.png
new file mode 100644
index 00000000..5ba51ecd
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_erc20_transfer/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign_erc20_transfer/00004.png b/tests_zemu/snapshots/sp-sign_erc20_transfer/00004.png
new file mode 100644
index 00000000..b4219c0b
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_erc20_transfer/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign_erc20_transfer/00005.png b/tests_zemu/snapshots/sp-sign_erc20_transfer/00005.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_erc20_transfer/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign_erc20_transfer/00006.png b/tests_zemu/snapshots/sp-sign_erc20_transfer/00006.png
new file mode 100644
index 00000000..c88c5d4e
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_erc20_transfer/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign_proposal_expert/00001.png b/tests_zemu/snapshots/sp-sign_proposal_expert/00001.png
index eaf571c7..fdcf340a 100644
Binary files a/tests_zemu/snapshots/sp-sign_proposal_expert/00001.png and b/tests_zemu/snapshots/sp-sign_proposal_expert/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign_proposal_expert/00002.png b/tests_zemu/snapshots/sp-sign_proposal_expert/00002.png
index fa408714..d6008b99 100644
Binary files a/tests_zemu/snapshots/sp-sign_proposal_expert/00002.png and b/tests_zemu/snapshots/sp-sign_proposal_expert/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign_proposal_expert/00003.png b/tests_zemu/snapshots/sp-sign_proposal_expert/00003.png
index aad3faa3..7dddb729 100644
Binary files a/tests_zemu/snapshots/sp-sign_proposal_expert/00003.png and b/tests_zemu/snapshots/sp-sign_proposal_expert/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign_proposal_expert/00004.png b/tests_zemu/snapshots/sp-sign_proposal_expert/00004.png
index c5bc67b9..b25bdd3a 100644
Binary files a/tests_zemu/snapshots/sp-sign_proposal_expert/00004.png and b/tests_zemu/snapshots/sp-sign_proposal_expert/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign_proposal_expert/00005.png b/tests_zemu/snapshots/sp-sign_proposal_expert/00005.png
index 54f9b816..3303dd7a 100644
Binary files a/tests_zemu/snapshots/sp-sign_proposal_expert/00005.png and b/tests_zemu/snapshots/sp-sign_proposal_expert/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign_proposal_expert/00006.png b/tests_zemu/snapshots/sp-sign_proposal_expert/00006.png
index 3f980851..55eab389 100644
Binary files a/tests_zemu/snapshots/sp-sign_proposal_expert/00006.png and b/tests_zemu/snapshots/sp-sign_proposal_expert/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign_proposal_expert/00009.png b/tests_zemu/snapshots/sp-sign_proposal_expert/00009.png
index 95475f62..385365e8 100644
Binary files a/tests_zemu/snapshots/sp-sign_proposal_expert/00009.png and b/tests_zemu/snapshots/sp-sign_proposal_expert/00009.png differ
diff --git a/tests_zemu/snapshots/sp-sign_proposal_expert/00010.png b/tests_zemu/snapshots/sp-sign_proposal_expert/00010.png
index 60948386..6dd015eb 100644
Binary files a/tests_zemu/snapshots/sp-sign_proposal_expert/00010.png and b/tests_zemu/snapshots/sp-sign_proposal_expert/00010.png differ
diff --git a/tests_zemu/snapshots/sp-sign_proposal_expert/00011.png b/tests_zemu/snapshots/sp-sign_proposal_expert/00011.png
index d72713ee..a29ef1fb 100644
Binary files a/tests_zemu/snapshots/sp-sign_proposal_expert/00011.png and b/tests_zemu/snapshots/sp-sign_proposal_expert/00011.png differ
diff --git a/tests_zemu/snapshots/sp-sign_proposal_expert/00012.png b/tests_zemu/snapshots/sp-sign_proposal_expert/00012.png
index d2f16900..4bd91521 100644
Binary files a/tests_zemu/snapshots/sp-sign_proposal_expert/00012.png and b/tests_zemu/snapshots/sp-sign_proposal_expert/00012.png differ
diff --git a/tests_zemu/snapshots/sp-sign_raw_bytes/00001.png b/tests_zemu/snapshots/sp-sign_raw_bytes/00001.png
index d4db92b8..ef1ec7d6 100644
Binary files a/tests_zemu/snapshots/sp-sign_raw_bytes/00001.png and b/tests_zemu/snapshots/sp-sign_raw_bytes/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign_raw_bytes/00002.png b/tests_zemu/snapshots/sp-sign_raw_bytes/00002.png
index 03e1b64f..795ea870 100644
Binary files a/tests_zemu/snapshots/sp-sign_raw_bytes/00002.png and b/tests_zemu/snapshots/sp-sign_raw_bytes/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign_raw_bytes/00003.png b/tests_zemu/snapshots/sp-sign_raw_bytes/00003.png
index bbf2dd94..6e186dee 100644
Binary files a/tests_zemu/snapshots/sp-sign_raw_bytes/00003.png and b/tests_zemu/snapshots/sp-sign_raw_bytes/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign_remove_datacap/00002.png b/tests_zemu/snapshots/sp-sign_remove_datacap/00002.png
index e9585bc0..a6905c55 100644
Binary files a/tests_zemu/snapshots/sp-sign_remove_datacap/00002.png and b/tests_zemu/snapshots/sp-sign_remove_datacap/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign_remove_datacap/00003.png b/tests_zemu/snapshots/sp-sign_remove_datacap/00003.png
index 74472428..21992912 100644
Binary files a/tests_zemu/snapshots/sp-sign_remove_datacap/00003.png and b/tests_zemu/snapshots/sp-sign_remove_datacap/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_protocol4/00001.png b/tests_zemu/snapshots/sp-sign_transfer_protocol4/00001.png
index a82bdac1..2bcd23fc 100644
Binary files a/tests_zemu/snapshots/sp-sign_transfer_protocol4/00001.png and b/tests_zemu/snapshots/sp-sign_transfer_protocol4/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_protocol4/00002.png b/tests_zemu/snapshots/sp-sign_transfer_protocol4/00002.png
index 192cd210..ceef5e20 100644
Binary files a/tests_zemu/snapshots/sp-sign_transfer_protocol4/00002.png and b/tests_zemu/snapshots/sp-sign_transfer_protocol4/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_protocol4/00005.png b/tests_zemu/snapshots/sp-sign_transfer_protocol4/00005.png
index e0a58960..aa2d6a3f 100644
Binary files a/tests_zemu/snapshots/sp-sign_transfer_protocol4/00005.png and b/tests_zemu/snapshots/sp-sign_transfer_protocol4/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_protocol4/00006.png b/tests_zemu/snapshots/sp-sign_transfer_protocol4/00006.png
index d9c4d77d..2aa4a12b 100644
Binary files a/tests_zemu/snapshots/sp-sign_transfer_protocol4/00006.png and b/tests_zemu/snapshots/sp-sign_transfer_protocol4/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_protocol4/00007.png b/tests_zemu/snapshots/sp-sign_transfer_protocol4/00007.png
index dbbdd32e..13b15e48 100644
Binary files a/tests_zemu/snapshots/sp-sign_transfer_protocol4/00007.png and b/tests_zemu/snapshots/sp-sign_transfer_protocol4/00007.png differ
diff --git a/tests_zemu/snapshots/x-change_owner/00003.png b/tests_zemu/snapshots/x-change_owner/00003.png
index aad3faa3..7dddb729 100644
Binary files a/tests_zemu/snapshots/x-change_owner/00003.png and b/tests_zemu/snapshots/x-change_owner/00003.png differ
diff --git a/tests_zemu/snapshots/x-change_owner/00004.png b/tests_zemu/snapshots/x-change_owner/00004.png
index 4fd9be3d..5b25cd99 100644
Binary files a/tests_zemu/snapshots/x-change_owner/00004.png and b/tests_zemu/snapshots/x-change_owner/00004.png differ
diff --git a/tests_zemu/snapshots/x-change_owner/00005.png b/tests_zemu/snapshots/x-change_owner/00005.png
index 5ded3e01..d33dce53 100644
Binary files a/tests_zemu/snapshots/x-change_owner/00005.png and b/tests_zemu/snapshots/x-change_owner/00005.png differ
diff --git a/tests_zemu/snapshots/x-eth-erc20_transfer/00001.png b/tests_zemu/snapshots/x-eth-erc20_transfer/00001.png
index c21618bd..b44a5188 100644
Binary files a/tests_zemu/snapshots/x-eth-erc20_transfer/00001.png and b/tests_zemu/snapshots/x-eth-erc20_transfer/00001.png differ
diff --git a/tests_zemu/snapshots/x-eth-erc20_transfer/00002.png b/tests_zemu/snapshots/x-eth-erc20_transfer/00002.png
index f92f306d..a2db8fa4 100644
Binary files a/tests_zemu/snapshots/x-eth-erc20_transfer/00002.png and b/tests_zemu/snapshots/x-eth-erc20_transfer/00002.png differ
diff --git a/tests_zemu/snapshots/x-eth-erc20_transfer/00003.png b/tests_zemu/snapshots/x-eth-erc20_transfer/00003.png
index b146df2f..2f67f3b0 100644
Binary files a/tests_zemu/snapshots/x-eth-erc20_transfer/00003.png and b/tests_zemu/snapshots/x-eth-erc20_transfer/00003.png differ
diff --git a/tests_zemu/snapshots/x-eth-erc20_transfer/00004.png b/tests_zemu/snapshots/x-eth-erc20_transfer/00004.png
index e25bff14..b146df2f 100644
Binary files a/tests_zemu/snapshots/x-eth-erc20_transfer/00004.png and b/tests_zemu/snapshots/x-eth-erc20_transfer/00004.png differ
diff --git a/tests_zemu/snapshots/x-eth-erc20_transfer/00005.png b/tests_zemu/snapshots/x-eth-erc20_transfer/00005.png
index fd51cc13..e25bff14 100644
Binary files a/tests_zemu/snapshots/x-eth-erc20_transfer/00005.png and b/tests_zemu/snapshots/x-eth-erc20_transfer/00005.png differ
diff --git a/tests_zemu/snapshots/x-eth-erc20_transfer/00006.png b/tests_zemu/snapshots/x-eth-erc20_transfer/00006.png
index 1e4be699..fd51cc13 100644
Binary files a/tests_zemu/snapshots/x-eth-erc20_transfer/00006.png and b/tests_zemu/snapshots/x-eth-erc20_transfer/00006.png differ
diff --git a/tests_zemu/snapshots/x-eth-erc20_transfer/00007.png b/tests_zemu/snapshots/x-eth-erc20_transfer/00007.png
index c88c5d4e..1e4be699 100644
Binary files a/tests_zemu/snapshots/x-eth-erc20_transfer/00007.png and b/tests_zemu/snapshots/x-eth-erc20_transfer/00007.png differ
diff --git a/tests_zemu/snapshots/x-eth-erc20_transfer/00008.png b/tests_zemu/snapshots/x-eth-erc20_transfer/00008.png
new file mode 100644
index 00000000..c88c5d4e
Binary files /dev/null and b/tests_zemu/snapshots/x-eth-erc20_transfer/00008.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index b9db8c5b..5b6d2589 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00004.png and b/tests_zemu/snapshots/x-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
index b9db8c5b..5b6d2589 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00010.png and b/tests_zemu/snapshots/x-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_approve/00003.png b/tests_zemu/snapshots/x-sign-multisig_approve/00003.png
index aad3faa3..7dddb729 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_approve/00003.png and b/tests_zemu/snapshots/x-sign-multisig_approve/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_approve/00004.png b/tests_zemu/snapshots/x-sign-multisig_approve/00004.png
index 12f664e7..b25bdd3a 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_approve/00004.png and b/tests_zemu/snapshots/x-sign-multisig_approve/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_approve/00005.png b/tests_zemu/snapshots/x-sign-multisig_approve/00005.png
index 60d07221..3303dd7a 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_approve/00005.png and b/tests_zemu/snapshots/x-sign-multisig_approve/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_approve/00006.png b/tests_zemu/snapshots/x-sign-multisig_approve/00006.png
index a31236a2..55eab389 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_approve/00006.png and b/tests_zemu/snapshots/x-sign-multisig_approve/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_cancel/00003.png b/tests_zemu/snapshots/x-sign-multisig_cancel/00003.png
index aad3faa3..7dddb729 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_cancel/00003.png and b/tests_zemu/snapshots/x-sign-multisig_cancel/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_cancel/00004.png b/tests_zemu/snapshots/x-sign-multisig_cancel/00004.png
index 12f664e7..b25bdd3a 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_cancel/00004.png and b/tests_zemu/snapshots/x-sign-multisig_cancel/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_cancel/00005.png b/tests_zemu/snapshots/x-sign-multisig_cancel/00005.png
index 60d07221..3303dd7a 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_cancel/00005.png and b/tests_zemu/snapshots/x-sign-multisig_cancel/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_cancel/00006.png b/tests_zemu/snapshots/x-sign-multisig_cancel/00006.png
index a31236a2..55eab389 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_cancel/00006.png and b/tests_zemu/snapshots/x-sign-multisig_cancel/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_create/00003.png b/tests_zemu/snapshots/x-sign-multisig_create/00003.png
index 22a629d4..80e7d5ef 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_create/00003.png and b/tests_zemu/snapshots/x-sign-multisig_create/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_create/00004.png b/tests_zemu/snapshots/x-sign-multisig_create/00004.png
index 12f664e7..b25bdd3a 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_create/00004.png and b/tests_zemu/snapshots/x-sign-multisig_create/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_create/00005.png b/tests_zemu/snapshots/x-sign-multisig_create/00005.png
index 60d07221..3303dd7a 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_create/00005.png and b/tests_zemu/snapshots/x-sign-multisig_create/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_create/00006.png b/tests_zemu/snapshots/x-sign-multisig_create/00006.png
index a31236a2..55eab389 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_create/00006.png and b/tests_zemu/snapshots/x-sign-multisig_create/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_propose/00003.png b/tests_zemu/snapshots/x-sign-multisig_propose/00003.png
index aad3faa3..7dddb729 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_propose/00003.png and b/tests_zemu/snapshots/x-sign-multisig_propose/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_propose/00004.png b/tests_zemu/snapshots/x-sign-multisig_propose/00004.png
index 12f664e7..b25bdd3a 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_propose/00004.png and b/tests_zemu/snapshots/x-sign-multisig_propose/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_propose/00005.png b/tests_zemu/snapshots/x-sign-multisig_propose/00005.png
index 60d07221..3303dd7a 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_propose/00005.png and b/tests_zemu/snapshots/x-sign-multisig_propose/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign-multisig_propose/00006.png b/tests_zemu/snapshots/x-sign-multisig_propose/00006.png
index a31236a2..55eab389 100644
Binary files a/tests_zemu/snapshots/x-sign-multisig_propose/00006.png and b/tests_zemu/snapshots/x-sign-multisig_propose/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00005.png b/tests_zemu/snapshots/x-sign_basic/00005.png
index e0a58960..aa2d6a3f 100644
Binary files a/tests_zemu/snapshots/x-sign_basic/00005.png and b/tests_zemu/snapshots/x-sign_basic/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00006.png b/tests_zemu/snapshots/x-sign_basic/00006.png
index 36970c0e..2aa4a12b 100644
Binary files a/tests_zemu/snapshots/x-sign_basic/00006.png and b/tests_zemu/snapshots/x-sign_basic/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00007.png b/tests_zemu/snapshots/x-sign_basic/00007.png
index 60d07221..3303dd7a 100644
Binary files a/tests_zemu/snapshots/x-sign_basic/00007.png and b/tests_zemu/snapshots/x-sign_basic/00007.png differ
diff --git a/tests_zemu/snapshots/x-sign_client_deal/00009.png b/tests_zemu/snapshots/x-sign_client_deal/00009.png
index 3a3b3e42..c9e5cbc1 100644
Binary files a/tests_zemu/snapshots/x-sign_client_deal/00009.png and b/tests_zemu/snapshots/x-sign_client_deal/00009.png differ
diff --git a/tests_zemu/snapshots/x-sign_client_deal/00010.png b/tests_zemu/snapshots/x-sign_client_deal/00010.png
index 0da777ae..3d45cdc4 100644
Binary files a/tests_zemu/snapshots/x-sign_client_deal/00010.png and b/tests_zemu/snapshots/x-sign_client_deal/00010.png differ
diff --git a/tests_zemu/snapshots/x-sign_erc20_transfer/00000.png b/tests_zemu/snapshots/x-sign_erc20_transfer/00000.png
new file mode 100644
index 00000000..6c93916b
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_erc20_transfer/00000.png differ
diff --git a/tests_zemu/snapshots/x-sign_erc20_transfer/00001.png b/tests_zemu/snapshots/x-sign_erc20_transfer/00001.png
new file mode 100644
index 00000000..ff1cd05f
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_erc20_transfer/00001.png differ
diff --git a/tests_zemu/snapshots/x-sign_erc20_transfer/00002.png b/tests_zemu/snapshots/x-sign_erc20_transfer/00002.png
new file mode 100644
index 00000000..bc1ae7d4
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_erc20_transfer/00002.png differ
diff --git a/tests_zemu/snapshots/x-sign_erc20_transfer/00003.png b/tests_zemu/snapshots/x-sign_erc20_transfer/00003.png
new file mode 100644
index 00000000..5ba51ecd
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_erc20_transfer/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign_erc20_transfer/00004.png b/tests_zemu/snapshots/x-sign_erc20_transfer/00004.png
new file mode 100644
index 00000000..b4219c0b
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_erc20_transfer/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign_erc20_transfer/00005.png b/tests_zemu/snapshots/x-sign_erc20_transfer/00005.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_erc20_transfer/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign_erc20_transfer/00006.png b/tests_zemu/snapshots/x-sign_erc20_transfer/00006.png
new file mode 100644
index 00000000..c88c5d4e
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_erc20_transfer/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00003.png b/tests_zemu/snapshots/x-sign_proposal_expert/00003.png
index aad3faa3..7dddb729 100644
Binary files a/tests_zemu/snapshots/x-sign_proposal_expert/00003.png and b/tests_zemu/snapshots/x-sign_proposal_expert/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00004.png b/tests_zemu/snapshots/x-sign_proposal_expert/00004.png
index 12f664e7..b25bdd3a 100644
Binary files a/tests_zemu/snapshots/x-sign_proposal_expert/00004.png and b/tests_zemu/snapshots/x-sign_proposal_expert/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00005.png b/tests_zemu/snapshots/x-sign_proposal_expert/00005.png
index 60d07221..3303dd7a 100644
Binary files a/tests_zemu/snapshots/x-sign_proposal_expert/00005.png and b/tests_zemu/snapshots/x-sign_proposal_expert/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00006.png b/tests_zemu/snapshots/x-sign_proposal_expert/00006.png
index a31236a2..55eab389 100644
Binary files a/tests_zemu/snapshots/x-sign_proposal_expert/00006.png and b/tests_zemu/snapshots/x-sign_proposal_expert/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign_remove_datacap/00003.png b/tests_zemu/snapshots/x-sign_remove_datacap/00003.png
index c033f6b8..21992912 100644
Binary files a/tests_zemu/snapshots/x-sign_remove_datacap/00003.png and b/tests_zemu/snapshots/x-sign_remove_datacap/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_protocol4/00005.png b/tests_zemu/snapshots/x-sign_transfer_protocol4/00005.png
index e0a58960..aa2d6a3f 100644
Binary files a/tests_zemu/snapshots/x-sign_transfer_protocol4/00005.png and b/tests_zemu/snapshots/x-sign_transfer_protocol4/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_protocol4/00006.png b/tests_zemu/snapshots/x-sign_transfer_protocol4/00006.png
index 36970c0e..2aa4a12b 100644
Binary files a/tests_zemu/snapshots/x-sign_transfer_protocol4/00006.png and b/tests_zemu/snapshots/x-sign_transfer_protocol4/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_protocol4/00007.png b/tests_zemu/snapshots/x-sign_transfer_protocol4/00007.png
index 5bcfe4d4..13b15e48 100644
Binary files a/tests_zemu/snapshots/x-sign_transfer_protocol4/00007.png and b/tests_zemu/snapshots/x-sign_transfer_protocol4/00007.png differ