diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png
index 2cd00de1..7ec55234 100644
Binary files a/tests_zemu/snapshots/fl-mainmenu/00004.png and b/tests_zemu/snapshots/fl-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00000.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00000.png
new file mode 100644
index 00000000..6e584f1c
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign-masp-transfer/00000.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00001.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00001.png
new file mode 100644
index 00000000..03303d13
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign-masp-transfer/00001.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00002.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00002.png
new file mode 100644
index 00000000..37811722
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign-masp-transfer/00002.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00003.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00003.png
new file mode 100644
index 00000000..d5bdab9d
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign-masp-transfer/00003.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00004.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00004.png
new file mode 100644
index 00000000..4111a3db
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign-masp-transfer/00004.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00005.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00005.png
new file mode 100644
index 00000000..b2bd0083
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign-masp-transfer/00005.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00006.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00006.png
new file mode 100644
index 00000000..02b4e70f
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign-masp-transfer/00006.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00007.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00007.png
new file mode 100644
index 00000000..0a1ad5a2
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign-masp-transfer/00007.png differ
diff --git a/tests_zemu/snapshots/fl-sign_masp/00011.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00008.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00011.png
rename to tests_zemu/snapshots/fl-sign-masp-transfer/00008.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00000.png b/tests_zemu/snapshots/fl-sign_masp_spends/00000.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00000.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00001.png b/tests_zemu/snapshots/fl-sign_masp_spends/00001.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00001.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00001.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00002.png b/tests_zemu/snapshots/fl-sign_masp_spends/00002.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00002.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00002.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00003.png b/tests_zemu/snapshots/fl-sign_masp_spends/00003.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00003.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00003.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00004.png b/tests_zemu/snapshots/fl-sign_masp_spends/00004.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00004.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00004.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00005.png b/tests_zemu/snapshots/fl-sign_masp_spends/00005.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00005.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00005.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00006.png b/tests_zemu/snapshots/fl-sign_masp_spends/00006.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00006.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00006.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00007.png b/tests_zemu/snapshots/fl-sign_masp_spends/00007.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00007.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00007.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00008.png b/tests_zemu/snapshots/fl-sign_masp_spends/00008.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00008.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00008.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00009.png b/tests_zemu/snapshots/fl-sign_masp_spends/00009.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00009.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00009.png
diff --git a/tests_zemu/snapshots/fl-sign_masp/00010.png b/tests_zemu/snapshots/fl-sign_masp_spends/00010.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_masp/00010.png
rename to tests_zemu/snapshots/fl-sign_masp_spends/00010.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00011.png b/tests_zemu/snapshots/fl-sign_masp_spends/00011.png
new file mode 100644
index 00000000..583b94c3
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_masp_spends/00011.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
index 6a648e29..fa411bfc 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 6a648e29..fa411bfc 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/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
index 81c931a4..249c9c56 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 81c931a4..249c9c56 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-sign_masp/00000.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00000.png
rename to tests_zemu/snapshots/sp-sign-masp-transfer/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00001.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00001.png
rename to tests_zemu/snapshots/sp-sign-masp-transfer/00001.png
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00002.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00002.png
new file mode 100644
index 00000000..cfdf79d5
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00003.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00003.png
new file mode 100644
index 00000000..004acdec
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00004.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00004.png
new file mode 100644
index 00000000..04769e19
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00005.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00005.png
new file mode 100644
index 00000000..1d9efea2
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00006.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00006.png
new file mode 100644
index 00000000..7e7a1546
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00007.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00007.png
new file mode 100644
index 00000000..28d8f451
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00007.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00008.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00008.png
new file mode 100644
index 00000000..30a1e04b
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00008.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00009.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00009.png
new file mode 100644
index 00000000..d155d81f
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00009.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00010.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00010.png
new file mode 100644
index 00000000..b6187f7a
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00010.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00011.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00011.png
new file mode 100644
index 00000000..cb859a6c
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00011.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00012.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00012.png
new file mode 100644
index 00000000..e5214bd3
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00012.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00013.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00013.png
new file mode 100644
index 00000000..a78f04a8
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00013.png differ
diff --git a/tests_zemu/snapshots/sp-sign-masp-transfer/00014.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00014.png
new file mode 100644
index 00000000..6f8891c9
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign-masp-transfer/00014.png differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00022.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00015.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00022.png
rename to tests_zemu/snapshots/sp-sign-masp-transfer/00015.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00023.png b/tests_zemu/snapshots/sp-sign-masp-transfer/00016.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00023.png
rename to tests_zemu/snapshots/sp-sign-masp-transfer/00016.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00024.png b/tests_zemu/snapshots/sp-sign_masp/00024.png
deleted file mode 100644
index b4d24668..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00024.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00025.png b/tests_zemu/snapshots/sp-sign_masp/00025.png
deleted file mode 100644
index 9b1e369a..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00025.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00026.png b/tests_zemu/snapshots/sp-sign_masp/00026.png
deleted file mode 100644
index 6ef4b69f..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00026.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00027.png b/tests_zemu/snapshots/sp-sign_masp/00027.png
deleted file mode 100644
index d3b7d639..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00027.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00028.png b/tests_zemu/snapshots/sp-sign_masp/00028.png
deleted file mode 100644
index 0ff0f026..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00028.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00029.png b/tests_zemu/snapshots/sp-sign_masp/00029.png
deleted file mode 100644
index dee77134..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00029.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00030.png b/tests_zemu/snapshots/sp-sign_masp/00030.png
deleted file mode 100644
index adbf0079..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00030.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00031.png b/tests_zemu/snapshots/sp-sign_masp/00031.png
deleted file mode 100644
index 39c4ab5a..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00031.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00032.png b/tests_zemu/snapshots/sp-sign_masp/00032.png
deleted file mode 100644
index 032da480..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00032.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00033.png b/tests_zemu/snapshots/sp-sign_masp/00033.png
deleted file mode 100644
index 9aff76c6..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00033.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00034.png b/tests_zemu/snapshots/sp-sign_masp/00034.png
deleted file mode 100644
index 93a53304..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00034.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00035.png b/tests_zemu/snapshots/sp-sign_masp/00035.png
deleted file mode 100644
index a9a8db40..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00035.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00036.png b/tests_zemu/snapshots/sp-sign_masp/00036.png
deleted file mode 100644
index 08f4f284..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00036.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00037.png b/tests_zemu/snapshots/sp-sign_masp/00037.png
deleted file mode 100644
index 2d5cd579..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp/00037.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00002.png b/tests_zemu/snapshots/sp-sign_masp_2/00002.png
deleted file mode 100644
index 9374902a..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00003.png b/tests_zemu/snapshots/sp-sign_masp_2/00003.png
deleted file mode 100644
index 85f60351..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00004.png b/tests_zemu/snapshots/sp-sign_masp_2/00004.png
deleted file mode 100644
index 735d91b0..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00005.png b/tests_zemu/snapshots/sp-sign_masp_2/00005.png
deleted file mode 100644
index da3ebc76..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00006.png b/tests_zemu/snapshots/sp-sign_masp_2/00006.png
deleted file mode 100644
index 8e56ad72..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00007.png b/tests_zemu/snapshots/sp-sign_masp_2/00007.png
deleted file mode 100644
index b4a68ecb..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00008.png b/tests_zemu/snapshots/sp-sign_masp_2/00008.png
deleted file mode 100644
index 5ec87479..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00009.png b/tests_zemu/snapshots/sp-sign_masp_2/00009.png
deleted file mode 100644
index 7f8d305d..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00010.png b/tests_zemu/snapshots/sp-sign_masp_2/00010.png
deleted file mode 100644
index 0e815a5e..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00011.png b/tests_zemu/snapshots/sp-sign_masp_2/00011.png
deleted file mode 100644
index eb5f7218..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00012.png b/tests_zemu/snapshots/sp-sign_masp_2/00012.png
deleted file mode 100644
index e7751730..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00013.png b/tests_zemu/snapshots/sp-sign_masp_2/00013.png
deleted file mode 100644
index 3b351b66..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00014.png b/tests_zemu/snapshots/sp-sign_masp_2/00014.png
deleted file mode 100644
index 4480e4d4..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00015.png b/tests_zemu/snapshots/sp-sign_masp_2/00015.png
deleted file mode 100644
index 372a40c8..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00016.png b/tests_zemu/snapshots/sp-sign_masp_2/00016.png
deleted file mode 100644
index 4004f72c..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00017.png b/tests_zemu/snapshots/sp-sign_masp_2/00017.png
deleted file mode 100644
index 552b4a74..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00018.png b/tests_zemu/snapshots/sp-sign_masp_2/00018.png
deleted file mode 100644
index 6f7d2252..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00019.png b/tests_zemu/snapshots/sp-sign_masp_2/00019.png
deleted file mode 100644
index 932fc799..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00020.png b/tests_zemu/snapshots/sp-sign_masp_2/00020.png
deleted file mode 100644
index 33c60d1c..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00020.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00021.png b/tests_zemu/snapshots/sp-sign_masp_2/00021.png
deleted file mode 100644
index 21de87bf..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00021.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00022.png b/tests_zemu/snapshots/sp-sign_masp_2/00022.png
deleted file mode 100644
index a389fd51..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00022.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00023.png b/tests_zemu/snapshots/sp-sign_masp_2/00023.png
deleted file mode 100644
index 5166e571..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00023.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00024.png b/tests_zemu/snapshots/sp-sign_masp_2/00024.png
deleted file mode 100644
index 737b3b0a..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00024.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00025.png b/tests_zemu/snapshots/sp-sign_masp_2/00025.png
deleted file mode 100644
index 1624d1a8..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00025.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00026.png b/tests_zemu/snapshots/sp-sign_masp_2/00026.png
deleted file mode 100644
index b74cab16..00000000
Binary files a/tests_zemu/snapshots/sp-sign_masp_2/00026.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00000.png b/tests_zemu/snapshots/sp-sign_masp_spends/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp_2/00000.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00001.png b/tests_zemu/snapshots/sp-sign_masp_spends/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp_2/00001.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00002.png b/tests_zemu/snapshots/sp-sign_masp_spends/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00002.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00003.png b/tests_zemu/snapshots/sp-sign_masp_spends/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00003.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00004.png b/tests_zemu/snapshots/sp-sign_masp_spends/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00004.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00005.png b/tests_zemu/snapshots/sp-sign_masp_spends/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00005.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00006.png b/tests_zemu/snapshots/sp-sign_masp_spends/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00006.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00007.png b/tests_zemu/snapshots/sp-sign_masp_spends/00007.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00007.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00008.png b/tests_zemu/snapshots/sp-sign_masp_spends/00008.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00008.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00008.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00009.png b/tests_zemu/snapshots/sp-sign_masp_spends/00009.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00009.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00009.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00010.png b/tests_zemu/snapshots/sp-sign_masp_spends/00010.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00010.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00010.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00011.png b/tests_zemu/snapshots/sp-sign_masp_spends/00011.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00011.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00011.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00012.png b/tests_zemu/snapshots/sp-sign_masp_spends/00012.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00012.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00012.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00013.png b/tests_zemu/snapshots/sp-sign_masp_spends/00013.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00013.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00013.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00014.png b/tests_zemu/snapshots/sp-sign_masp_spends/00014.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00014.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00014.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00015.png b/tests_zemu/snapshots/sp-sign_masp_spends/00015.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00015.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00015.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00016.png b/tests_zemu/snapshots/sp-sign_masp_spends/00016.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00016.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00016.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00017.png b/tests_zemu/snapshots/sp-sign_masp_spends/00017.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00017.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00017.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00018.png b/tests_zemu/snapshots/sp-sign_masp_spends/00018.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00018.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00018.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00019.png b/tests_zemu/snapshots/sp-sign_masp_spends/00019.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00019.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00019.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00020.png b/tests_zemu/snapshots/sp-sign_masp_spends/00020.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00020.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00020.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00021.png b/tests_zemu/snapshots/sp-sign_masp_spends/00021.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00021.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00021.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00022.png b/tests_zemu/snapshots/sp-sign_masp_spends/00022.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00022.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00022.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00023.png b/tests_zemu/snapshots/sp-sign_masp_spends/00023.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00023.png
rename to tests_zemu/snapshots/sp-sign_masp_spends/00023.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
index 7b1c3a7e..4fd54bcb 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00004.png and b/tests_zemu/snapshots/st-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00000.png b/tests_zemu/snapshots/st-sign-masp-transfer/00000.png
new file mode 100644
index 00000000..6fb558e6
Binary files /dev/null and b/tests_zemu/snapshots/st-sign-masp-transfer/00000.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00001.png b/tests_zemu/snapshots/st-sign-masp-transfer/00001.png
new file mode 100644
index 00000000..b66b06af
Binary files /dev/null and b/tests_zemu/snapshots/st-sign-masp-transfer/00001.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00002.png b/tests_zemu/snapshots/st-sign-masp-transfer/00002.png
new file mode 100644
index 00000000..1a80d615
Binary files /dev/null and b/tests_zemu/snapshots/st-sign-masp-transfer/00002.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00003.png b/tests_zemu/snapshots/st-sign-masp-transfer/00003.png
new file mode 100644
index 00000000..519e57d2
Binary files /dev/null and b/tests_zemu/snapshots/st-sign-masp-transfer/00003.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00004.png b/tests_zemu/snapshots/st-sign-masp-transfer/00004.png
new file mode 100644
index 00000000..3a0759ec
Binary files /dev/null and b/tests_zemu/snapshots/st-sign-masp-transfer/00004.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00005.png b/tests_zemu/snapshots/st-sign-masp-transfer/00005.png
new file mode 100644
index 00000000..d7358d6e
Binary files /dev/null and b/tests_zemu/snapshots/st-sign-masp-transfer/00005.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00006.png b/tests_zemu/snapshots/st-sign-masp-transfer/00006.png
new file mode 100644
index 00000000..8378c382
Binary files /dev/null and b/tests_zemu/snapshots/st-sign-masp-transfer/00006.png differ
diff --git a/tests_zemu/snapshots/st-sign_masp/00010.png b/tests_zemu/snapshots/st-sign-masp-transfer/00007.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00010.png
rename to tests_zemu/snapshots/st-sign-masp-transfer/00007.png
diff --git a/tests_zemu/snapshots/st-sign_masp/00011.png b/tests_zemu/snapshots/st-sign_masp/00011.png
deleted file mode 100644
index 481c868c..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp/00012.png b/tests_zemu/snapshots/st-sign_masp/00012.png
deleted file mode 100644
index 3d8152af..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp/00013.png b/tests_zemu/snapshots/st-sign_masp/00013.png
deleted file mode 100644
index a82fd3ca..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp/00014.png b/tests_zemu/snapshots/st-sign_masp/00014.png
deleted file mode 100644
index ce7389e2..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00000.png b/tests_zemu/snapshots/st-sign_masp_2/00000.png
deleted file mode 100644
index f6907fb5..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00001.png b/tests_zemu/snapshots/st-sign_masp_2/00001.png
deleted file mode 100644
index e9c3b309..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00002.png b/tests_zemu/snapshots/st-sign_masp_2/00002.png
deleted file mode 100644
index d2b62f96..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00003.png b/tests_zemu/snapshots/st-sign_masp_2/00003.png
deleted file mode 100644
index 255ef875..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00004.png b/tests_zemu/snapshots/st-sign_masp_2/00004.png
deleted file mode 100644
index be10e73d..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00005.png b/tests_zemu/snapshots/st-sign_masp_2/00005.png
deleted file mode 100644
index 91cbe7b4..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00006.png b/tests_zemu/snapshots/st-sign_masp_2/00006.png
deleted file mode 100644
index 4541ee44..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00007.png b/tests_zemu/snapshots/st-sign_masp_2/00007.png
deleted file mode 100644
index 06d74f84..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00008.png b/tests_zemu/snapshots/st-sign_masp_2/00008.png
deleted file mode 100644
index 0c114e80..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00009.png b/tests_zemu/snapshots/st-sign_masp_2/00009.png
deleted file mode 100644
index 7783ce30..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00010.png b/tests_zemu/snapshots/st-sign_masp_2/00010.png
deleted file mode 100644
index 0855f91f..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00011.png b/tests_zemu/snapshots/st-sign_masp_2/00011.png
deleted file mode 100644
index f1a7ca01..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00012.png b/tests_zemu/snapshots/st-sign_masp_2/00012.png
deleted file mode 100644
index fe61656b..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp_2/00013.png b/tests_zemu/snapshots/st-sign_masp_2/00013.png
deleted file mode 100644
index ce7389e2..00000000
Binary files a/tests_zemu/snapshots/st-sign_masp_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_masp/00000.png b/tests_zemu/snapshots/st-sign_masp_spends/00000.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00000.png
rename to tests_zemu/snapshots/st-sign_masp_spends/00000.png
diff --git a/tests_zemu/snapshots/st-sign_masp/00001.png b/tests_zemu/snapshots/st-sign_masp_spends/00001.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00001.png
rename to tests_zemu/snapshots/st-sign_masp_spends/00001.png
diff --git a/tests_zemu/snapshots/st-sign_masp/00002.png b/tests_zemu/snapshots/st-sign_masp_spends/00002.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00002.png
rename to tests_zemu/snapshots/st-sign_masp_spends/00002.png
diff --git a/tests_zemu/snapshots/st-sign_masp/00003.png b/tests_zemu/snapshots/st-sign_masp_spends/00003.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00003.png
rename to tests_zemu/snapshots/st-sign_masp_spends/00003.png
diff --git a/tests_zemu/snapshots/st-sign_masp/00004.png b/tests_zemu/snapshots/st-sign_masp_spends/00004.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00004.png
rename to tests_zemu/snapshots/st-sign_masp_spends/00004.png
diff --git a/tests_zemu/snapshots/st-sign_masp/00005.png b/tests_zemu/snapshots/st-sign_masp_spends/00005.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00005.png
rename to tests_zemu/snapshots/st-sign_masp_spends/00005.png
diff --git a/tests_zemu/snapshots/st-sign_masp/00006.png b/tests_zemu/snapshots/st-sign_masp_spends/00006.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00006.png
rename to tests_zemu/snapshots/st-sign_masp_spends/00006.png
diff --git a/tests_zemu/snapshots/st-sign_masp/00007.png b/tests_zemu/snapshots/st-sign_masp_spends/00007.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00007.png
rename to tests_zemu/snapshots/st-sign_masp_spends/00007.png
diff --git a/tests_zemu/snapshots/st-sign_masp/00008.png b/tests_zemu/snapshots/st-sign_masp_spends/00008.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00008.png
rename to tests_zemu/snapshots/st-sign_masp_spends/00008.png
diff --git a/tests_zemu/snapshots/st-sign_masp/00009.png b/tests_zemu/snapshots/st-sign_masp_spends/00009.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_masp/00009.png
rename to tests_zemu/snapshots/st-sign_masp_spends/00009.png
diff --git a/tests_zemu/snapshots/st-sign_masp_spends/00010.png b/tests_zemu/snapshots/st-sign_masp_spends/00010.png
new file mode 100644
index 00000000..bb35228c
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_masp_spends/00010.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index 81c931a4..249c9c56 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 81c931a4..249c9c56 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_masp/00000.png b/tests_zemu/snapshots/x-sign-masp-transfer/00000.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00000.png
rename to tests_zemu/snapshots/x-sign-masp-transfer/00000.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00001.png b/tests_zemu/snapshots/x-sign-masp-transfer/00001.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00001.png
rename to tests_zemu/snapshots/x-sign-masp-transfer/00001.png
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00002.png b/tests_zemu/snapshots/x-sign-masp-transfer/00002.png
new file mode 100644
index 00000000..cfdf79d5
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00002.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00003.png b/tests_zemu/snapshots/x-sign-masp-transfer/00003.png
new file mode 100644
index 00000000..004acdec
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00004.png b/tests_zemu/snapshots/x-sign-masp-transfer/00004.png
new file mode 100644
index 00000000..04769e19
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00005.png b/tests_zemu/snapshots/x-sign-masp-transfer/00005.png
new file mode 100644
index 00000000..1d9efea2
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00006.png b/tests_zemu/snapshots/x-sign-masp-transfer/00006.png
new file mode 100644
index 00000000..7e7a1546
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00007.png b/tests_zemu/snapshots/x-sign-masp-transfer/00007.png
new file mode 100644
index 00000000..28d8f451
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00007.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00008.png b/tests_zemu/snapshots/x-sign-masp-transfer/00008.png
new file mode 100644
index 00000000..30a1e04b
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00008.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00009.png b/tests_zemu/snapshots/x-sign-masp-transfer/00009.png
new file mode 100644
index 00000000..d155d81f
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00009.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00010.png b/tests_zemu/snapshots/x-sign-masp-transfer/00010.png
new file mode 100644
index 00000000..b6187f7a
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00010.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00011.png b/tests_zemu/snapshots/x-sign-masp-transfer/00011.png
new file mode 100644
index 00000000..cb859a6c
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00011.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00012.png b/tests_zemu/snapshots/x-sign-masp-transfer/00012.png
new file mode 100644
index 00000000..e5214bd3
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00012.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00013.png b/tests_zemu/snapshots/x-sign-masp-transfer/00013.png
new file mode 100644
index 00000000..a78f04a8
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00013.png differ
diff --git a/tests_zemu/snapshots/x-sign-masp-transfer/00014.png b/tests_zemu/snapshots/x-sign-masp-transfer/00014.png
new file mode 100644
index 00000000..6f8891c9
Binary files /dev/null and b/tests_zemu/snapshots/x-sign-masp-transfer/00014.png differ
diff --git a/tests_zemu/snapshots/sp-sign_masp/00038.png b/tests_zemu/snapshots/x-sign-masp-transfer/00015.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00038.png
rename to tests_zemu/snapshots/x-sign-masp-transfer/00015.png
diff --git a/tests_zemu/snapshots/sp-sign_masp/00039.png b/tests_zemu/snapshots/x-sign-masp-transfer/00016.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp/00039.png
rename to tests_zemu/snapshots/x-sign-masp-transfer/00016.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00024.png b/tests_zemu/snapshots/x-sign_masp/00024.png
deleted file mode 100644
index b4d24668..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00024.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00025.png b/tests_zemu/snapshots/x-sign_masp/00025.png
deleted file mode 100644
index 9b1e369a..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00025.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00026.png b/tests_zemu/snapshots/x-sign_masp/00026.png
deleted file mode 100644
index 6ef4b69f..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00026.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00027.png b/tests_zemu/snapshots/x-sign_masp/00027.png
deleted file mode 100644
index d3b7d639..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00027.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00028.png b/tests_zemu/snapshots/x-sign_masp/00028.png
deleted file mode 100644
index 0ff0f026..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00028.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00029.png b/tests_zemu/snapshots/x-sign_masp/00029.png
deleted file mode 100644
index dee77134..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00029.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00030.png b/tests_zemu/snapshots/x-sign_masp/00030.png
deleted file mode 100644
index adbf0079..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00030.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00031.png b/tests_zemu/snapshots/x-sign_masp/00031.png
deleted file mode 100644
index 39c4ab5a..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00031.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00032.png b/tests_zemu/snapshots/x-sign_masp/00032.png
deleted file mode 100644
index 032da480..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00032.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00033.png b/tests_zemu/snapshots/x-sign_masp/00033.png
deleted file mode 100644
index 9aff76c6..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00033.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00034.png b/tests_zemu/snapshots/x-sign_masp/00034.png
deleted file mode 100644
index 93a53304..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00034.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00035.png b/tests_zemu/snapshots/x-sign_masp/00035.png
deleted file mode 100644
index a9a8db40..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00035.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00036.png b/tests_zemu/snapshots/x-sign_masp/00036.png
deleted file mode 100644
index 08f4f284..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00036.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00037.png b/tests_zemu/snapshots/x-sign_masp/00037.png
deleted file mode 100644
index 2d5cd579..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00037.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00038.png b/tests_zemu/snapshots/x-sign_masp/00038.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00038.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp/00039.png b/tests_zemu/snapshots/x-sign_masp/00039.png
deleted file mode 100644
index 7e7f71bd..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp/00039.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00002.png b/tests_zemu/snapshots/x-sign_masp_2/00002.png
deleted file mode 100644
index 9374902a..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00003.png b/tests_zemu/snapshots/x-sign_masp_2/00003.png
deleted file mode 100644
index 85f60351..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00004.png b/tests_zemu/snapshots/x-sign_masp_2/00004.png
deleted file mode 100644
index 735d91b0..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00005.png b/tests_zemu/snapshots/x-sign_masp_2/00005.png
deleted file mode 100644
index da3ebc76..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00006.png b/tests_zemu/snapshots/x-sign_masp_2/00006.png
deleted file mode 100644
index 8e56ad72..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00007.png b/tests_zemu/snapshots/x-sign_masp_2/00007.png
deleted file mode 100644
index b4a68ecb..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00008.png b/tests_zemu/snapshots/x-sign_masp_2/00008.png
deleted file mode 100644
index 5ec87479..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00009.png b/tests_zemu/snapshots/x-sign_masp_2/00009.png
deleted file mode 100644
index 7f8d305d..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00010.png b/tests_zemu/snapshots/x-sign_masp_2/00010.png
deleted file mode 100644
index 0e815a5e..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00011.png b/tests_zemu/snapshots/x-sign_masp_2/00011.png
deleted file mode 100644
index eb5f7218..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00012.png b/tests_zemu/snapshots/x-sign_masp_2/00012.png
deleted file mode 100644
index e7751730..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00013.png b/tests_zemu/snapshots/x-sign_masp_2/00013.png
deleted file mode 100644
index 3b351b66..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00014.png b/tests_zemu/snapshots/x-sign_masp_2/00014.png
deleted file mode 100644
index 4480e4d4..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00015.png b/tests_zemu/snapshots/x-sign_masp_2/00015.png
deleted file mode 100644
index 372a40c8..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00016.png b/tests_zemu/snapshots/x-sign_masp_2/00016.png
deleted file mode 100644
index 4004f72c..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00017.png b/tests_zemu/snapshots/x-sign_masp_2/00017.png
deleted file mode 100644
index 552b4a74..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00018.png b/tests_zemu/snapshots/x-sign_masp_2/00018.png
deleted file mode 100644
index 6f7d2252..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00019.png b/tests_zemu/snapshots/x-sign_masp_2/00019.png
deleted file mode 100644
index 932fc799..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00020.png b/tests_zemu/snapshots/x-sign_masp_2/00020.png
deleted file mode 100644
index 33c60d1c..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00020.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00021.png b/tests_zemu/snapshots/x-sign_masp_2/00021.png
deleted file mode 100644
index 21de87bf..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00021.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00022.png b/tests_zemu/snapshots/x-sign_masp_2/00022.png
deleted file mode 100644
index a389fd51..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00022.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00023.png b/tests_zemu/snapshots/x-sign_masp_2/00023.png
deleted file mode 100644
index 5166e571..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00023.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00024.png b/tests_zemu/snapshots/x-sign_masp_2/00024.png
deleted file mode 100644
index 737b3b0a..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00024.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00025.png b/tests_zemu/snapshots/x-sign_masp_2/00025.png
deleted file mode 100644
index 1624d1a8..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00025.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00026.png b/tests_zemu/snapshots/x-sign_masp_2/00026.png
deleted file mode 100644
index b74cab16..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00026.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00027.png b/tests_zemu/snapshots/x-sign_masp_2/00027.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00027.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00028.png b/tests_zemu/snapshots/x-sign_masp_2/00028.png
deleted file mode 100644
index 7e7f71bd..00000000
Binary files a/tests_zemu/snapshots/x-sign_masp_2/00028.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00000.png b/tests_zemu/snapshots/x-sign_masp_spends/00000.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp_2/00000.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00000.png
diff --git a/tests_zemu/snapshots/x-sign_masp_2/00001.png b/tests_zemu/snapshots/x-sign_masp_spends/00001.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp_2/00001.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00001.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00002.png b/tests_zemu/snapshots/x-sign_masp_spends/00002.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00002.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00002.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00003.png b/tests_zemu/snapshots/x-sign_masp_spends/00003.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00003.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00003.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00004.png b/tests_zemu/snapshots/x-sign_masp_spends/00004.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00004.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00004.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00005.png b/tests_zemu/snapshots/x-sign_masp_spends/00005.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00005.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00005.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00006.png b/tests_zemu/snapshots/x-sign_masp_spends/00006.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00006.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00006.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00007.png b/tests_zemu/snapshots/x-sign_masp_spends/00007.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00007.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00007.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00008.png b/tests_zemu/snapshots/x-sign_masp_spends/00008.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00008.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00008.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00009.png b/tests_zemu/snapshots/x-sign_masp_spends/00009.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00009.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00009.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00010.png b/tests_zemu/snapshots/x-sign_masp_spends/00010.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00010.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00010.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00011.png b/tests_zemu/snapshots/x-sign_masp_spends/00011.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00011.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00011.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00012.png b/tests_zemu/snapshots/x-sign_masp_spends/00012.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00012.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00012.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00013.png b/tests_zemu/snapshots/x-sign_masp_spends/00013.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00013.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00013.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00014.png b/tests_zemu/snapshots/x-sign_masp_spends/00014.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00014.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00014.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00015.png b/tests_zemu/snapshots/x-sign_masp_spends/00015.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00015.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00015.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00016.png b/tests_zemu/snapshots/x-sign_masp_spends/00016.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00016.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00016.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00017.png b/tests_zemu/snapshots/x-sign_masp_spends/00017.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00017.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00017.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00018.png b/tests_zemu/snapshots/x-sign_masp_spends/00018.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00018.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00018.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00019.png b/tests_zemu/snapshots/x-sign_masp_spends/00019.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00019.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00019.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00020.png b/tests_zemu/snapshots/x-sign_masp_spends/00020.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00020.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00020.png
diff --git a/tests_zemu/snapshots/x-sign_masp/00021.png b/tests_zemu/snapshots/x-sign_masp_spends/00021.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_masp/00021.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00021.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00027.png b/tests_zemu/snapshots/x-sign_masp_spends/00022.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp_2/00027.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00022.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_2/00028.png b/tests_zemu/snapshots/x-sign_masp_spends/00023.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_masp_2/00028.png
rename to tests_zemu/snapshots/x-sign_masp_spends/00023.png