diff --git a/tests_zemu/snapshots/fl-mainmenu/00000.png b/tests_zemu/snapshots/fl-mainmenu/00000.png
new file mode 100644
index 0000000..9cc0b6d
Binary files /dev/null and b/tests_zemu/snapshots/fl-mainmenu/00000.png differ
diff --git a/tests_zemu/snapshots/fl-mainmenu/00001.png b/tests_zemu/snapshots/fl-mainmenu/00001.png
new file mode 100644
index 0000000..26916c9
Binary files /dev/null and b/tests_zemu/snapshots/fl-mainmenu/00001.png differ
diff --git a/tests_zemu/snapshots/fl-mainmenu/00002.png b/tests_zemu/snapshots/fl-mainmenu/00002.png
new file mode 100644
index 0000000..998320f
Binary files /dev/null and b/tests_zemu/snapshots/fl-mainmenu/00002.png differ
diff --git a/tests_zemu/snapshots/fl-mainmenu/00003.png b/tests_zemu/snapshots/fl-mainmenu/00003.png
new file mode 100644
index 0000000..26916c9
Binary files /dev/null and b/tests_zemu/snapshots/fl-mainmenu/00003.png differ
diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png
new file mode 100644
index 0000000..59bc6ba
Binary files /dev/null and b/tests_zemu/snapshots/fl-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/fl-mainmenu/00005.png b/tests_zemu/snapshots/fl-mainmenu/00005.png
new file mode 100644
index 0000000..7b92c6e
Binary files /dev/null and b/tests_zemu/snapshots/fl-mainmenu/00005.png differ
diff --git a/tests_zemu/snapshots/fl-mainmenu/00006.png b/tests_zemu/snapshots/fl-mainmenu/00006.png
new file mode 100644
index 0000000..9cc0b6d
Binary files /dev/null and b/tests_zemu/snapshots/fl-mainmenu/00006.png differ
diff --git a/tests_zemu/snapshots/fl-show_address/00000.png b/tests_zemu/snapshots/fl-show_address/00000.png
new file mode 100644
index 0000000..d0e156c
Binary files /dev/null and b/tests_zemu/snapshots/fl-show_address/00000.png differ
diff --git a/tests_zemu/snapshots/fl-show_address/00001.png b/tests_zemu/snapshots/fl-show_address/00001.png
new file mode 100644
index 0000000..a80f850
Binary files /dev/null and b/tests_zemu/snapshots/fl-show_address/00001.png differ
diff --git a/tests_zemu/snapshots/fl-show_address/00002.png b/tests_zemu/snapshots/fl-show_address/00002.png
new file mode 100644
index 0000000..ad4dac5
Binary files /dev/null and b/tests_zemu/snapshots/fl-show_address/00002.png differ
diff --git a/tests_zemu/snapshots/fl-show_address/00003.png b/tests_zemu/snapshots/fl-show_address/00003.png
new file mode 100644
index 0000000..9cc0b6d
Binary files /dev/null and b/tests_zemu/snapshots/fl-show_address/00003.png differ
diff --git a/tests_zemu/snapshots/fl-show_viewkey/00000.png b/tests_zemu/snapshots/fl-show_viewkey/00000.png
new file mode 100644
index 0000000..ee097ab
Binary files /dev/null and b/tests_zemu/snapshots/fl-show_viewkey/00000.png differ
diff --git a/tests_zemu/snapshots/fl-show_viewkey/00001.png b/tests_zemu/snapshots/fl-show_viewkey/00001.png
new file mode 100644
index 0000000..6590245
Binary files /dev/null and b/tests_zemu/snapshots/fl-show_viewkey/00001.png differ
diff --git a/tests_zemu/snapshots/fl-show_viewkey/00002.png b/tests_zemu/snapshots/fl-show_viewkey/00002.png
new file mode 100644
index 0000000..096c57c
Binary files /dev/null and b/tests_zemu/snapshots/fl-show_viewkey/00002.png differ
diff --git a/tests_zemu/snapshots/fl-show_viewkey/00003.png b/tests_zemu/snapshots/fl-show_viewkey/00003.png
new file mode 100644
index 0000000..a0bb344
Binary files /dev/null and b/tests_zemu/snapshots/fl-show_viewkey/00003.png differ
diff --git a/tests_zemu/snapshots/fl-show_viewkey/00004.png b/tests_zemu/snapshots/fl-show_viewkey/00004.png
new file mode 100644
index 0000000..e5f02f6
Binary files /dev/null and b/tests_zemu/snapshots/fl-show_viewkey/00004.png differ
diff --git a/tests_zemu/snapshots/fl-show_viewkey/00005.png b/tests_zemu/snapshots/fl-show_viewkey/00005.png
new file mode 100644
index 0000000..9cc0b6d
Binary files /dev/null and b/tests_zemu/snapshots/fl-show_viewkey/00005.png differ
diff --git a/tests_zemu/snapshots/fl-sign_3_out_tx/00000.png b/tests_zemu/snapshots/fl-sign_3_out_tx/00000.png
new file mode 100644
index 0000000..7f81dd8
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_3_out_tx/00000.png differ
diff --git a/tests_zemu/snapshots/fl-sign_3_out_tx/00001.png b/tests_zemu/snapshots/fl-sign_3_out_tx/00001.png
new file mode 100644
index 0000000..31119fc
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_3_out_tx/00001.png differ
diff --git a/tests_zemu/snapshots/fl-sign_3_out_tx/00002.png b/tests_zemu/snapshots/fl-sign_3_out_tx/00002.png
new file mode 100644
index 0000000..6de83a1
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_3_out_tx/00002.png differ
diff --git a/tests_zemu/snapshots/fl-sign_3_out_tx/00003.png b/tests_zemu/snapshots/fl-sign_3_out_tx/00003.png
new file mode 100644
index 0000000..d5d4caf
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_3_out_tx/00003.png differ
diff --git a/tests_zemu/snapshots/fl-sign_3_out_tx/00004.png b/tests_zemu/snapshots/fl-sign_3_out_tx/00004.png
new file mode 100644
index 0000000..eab2477
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_3_out_tx/00004.png differ
diff --git a/tests_zemu/snapshots/fl-sign_3_out_tx/00005.png b/tests_zemu/snapshots/fl-sign_3_out_tx/00005.png
new file mode 100644
index 0000000..e66bd7d
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_3_out_tx/00005.png differ
diff --git a/tests_zemu/snapshots/fl-sign_3_out_tx/00006.png b/tests_zemu/snapshots/fl-sign_3_out_tx/00006.png
new file mode 100644
index 0000000..1f40cf9
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_3_out_tx/00006.png differ
diff --git a/tests_zemu/snapshots/fl-sign_3_out_tx/00007.png b/tests_zemu/snapshots/fl-sign_3_out_tx/00007.png
new file mode 100644
index 0000000..9cc0b6d
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_3_out_tx/00007.png differ
diff --git a/tests_zemu/snapshots/s-ft_test/00000.png b/tests_zemu/snapshots/s-ft_test/00000.png
deleted file mode 100644
index 0c4db56..0000000
Binary files a/tests_zemu/snapshots/s-ft_test/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ft_test/00001.png b/tests_zemu/snapshots/s-ft_test/00001.png
deleted file mode 100644
index 006c26a..0000000
Binary files a/tests_zemu/snapshots/s-ft_test/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ft_test/00002.png b/tests_zemu/snapshots/s-ft_test/00002.png
deleted file mode 100644
index f8089f4..0000000
Binary files a/tests_zemu/snapshots/s-ft_test/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00000.png b/tests_zemu/snapshots/s-mainmenu/00000.png
deleted file mode 100644
index f8089f4..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00001.png b/tests_zemu/snapshots/s-mainmenu/00001.png
deleted file mode 100644
index 12d1d74..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00002.png b/tests_zemu/snapshots/s-mainmenu/00002.png
deleted file mode 100644
index 25d63ab..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00003.png b/tests_zemu/snapshots/s-mainmenu/00003.png
deleted file mode 100644
index 12d1d74..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
deleted file mode 100644
index fa8c857..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00005.png b/tests_zemu/snapshots/s-mainmenu/00005.png
deleted file mode 100644
index 6de4a1c..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00006.png b/tests_zemu/snapshots/s-mainmenu/00006.png
deleted file mode 100644
index 76ad500..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00007.png b/tests_zemu/snapshots/s-mainmenu/00007.png
deleted file mode 100644
index 3ad1234..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00008.png b/tests_zemu/snapshots/s-mainmenu/00008.png
deleted file mode 100644
index 76ad500..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00009.png b/tests_zemu/snapshots/s-mainmenu/00009.png
deleted file mode 100644
index 6de4a1c..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
deleted file mode 100644
index fa8c857..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00011.png b/tests_zemu/snapshots/s-mainmenu/00011.png
deleted file mode 100644
index 12d1d74..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00012.png b/tests_zemu/snapshots/s-mainmenu/00012.png
deleted file mode 100644
index f8089f4..0000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address/00000.png b/tests_zemu/snapshots/s-show_address/00000.png
deleted file mode 100644
index 661d395..0000000
Binary files a/tests_zemu/snapshots/s-show_address/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address/00001.png b/tests_zemu/snapshots/s-show_address/00001.png
deleted file mode 100644
index 3c2910b..0000000
Binary files a/tests_zemu/snapshots/s-show_address/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address/00002.png b/tests_zemu/snapshots/s-show_address/00002.png
deleted file mode 100644
index 610e646..0000000
Binary files a/tests_zemu/snapshots/s-show_address/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address/00003.png b/tests_zemu/snapshots/s-show_address/00003.png
deleted file mode 100644
index 006c26a..0000000
Binary files a/tests_zemu/snapshots/s-show_address/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address/00004.png b/tests_zemu/snapshots/s-show_address/00004.png
deleted file mode 100644
index f8089f4..0000000
Binary files a/tests_zemu/snapshots/s-show_address/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_reject/00000.png b/tests_zemu/snapshots/s-show_address_reject/00000.png
deleted file mode 100644
index 661d395..0000000
Binary files a/tests_zemu/snapshots/s-show_address_reject/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_reject/00001.png b/tests_zemu/snapshots/s-show_address_reject/00001.png
deleted file mode 100644
index 3c2910b..0000000
Binary files a/tests_zemu/snapshots/s-show_address_reject/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_reject/00002.png b/tests_zemu/snapshots/s-show_address_reject/00002.png
deleted file mode 100644
index 610e646..0000000
Binary files a/tests_zemu/snapshots/s-show_address_reject/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_reject/00003.png b/tests_zemu/snapshots/s-show_address_reject/00003.png
deleted file mode 100644
index 006c26a..0000000
Binary files a/tests_zemu/snapshots/s-show_address_reject/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_reject/00004.png b/tests_zemu/snapshots/s-show_address_reject/00004.png
deleted file mode 100644
index ef76636..0000000
Binary files a/tests_zemu/snapshots/s-show_address_reject/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_reject/00005.png b/tests_zemu/snapshots/s-show_address_reject/00005.png
deleted file mode 100644
index f8089f4..0000000
Binary files a/tests_zemu/snapshots/s-show_address_reject/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00000.png b/tests_zemu/snapshots/s-show_viewkey/00000.png
deleted file mode 100644
index 4b3a594..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00001.png b/tests_zemu/snapshots/s-show_viewkey/00001.png
deleted file mode 100644
index 71df1dd..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00002.png b/tests_zemu/snapshots/s-show_viewkey/00002.png
deleted file mode 100644
index 4b62493..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00003.png b/tests_zemu/snapshots/s-show_viewkey/00003.png
deleted file mode 100644
index a665aed..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00004.png b/tests_zemu/snapshots/s-show_viewkey/00004.png
deleted file mode 100644
index 75df403..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00005.png b/tests_zemu/snapshots/s-show_viewkey/00005.png
deleted file mode 100644
index 6d7a831..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00006.png b/tests_zemu/snapshots/s-show_viewkey/00006.png
deleted file mode 100644
index 4e384bd..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00007.png b/tests_zemu/snapshots/s-show_viewkey/00007.png
deleted file mode 100644
index bdf05cc..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00008.png b/tests_zemu/snapshots/s-show_viewkey/00008.png
deleted file mode 100644
index 610e646..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00009.png b/tests_zemu/snapshots/s-show_viewkey/00009.png
deleted file mode 100644
index 006c26a..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_viewkey/00010.png b/tests_zemu/snapshots/s-show_viewkey/00010.png
deleted file mode 100644
index f8089f4..0000000
Binary files a/tests_zemu/snapshots/s-show_viewkey/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign/00001.png b/tests_zemu/snapshots/sp-blind_sign/00001.png
deleted file mode 100644
index fdfaa18..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign/00002.png b/tests_zemu/snapshots/sp-blind_sign/00002.png
deleted file mode 100644
index ad8f956..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign/00003.png b/tests_zemu/snapshots/sp-blind_sign/00003.png
deleted file mode 100644
index c0c84b8..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign/00004.png b/tests_zemu/snapshots/sp-blind_sign/00004.png
deleted file mode 100644
index c0a1fdc..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign/00005.png b/tests_zemu/snapshots/sp-blind_sign/00005.png
deleted file mode 100644
index 0e4e0e5..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign/00006.png b/tests_zemu/snapshots/sp-blind_sign/00006.png
deleted file mode 100644
index e278832..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign2/00001.png b/tests_zemu/snapshots/sp-blind_sign2/00001.png
deleted file mode 100644
index fdfaa18..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign2/00002.png b/tests_zemu/snapshots/sp-blind_sign2/00002.png
deleted file mode 100644
index 0cb0485..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign2/00003.png b/tests_zemu/snapshots/sp-blind_sign2/00003.png
deleted file mode 100644
index d2bc761..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign2/00004.png b/tests_zemu/snapshots/sp-blind_sign2/00004.png
deleted file mode 100644
index 2b262e6..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign2/00005.png b/tests_zemu/snapshots/sp-blind_sign2/00005.png
deleted file mode 100644
index 5219877..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign2/00006.png b/tests_zemu/snapshots/sp-blind_sign2/00006.png
deleted file mode 100644
index 43f6b38..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign3/00000.png b/tests_zemu/snapshots/sp-blind_sign3/00000.png
deleted file mode 100644
index 60e141a..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign3/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign3/00001.png b/tests_zemu/snapshots/sp-blind_sign3/00001.png
deleted file mode 100644
index ca94e97..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign3/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign3/00002.png b/tests_zemu/snapshots/sp-blind_sign3/00002.png
deleted file mode 100644
index 3fe010c..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign3/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign3/00003.png b/tests_zemu/snapshots/sp-blind_sign3/00003.png
deleted file mode 100644
index bccea2b..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign3/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign3/00004.png b/tests_zemu/snapshots/sp-blind_sign3/00004.png
deleted file mode 100644
index 2b262e6..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign3/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign3/00005.png b/tests_zemu/snapshots/sp-blind_sign3/00005.png
deleted file mode 100644
index 0184d5b..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign3/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign3/00006.png b/tests_zemu/snapshots/sp-blind_sign3/00006.png
deleted file mode 100644
index 419daf8..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign3/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign3/00007.png b/tests_zemu/snapshots/sp-blind_sign3/00007.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign3/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign3/00008.png b/tests_zemu/snapshots/sp-blind_sign3/00008.png
deleted file mode 100644
index 9b29b76..0000000
Binary files a/tests_zemu/snapshots/sp-blind_sign3/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
index a5f8360..875994f 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 a5f8360..875994f 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-show_address_reject/00000.png b/tests_zemu/snapshots/sp-show_address_reject/00000.png
deleted file mode 100644
index 60e141a..0000000
Binary files a/tests_zemu/snapshots/sp-show_address_reject/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_reject/00001.png b/tests_zemu/snapshots/sp-show_address_reject/00001.png
deleted file mode 100644
index ffec9b8..0000000
Binary files a/tests_zemu/snapshots/sp-show_address_reject/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_reject/00002.png b/tests_zemu/snapshots/sp-show_address_reject/00002.png
deleted file mode 100644
index 130c190..0000000
Binary files a/tests_zemu/snapshots/sp-show_address_reject/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_reject/00003.png b/tests_zemu/snapshots/sp-show_address_reject/00003.png
deleted file mode 100644
index 87bcc36..0000000
Binary files a/tests_zemu/snapshots/sp-show_address_reject/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_reject/00004.png b/tests_zemu/snapshots/sp-show_address_reject/00004.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/sp-show_address_reject/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_reject/00005.png b/tests_zemu/snapshots/sp-show_address_reject/00005.png
deleted file mode 100644
index de8a291..0000000
Binary files a/tests_zemu/snapshots/sp-show_address_reject/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_reject/00006.png b/tests_zemu/snapshots/sp-show_address_reject/00006.png
deleted file mode 100644
index 9b29b76..0000000
Binary files a/tests_zemu/snapshots/sp-show_address_reject/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign/00000.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-blind_sign/00000.png
rename to tests_zemu/snapshots/sp-sign_3_out_tx/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00001.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00001.png
new file mode 100644
index 0000000..8db0c36
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00002.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00002.png
new file mode 100644
index 0000000..01e5db4
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00003.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00003.png
new file mode 100644
index 0000000..ee02abc
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00004.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00004.png
new file mode 100644
index 0000000..49863e8
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00005.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00005.png
new file mode 100644
index 0000000..33ce790
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00006.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00006.png
new file mode 100644
index 0000000..b3fc3ef
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00007.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00007.png
new file mode 100644
index 0000000..cbab26c
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00007.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00008.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00008.png
new file mode 100644
index 0000000..86677bb
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00008.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00009.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00009.png
new file mode 100644
index 0000000..299fbb8
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00009.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00010.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00010.png
new file mode 100644
index 0000000..8ab9a19
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00010.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00011.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00011.png
new file mode 100644
index 0000000..7d0bd8d
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00011.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00012.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00012.png
new file mode 100644
index 0000000..b693a4c
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00012.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00013.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00013.png
new file mode 100644
index 0000000..11ad007
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00013.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00014.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00014.png
new file mode 100644
index 0000000..2457cac
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00014.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00015.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00015.png
new file mode 100644
index 0000000..37f29d9
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00015.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00016.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00016.png
new file mode 100644
index 0000000..c5e1083
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00016.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00017.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00017.png
new file mode 100644
index 0000000..d406499
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00017.png differ
diff --git a/tests_zemu/snapshots/sp-sign_3_out_tx/00018.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00018.png
new file mode 100644
index 0000000..5b98049
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_3_out_tx/00018.png differ
diff --git a/tests_zemu/snapshots/sp-blind_sign/00007.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00019.png
similarity index 100%
rename from tests_zemu/snapshots/sp-blind_sign/00007.png
rename to tests_zemu/snapshots/sp-sign_3_out_tx/00019.png
diff --git a/tests_zemu/snapshots/sp-blind_sign/00008.png b/tests_zemu/snapshots/sp-sign_3_out_tx/00020.png
similarity index 100%
rename from tests_zemu/snapshots/sp-blind_sign/00008.png
rename to tests_zemu/snapshots/sp-sign_3_out_tx/00020.png
diff --git a/tests_zemu/snapshots/st-blind_sign/00000.png b/tests_zemu/snapshots/st-blind_sign/00000.png
deleted file mode 100644
index 8d5b94a..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign/00001.png b/tests_zemu/snapshots/st-blind_sign/00001.png
deleted file mode 100644
index d1376e9..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign/00002.png b/tests_zemu/snapshots/st-blind_sign/00002.png
deleted file mode 100644
index 3d8b21d..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign/00003.png b/tests_zemu/snapshots/st-blind_sign/00003.png
deleted file mode 100644
index 72e2863..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign/00004.png b/tests_zemu/snapshots/st-blind_sign/00004.png
deleted file mode 100644
index 59536c9..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign2/00000.png b/tests_zemu/snapshots/st-blind_sign2/00000.png
deleted file mode 100644
index 8d5b94a..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign2/00001.png b/tests_zemu/snapshots/st-blind_sign2/00001.png
deleted file mode 100644
index 00e2359..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign2/00002.png b/tests_zemu/snapshots/st-blind_sign2/00002.png
deleted file mode 100644
index 77d6630..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign2/00003.png b/tests_zemu/snapshots/st-blind_sign2/00003.png
deleted file mode 100644
index 72e2863..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign2/00004.png b/tests_zemu/snapshots/st-blind_sign2/00004.png
deleted file mode 100644
index 59536c9..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign3/00000.png b/tests_zemu/snapshots/st-blind_sign3/00000.png
deleted file mode 100644
index 8d5b94a..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign3/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign3/00001.png b/tests_zemu/snapshots/st-blind_sign3/00001.png
deleted file mode 100644
index ab2b514..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign3/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign3/00002.png b/tests_zemu/snapshots/st-blind_sign3/00002.png
deleted file mode 100644
index e8762df..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign3/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign3/00003.png b/tests_zemu/snapshots/st-blind_sign3/00003.png
deleted file mode 100644
index 72e2863..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign3/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-blind_sign3/00004.png b/tests_zemu/snapshots/st-blind_sign3/00004.png
deleted file mode 100644
index 59536c9..0000000
Binary files a/tests_zemu/snapshots/st-blind_sign3/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00000.png b/tests_zemu/snapshots/st-mainmenu/00000.png
index 59536c9..d42efca 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00000.png and b/tests_zemu/snapshots/st-mainmenu/00000.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.png
index 67fba67..5f60b4d 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00001.png and b/tests_zemu/snapshots/st-mainmenu/00001.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00002.png b/tests_zemu/snapshots/st-mainmenu/00002.png
index 31242c9..82a1ef4 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00002.png and b/tests_zemu/snapshots/st-mainmenu/00002.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00003.png b/tests_zemu/snapshots/st-mainmenu/00003.png
index 25b99bc..5f60b4d 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00003.png and b/tests_zemu/snapshots/st-mainmenu/00003.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
index 31242c9..d4fbef0 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-mainmenu/00005.png b/tests_zemu/snapshots/st-mainmenu/00005.png
index 59536c9..3dadf80 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00005.png and b/tests_zemu/snapshots/st-mainmenu/00005.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00006.png b/tests_zemu/snapshots/st-mainmenu/00006.png
new file mode 100644
index 0000000..d42efca
Binary files /dev/null and b/tests_zemu/snapshots/st-mainmenu/00006.png differ
diff --git a/tests_zemu/snapshots/st-show_address/00000.png b/tests_zemu/snapshots/st-show_address/00000.png
index 0759918..ab57d9c 100644
Binary files a/tests_zemu/snapshots/st-show_address/00000.png and b/tests_zemu/snapshots/st-show_address/00000.png differ
diff --git a/tests_zemu/snapshots/st-show_address/00001.png b/tests_zemu/snapshots/st-show_address/00001.png
index 7b13043..cb8fbca 100644
Binary files a/tests_zemu/snapshots/st-show_address/00001.png and b/tests_zemu/snapshots/st-show_address/00001.png differ
diff --git a/tests_zemu/snapshots/st-show_address/00002.png b/tests_zemu/snapshots/st-show_address/00002.png
index 97f0747..58a343e 100644
Binary files a/tests_zemu/snapshots/st-show_address/00002.png and b/tests_zemu/snapshots/st-show_address/00002.png differ
diff --git a/tests_zemu/snapshots/st-show_address/00003.png b/tests_zemu/snapshots/st-show_address/00003.png
index 59536c9..d42efca 100644
Binary files a/tests_zemu/snapshots/st-show_address/00003.png and b/tests_zemu/snapshots/st-show_address/00003.png differ
diff --git a/tests_zemu/snapshots/st-show_address_reject/00000.png b/tests_zemu/snapshots/st-show_address_reject/00000.png
deleted file mode 100644
index 0759918..0000000
Binary files a/tests_zemu/snapshots/st-show_address_reject/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_address_reject/00001.png b/tests_zemu/snapshots/st-show_address_reject/00001.png
deleted file mode 100644
index 7b13043..0000000
Binary files a/tests_zemu/snapshots/st-show_address_reject/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_address_reject/00002.png b/tests_zemu/snapshots/st-show_address_reject/00002.png
deleted file mode 100644
index 8c5f472..0000000
Binary files a/tests_zemu/snapshots/st-show_address_reject/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_address_reject/00003.png b/tests_zemu/snapshots/st-show_address_reject/00003.png
deleted file mode 100644
index 59536c9..0000000
Binary files a/tests_zemu/snapshots/st-show_address_reject/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_viewkey/00000.png b/tests_zemu/snapshots/st-show_viewkey/00000.png
index 8d5b94a..330b744 100644
Binary files a/tests_zemu/snapshots/st-show_viewkey/00000.png and b/tests_zemu/snapshots/st-show_viewkey/00000.png differ
diff --git a/tests_zemu/snapshots/st-show_viewkey/00001.png b/tests_zemu/snapshots/st-show_viewkey/00001.png
index 071a8f4..928c579 100644
Binary files a/tests_zemu/snapshots/st-show_viewkey/00001.png and b/tests_zemu/snapshots/st-show_viewkey/00001.png differ
diff --git a/tests_zemu/snapshots/st-show_viewkey/00002.png b/tests_zemu/snapshots/st-show_viewkey/00002.png
index dddd075..e2e9660 100644
Binary files a/tests_zemu/snapshots/st-show_viewkey/00002.png and b/tests_zemu/snapshots/st-show_viewkey/00002.png differ
diff --git a/tests_zemu/snapshots/st-show_viewkey/00003.png b/tests_zemu/snapshots/st-show_viewkey/00003.png
index 276d214..6306494 100644
Binary files a/tests_zemu/snapshots/st-show_viewkey/00003.png and b/tests_zemu/snapshots/st-show_viewkey/00003.png differ
diff --git a/tests_zemu/snapshots/st-show_viewkey/00004.png b/tests_zemu/snapshots/st-show_viewkey/00004.png
index 5c5e439..d42efca 100644
Binary files a/tests_zemu/snapshots/st-show_viewkey/00004.png and b/tests_zemu/snapshots/st-show_viewkey/00004.png differ
diff --git a/tests_zemu/snapshots/st-sign_3_out_tx/00000.png b/tests_zemu/snapshots/st-sign_3_out_tx/00000.png
new file mode 100644
index 0000000..401267e
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_3_out_tx/00000.png differ
diff --git a/tests_zemu/snapshots/st-sign_3_out_tx/00001.png b/tests_zemu/snapshots/st-sign_3_out_tx/00001.png
new file mode 100644
index 0000000..e1e97e2
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_3_out_tx/00001.png differ
diff --git a/tests_zemu/snapshots/st-sign_3_out_tx/00002.png b/tests_zemu/snapshots/st-sign_3_out_tx/00002.png
new file mode 100644
index 0000000..40e1ee1
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_3_out_tx/00002.png differ
diff --git a/tests_zemu/snapshots/st-sign_3_out_tx/00003.png b/tests_zemu/snapshots/st-sign_3_out_tx/00003.png
new file mode 100644
index 0000000..87bdf6d
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_3_out_tx/00003.png differ
diff --git a/tests_zemu/snapshots/st-sign_3_out_tx/00004.png b/tests_zemu/snapshots/st-sign_3_out_tx/00004.png
new file mode 100644
index 0000000..0309819
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_3_out_tx/00004.png differ
diff --git a/tests_zemu/snapshots/st-sign_3_out_tx/00005.png b/tests_zemu/snapshots/st-sign_3_out_tx/00005.png
new file mode 100644
index 0000000..7688cba
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_3_out_tx/00005.png differ
diff --git a/tests_zemu/snapshots/st-sign_3_out_tx/00006.png b/tests_zemu/snapshots/st-sign_3_out_tx/00006.png
new file mode 100644
index 0000000..d42efca
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_3_out_tx/00006.png differ
diff --git a/tests_zemu/snapshots/x-blind_sign/00000.png b/tests_zemu/snapshots/x-blind_sign/00000.png
deleted file mode 100644
index 60e141a..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign/00001.png b/tests_zemu/snapshots/x-blind_sign/00001.png
deleted file mode 100644
index fdfaa18..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign/00002.png b/tests_zemu/snapshots/x-blind_sign/00002.png
deleted file mode 100644
index ad8f956..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign/00003.png b/tests_zemu/snapshots/x-blind_sign/00003.png
deleted file mode 100644
index c0c84b8..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign/00004.png b/tests_zemu/snapshots/x-blind_sign/00004.png
deleted file mode 100644
index c0a1fdc..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign/00005.png b/tests_zemu/snapshots/x-blind_sign/00005.png
deleted file mode 100644
index 0e4e0e5..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign/00006.png b/tests_zemu/snapshots/x-blind_sign/00006.png
deleted file mode 100644
index e278832..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign/00007.png b/tests_zemu/snapshots/x-blind_sign/00007.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign/00008.png b/tests_zemu/snapshots/x-blind_sign/00008.png
deleted file mode 100644
index 9b29b76..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign2/00000.png b/tests_zemu/snapshots/x-blind_sign2/00000.png
deleted file mode 100644
index 60e141a..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign2/00001.png b/tests_zemu/snapshots/x-blind_sign2/00001.png
deleted file mode 100644
index fdfaa18..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign2/00002.png b/tests_zemu/snapshots/x-blind_sign2/00002.png
deleted file mode 100644
index 0cb0485..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign2/00003.png b/tests_zemu/snapshots/x-blind_sign2/00003.png
deleted file mode 100644
index d2bc761..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign2/00004.png b/tests_zemu/snapshots/x-blind_sign2/00004.png
deleted file mode 100644
index 2b262e6..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign2/00005.png b/tests_zemu/snapshots/x-blind_sign2/00005.png
deleted file mode 100644
index 5219877..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign2/00006.png b/tests_zemu/snapshots/x-blind_sign2/00006.png
deleted file mode 100644
index 43f6b38..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign2/00007.png b/tests_zemu/snapshots/x-blind_sign2/00007.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign2/00008.png b/tests_zemu/snapshots/x-blind_sign2/00008.png
deleted file mode 100644
index 9b29b76..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign3/00000.png b/tests_zemu/snapshots/x-blind_sign3/00000.png
deleted file mode 100644
index 60e141a..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign3/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign3/00001.png b/tests_zemu/snapshots/x-blind_sign3/00001.png
deleted file mode 100644
index ca94e97..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign3/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign3/00002.png b/tests_zemu/snapshots/x-blind_sign3/00002.png
deleted file mode 100644
index 3fe010c..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign3/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign3/00003.png b/tests_zemu/snapshots/x-blind_sign3/00003.png
deleted file mode 100644
index bccea2b..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign3/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign3/00004.png b/tests_zemu/snapshots/x-blind_sign3/00004.png
deleted file mode 100644
index 2b262e6..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign3/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign3/00005.png b/tests_zemu/snapshots/x-blind_sign3/00005.png
deleted file mode 100644
index 0184d5b..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign3/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign3/00006.png b/tests_zemu/snapshots/x-blind_sign3/00006.png
deleted file mode 100644
index 419daf8..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign3/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign3/00007.png b/tests_zemu/snapshots/x-blind_sign3/00007.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign3/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-blind_sign3/00008.png b/tests_zemu/snapshots/x-blind_sign3/00008.png
deleted file mode 100644
index 9b29b76..0000000
Binary files a/tests_zemu/snapshots/x-blind_sign3/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index a5f8360..875994f 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 a5f8360..875994f 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-show_address_reject/00000.png b/tests_zemu/snapshots/x-show_address_reject/00000.png
deleted file mode 100644
index 60e141a..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject/00001.png b/tests_zemu/snapshots/x-show_address_reject/00001.png
deleted file mode 100644
index ffec9b8..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject/00002.png b/tests_zemu/snapshots/x-show_address_reject/00002.png
deleted file mode 100644
index 130c190..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject/00003.png b/tests_zemu/snapshots/x-show_address_reject/00003.png
deleted file mode 100644
index 87bcc36..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject/00004.png b/tests_zemu/snapshots/x-show_address_reject/00004.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject/00005.png b/tests_zemu/snapshots/x-show_address_reject/00005.png
deleted file mode 100644
index de8a291..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject/00006.png b/tests_zemu/snapshots/x-show_address_reject/00006.png
deleted file mode 100644
index 9b29b76..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-blind_sign2/00000.png b/tests_zemu/snapshots/x-sign_3_out_tx/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-blind_sign2/00000.png
rename to tests_zemu/snapshots/x-sign_3_out_tx/00000.png
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00001.png b/tests_zemu/snapshots/x-sign_3_out_tx/00001.png
new file mode 100644
index 0000000..8db0c36
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00001.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00002.png b/tests_zemu/snapshots/x-sign_3_out_tx/00002.png
new file mode 100644
index 0000000..01e5db4
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00002.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00003.png b/tests_zemu/snapshots/x-sign_3_out_tx/00003.png
new file mode 100644
index 0000000..ee02abc
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00004.png b/tests_zemu/snapshots/x-sign_3_out_tx/00004.png
new file mode 100644
index 0000000..49863e8
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00005.png b/tests_zemu/snapshots/x-sign_3_out_tx/00005.png
new file mode 100644
index 0000000..33ce790
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00006.png b/tests_zemu/snapshots/x-sign_3_out_tx/00006.png
new file mode 100644
index 0000000..b3fc3ef
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00007.png b/tests_zemu/snapshots/x-sign_3_out_tx/00007.png
new file mode 100644
index 0000000..cbab26c
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00007.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00008.png b/tests_zemu/snapshots/x-sign_3_out_tx/00008.png
new file mode 100644
index 0000000..86677bb
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00008.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00009.png b/tests_zemu/snapshots/x-sign_3_out_tx/00009.png
new file mode 100644
index 0000000..299fbb8
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00009.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00010.png b/tests_zemu/snapshots/x-sign_3_out_tx/00010.png
new file mode 100644
index 0000000..8ab9a19
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00010.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00011.png b/tests_zemu/snapshots/x-sign_3_out_tx/00011.png
new file mode 100644
index 0000000..7d0bd8d
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00011.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00012.png b/tests_zemu/snapshots/x-sign_3_out_tx/00012.png
new file mode 100644
index 0000000..b693a4c
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00012.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00013.png b/tests_zemu/snapshots/x-sign_3_out_tx/00013.png
new file mode 100644
index 0000000..11ad007
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00013.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00014.png b/tests_zemu/snapshots/x-sign_3_out_tx/00014.png
new file mode 100644
index 0000000..2457cac
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00014.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00015.png b/tests_zemu/snapshots/x-sign_3_out_tx/00015.png
new file mode 100644
index 0000000..37f29d9
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00015.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00016.png b/tests_zemu/snapshots/x-sign_3_out_tx/00016.png
new file mode 100644
index 0000000..c5e1083
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00016.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00017.png b/tests_zemu/snapshots/x-sign_3_out_tx/00017.png
new file mode 100644
index 0000000..d406499
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00017.png differ
diff --git a/tests_zemu/snapshots/x-sign_3_out_tx/00018.png b/tests_zemu/snapshots/x-sign_3_out_tx/00018.png
new file mode 100644
index 0000000..5b98049
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_3_out_tx/00018.png differ
diff --git a/tests_zemu/snapshots/sp-blind_sign2/00007.png b/tests_zemu/snapshots/x-sign_3_out_tx/00019.png
similarity index 100%
rename from tests_zemu/snapshots/sp-blind_sign2/00007.png
rename to tests_zemu/snapshots/x-sign_3_out_tx/00019.png
diff --git a/tests_zemu/snapshots/sp-blind_sign2/00008.png b/tests_zemu/snapshots/x-sign_3_out_tx/00020.png
similarity index 100%
rename from tests_zemu/snapshots/sp-blind_sign2/00008.png
rename to tests_zemu/snapshots/x-sign_3_out_tx/00020.png