diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_big_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00000.png
rename to tests_zemu/snapshots/fl-sign_application_big_blindsign/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_big_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00001.png
rename to tests_zemu/snapshots/fl-sign_application_big_blindsign/00001.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_big_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00002.png
rename to tests_zemu/snapshots/fl-sign_application_big_blindsign/00002.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_big_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00003.png
rename to tests_zemu/snapshots/fl-sign_application_big_blindsign/00003.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_big_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00004.png
rename to tests_zemu/snapshots/fl-sign_application_big_blindsign/00004.png
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00000.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00000.png
new file mode 100644
index 00000000..1ad98f5e
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00000.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00001.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00001.png
new file mode 100644
index 00000000..13afbcb6
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00001.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00002.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00002.png
new file mode 100644
index 00000000..0f31bdbd
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00002.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00003.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00003.png
new file mode 100644
index 00000000..370c37ee
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00003.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00004.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00004.png
new file mode 100644
index 00000000..6696749b
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00004.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00005.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00005.png
new file mode 100644
index 00000000..cd02b413
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00005.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00006.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00006.png
new file mode 100644
index 00000000..feb40e33
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00006.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00007.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00007.png
new file mode 100644
index 00000000..dd805ff6
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00007.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00008.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00008.png
new file mode 100644
index 00000000..aacff15e
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00008.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00009.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00009.png
new file mode 100644
index 00000000..767bb70b
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00009.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00010.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00010.png
new file mode 100644
index 00000000..4309fa43
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00010.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00011.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00011.png
new file mode 100644
index 00000000..6e3986d0
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00011.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00005.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00005.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00001.png
deleted file mode 100644
index fdcf07b6..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00002.png
deleted file mode 100644
index 29d97e3f..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00003.png
deleted file mode 100644
index 135422b1..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00004.png
deleted file mode 100644
index cedeffd0..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00000.png
deleted file mode 100644
index a18ffbd5..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00001.png
deleted file mode 100644
index f7d54ad8..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00002.png
deleted file mode 100644
index 30e3eacc..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00003.png
deleted file mode 100644
index a126794a..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00004.png
deleted file mode 100644
index e433c543..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00005.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00005.png
deleted file mode 100644
index 22f82329..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00006.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00006.png
deleted file mode 100644
index e052d653..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00007.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00007.png
deleted file mode 100644
index c9c6320d..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00008.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00008.png
deleted file mode 100644
index abed11c8..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00009.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00009.png
deleted file mode 100644
index f60e3639..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00010.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00010.png
deleted file mode 100644
index d5a1257b..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00011.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00011.png
deleted file mode 100644
index 91ba33ad..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00012.png b/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00012.png
deleted file mode 100644
index 5307603c..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00000.png
deleted file mode 100644
index acbb161d..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00001.png
deleted file mode 100644
index fdcf07b6..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00002.png
deleted file mode 100644
index d879f719..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00003.png
deleted file mode 100644
index 03df129a..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00004.png
deleted file mode 100644
index cedeffd0..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00005.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00005.png
deleted file mode 100644
index f2af62bc..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00000.png
deleted file mode 100644
index acbb161d..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00000.png
deleted file mode 100644
index 5bf7b711..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00001.png
deleted file mode 100644
index e1cc0028..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00002.png
deleted file mode 100644
index 5e5c70e5..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00003.png
deleted file mode 100644
index 2a840598..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00004.png
deleted file mode 100644
index 47cc4f50..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00005.png b/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00005.png
deleted file mode 100644
index 1ae42cf9..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00006.png b/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00006.png
deleted file mode 100644
index c1e67dbe..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00007.png b/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00007.png
deleted file mode 100644
index 27b412e2..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00008.png b/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00008.png
deleted file mode 100644
index f2af62bc..00000000
Binary files a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_normal_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00000.png
rename to tests_zemu/snapshots/fl-sign_application_normal_blindsign/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_normal_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00001.png
rename to tests_zemu/snapshots/fl-sign_application_normal_blindsign/00001.png
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_normal_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00002.png
rename to tests_zemu/snapshots/fl-sign_application_normal_blindsign/00002.png
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_normal_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00003.png
rename to tests_zemu/snapshots/fl-sign_application_normal_blindsign/00003.png
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_normal_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00004.png
rename to tests_zemu/snapshots/fl-sign_application_normal_blindsign/00004.png
diff --git a/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00000.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00000.png
new file mode 100644
index 00000000..df17607a
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00000.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00001.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00001.png
new file mode 100644
index 00000000..24504b31
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00001.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00002.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00002.png
new file mode 100644
index 00000000..eaf22dac
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00002.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00003.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00003.png
new file mode 100644
index 00000000..8e911eb6
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00003.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00004.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00004.png
new file mode 100644
index 00000000..e87d1dba
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00004.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00005.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00005.png
new file mode 100644
index 00000000..83d5bcae
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00005.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00006.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00006.png
new file mode 100644
index 00000000..35d03b84
Binary files /dev/null and b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00006.png differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00013.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00013.png
rename to tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00000.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00000.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00000.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00001.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00001.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00001.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00002.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00002.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00002.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00003.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00003.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00003.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00004.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00004.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00004.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00005.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00005.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00005.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00006.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00006.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00006.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00007.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00007.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00007.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00000.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00000.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00001.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00001.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00002.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00002.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00008.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00008.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00009.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00009.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00010.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00010.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00011.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00011.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00012.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00012.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00013.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00013.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00014.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00014.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00015.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00015.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00016.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00016.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00017.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00017.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00018.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00018.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00019.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00019.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00020.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00020.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00021.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00021.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00022.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00022.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00023.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00023.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00024.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00024.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00025.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00020.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00025.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00020.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00026.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00021.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00026.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00021.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00027.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00022.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00027.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00022.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00028.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00023.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00028.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00023.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00029.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00024.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00029.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00024.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00030.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00025.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00030.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00025.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00031.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00026.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00031.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00026.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00032.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00027.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00032.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00027.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00033.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00028.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00033.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00028.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00034.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00029.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00034.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00029.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00035.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00030.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00035.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00030.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00036.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00031.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00036.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00031.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00037.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00032.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00037.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00032.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00038.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00033.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00038.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00033.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00039.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00034.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00039.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00034.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00040.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00035.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00040.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00035.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00041.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00036.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00041.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00036.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00042.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00037.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00042.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00037.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00043.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00038.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00043.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00038.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00044.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00039.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00044.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00039.png
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00000.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00040.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_big_shortcut/00000.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00040.png
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00001.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00001.png
deleted file mode 100644
index 04dc5e6a..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00002.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00002.png
deleted file mode 100644
index 7730ac1d..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00004.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00004.png
deleted file mode 100644
index 7730ac1d..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00005.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00005.png
deleted file mode 100644
index 36e84199..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00006.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00006.png
deleted file mode 100644
index 86633658..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00007.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00007.png
deleted file mode 100644
index 107c4aec..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00008.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00008.png
deleted file mode 100644
index aa77788f..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00009.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00009.png
deleted file mode 100644
index 36809307..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00010.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00010.png
deleted file mode 100644
index 3ad12346..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00006.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00006.png
deleted file mode 100644
index e13f3588..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00007.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00007.png
deleted file mode 100644
index 16002613..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00008.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00008.png
deleted file mode 100644
index 9adad3e5..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00009.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00009.png
deleted file mode 100644
index c7725a13..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00010.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00010.png
deleted file mode 100644
index d64d5cb5..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00011.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00011.png
deleted file mode 100644
index f0153197..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00012.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00012.png
deleted file mode 100644
index 28eb58aa..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00004.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00004.png
deleted file mode 100644
index bc7dbca6..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00005.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00005.png
deleted file mode 100644
index 8541bbf8..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00003.png b/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00003.png
deleted file mode 100644
index e13f3588..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00004.png b/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00004.png
deleted file mode 100644
index 16002613..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00005.png b/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00005.png
deleted file mode 100644
index 9adad3e5..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00006.png b/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00006.png
deleted file mode 100644
index c7725a13..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00007.png b/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00007.png
deleted file mode 100644
index d64d5cb5..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00045.png b/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00045.png
deleted file mode 100644
index 28eb58aa..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00045.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00000.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00000.png
deleted file mode 100644
index be5b4498..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00001.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00001.png
deleted file mode 100644
index 72032ef0..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00002.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00002.png
deleted file mode 100644
index 5664a98b..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00003.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00003.png
deleted file mode 100644
index facd7ef8..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00006.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00006.png
deleted file mode 100644
index e13f3588..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00007.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00007.png
deleted file mode 100644
index 16002613..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00008.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00008.png
deleted file mode 100644
index 9adad3e5..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00009.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00009.png
deleted file mode 100644
index c7725a13..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00010.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00010.png
deleted file mode 100644
index 4070544c..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00011.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00011.png
deleted file mode 100644
index f0153197..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00012.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00012.png
deleted file mode 100644
index 28eb58aa..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00000.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00000.png
deleted file mode 100644
index be5b4498..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00001.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00001.png
deleted file mode 100644
index 72032ef0..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00002.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00002.png
deleted file mode 100644
index 5664a98b..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00003.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00003.png
deleted file mode 100644
index facd7ef8..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00004.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00004.png
deleted file mode 100644
index 4a1406fb..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00005.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00005.png
deleted file mode 100644
index 1c9c5afa..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00003.png b/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00003.png
deleted file mode 100644
index e13f3588..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00004.png b/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00004.png
deleted file mode 100644
index 16002613..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00005.png b/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00005.png
deleted file mode 100644
index 9adad3e5..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00006.png b/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00006.png
deleted file mode 100644
index c7725a13..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00007.png b/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00007.png
deleted file mode 100644
index 4070544c..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00027.png b/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00027.png
deleted file mode 100644
index 28eb58aa..00000000
Binary files a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00027.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00000.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00000.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00000.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00001.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00001.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00001.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00002.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00002.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00002.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00003.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00003.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00003.png
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00004.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_blindsign_expert/00004.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00004.png
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00005.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_blindsign_expert/00005.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00005.png
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00006.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00006.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00006.png
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00007.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00007.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00007.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00000.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00000.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00001.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00001.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00002.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00002.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00008.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00008.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00009.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00009.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00010.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00010.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00011.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00011.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00012.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00012.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00013.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00013.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00014.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00014.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00015.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00015.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00016.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00016.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00017.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00017.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00018.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00018.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00019.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00019.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00020.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00020.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00021.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00021.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00022.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00022.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00023.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00023.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00024.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00024.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00025.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00020.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00025.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00020.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00026.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00021.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00026.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00021.png
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00003.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00022.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_big_shortcut/00003.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00022.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00000.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00000.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00001.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00001.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00002.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00002.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00003.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00003.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00004.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00004.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00005.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00005.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00006.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00007.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00000.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00000.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00001.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00001.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00002.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00002.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00003.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00003.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00008.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00008.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00009.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00009.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00010.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00010.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00011.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00011.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00012.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00012.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00013.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00013.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00014.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00014.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00015.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00015.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00016.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00016.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00017.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00017.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00018.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00018.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00019.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00019.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00020.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00020.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00021.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00021.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00022.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00022.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00023.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00023.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00024.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00020.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00024.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00020.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00025.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00021.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00025.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00021.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00026.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00022.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00026.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00022.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00027.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00023.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00027.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00023.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00028.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00024.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00028.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00024.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00029.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00025.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00029.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00025.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00030.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00026.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00030.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00026.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00031.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00027.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00031.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00027.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00032.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00028.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00032.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00028.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00033.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00029.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00033.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00029.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00034.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00030.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00034.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00030.png
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00000.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00031.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_big_shortcut/00000.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00031.png
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00001.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00001.png
deleted file mode 100644
index e10e0049..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00002.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00002.png
deleted file mode 100644
index 7e236da6..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00004.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00004.png
deleted file mode 100644
index 7e236da6..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00005.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00005.png
deleted file mode 100644
index 56209229..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00006.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00006.png
deleted file mode 100644
index cacc9f04..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00007.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00007.png
deleted file mode 100644
index 89611bec..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00008.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00008.png
deleted file mode 100644
index b6232856..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00009.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00009.png
deleted file mode 100644
index 86e715d1..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00010.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00010.png
deleted file mode 100644
index c7703726..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00006.png
deleted file mode 100644
index 7f7bd70e..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00007.png
deleted file mode 100644
index e695ebde..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00008.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00008.png
deleted file mode 100644
index 175609df..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00009.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00009.png
deleted file mode 100644
index 4ff66e32..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00010.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00010.png
deleted file mode 100644
index 542e61f2..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00004.png b/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00004.png
deleted file mode 100644
index 7f7bd70e..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00005.png b/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00005.png
deleted file mode 100644
index e695ebde..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00006.png
deleted file mode 100644
index 175609df..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00007.png
deleted file mode 100644
index 4ff66e32..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00006.png
deleted file mode 100644
index 7f7bd70e..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00007.png
deleted file mode 100644
index e695ebde..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00008.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00008.png
deleted file mode 100644
index 175609df..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00009.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00009.png
deleted file mode 100644
index ba032bd2..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00010.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00010.png
deleted file mode 100644
index 542e61f2..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00011.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00011.png
deleted file mode 100644
index a3f0b42d..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00004.png b/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00004.png
deleted file mode 100644
index 7f7bd70e..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00005.png b/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00005.png
deleted file mode 100644
index e695ebde..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00006.png
deleted file mode 100644
index 175609df..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00007.png
deleted file mode 100644
index ba032bd2..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00023.png b/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00023.png
deleted file mode 100644
index a3f0b42d..00000000
Binary files a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00023.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00000.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00000.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00001.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00001.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00002.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00002.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00003.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00003.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00004.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00004.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00005.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00005.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00006.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00007.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00000.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00000.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00001.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00001.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00002.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00002.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00003.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00003.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00008.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00008.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00009.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00009.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00010.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00010.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00011.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00011.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00012.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00012.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00013.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00013.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00014.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00014.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00015.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00015.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00016.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00016.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00017.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00017.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00018.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00018.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00019.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00019.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00020.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00020.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00021.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00021.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00022.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00022.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00003.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_big_shortcut/00003.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00000.png b/tests_zemu/snapshots/st-sign_application_big_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00000.png
rename to tests_zemu/snapshots/st-sign_application_big_blindsign/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00001.png b/tests_zemu/snapshots/st-sign_application_big_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00001.png
rename to tests_zemu/snapshots/st-sign_application_big_blindsign/00001.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00002.png b/tests_zemu/snapshots/st-sign_application_big_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00002.png
rename to tests_zemu/snapshots/st-sign_application_big_blindsign/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00003.png b/tests_zemu/snapshots/st-sign_application_big_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00003.png
rename to tests_zemu/snapshots/st-sign_application_big_blindsign/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00004.png b/tests_zemu/snapshots/st-sign_application_big_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00004.png
rename to tests_zemu/snapshots/st-sign_application_big_blindsign/00004.png
diff --git a/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00000.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00000.png
new file mode 100644
index 00000000..8c7c20a6
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00000.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00001.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00001.png
new file mode 100644
index 00000000..c16d8723
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00001.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00002.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00002.png
new file mode 100644
index 00000000..0a2960c1
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00002.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00003.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00003.png
new file mode 100644
index 00000000..6cb149fc
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00003.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00004.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00004.png
new file mode 100644
index 00000000..d0bb7d62
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00004.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00005.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00005.png
new file mode 100644
index 00000000..8ed842a2
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00005.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00006.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00006.png
new file mode 100644
index 00000000..120408fd
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00006.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00007.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00007.png
new file mode 100644
index 00000000..3446c490
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00007.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00008.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00008.png
new file mode 100644
index 00000000..6f9cc7e4
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00008.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00009.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00009.png
new file mode 100644
index 00000000..5a1e53e1
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00009.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00005.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00005.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00001.png b/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00001.png
deleted file mode 100644
index e63b74f5..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00002.png b/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00002.png
deleted file mode 100644
index e4ed3b2e..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00003.png b/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00003.png
deleted file mode 100644
index 3c68a441..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00004.png b/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00004.png
deleted file mode 100644
index 75adea44..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00000.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00000.png
deleted file mode 100644
index 521db121..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00001.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00001.png
deleted file mode 100644
index 9bd1d5b9..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00002.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00002.png
deleted file mode 100644
index e7f62a98..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00003.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00003.png
deleted file mode 100644
index 6e366466..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00004.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00004.png
deleted file mode 100644
index c49f65b2..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00005.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00005.png
deleted file mode 100644
index 9bef9fde..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00006.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00006.png
deleted file mode 100644
index d366d649..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00007.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00007.png
deleted file mode 100644
index 6cb45bd7..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00008.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00008.png
deleted file mode 100644
index c0f7de00..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00009.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00009.png
deleted file mode 100644
index fb584f97..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00010.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00010.png
deleted file mode 100644
index 1d3bec01..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00011.png b/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00011.png
deleted file mode 100644
index 835a1669..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00000.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00000.png
deleted file mode 100644
index 9696ae12..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00001.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00001.png
deleted file mode 100644
index e63b74f5..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00002.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00002.png
deleted file mode 100644
index 107124e9..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00003.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00003.png
deleted file mode 100644
index de927823..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00004.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00004.png
deleted file mode 100644
index 75adea44..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00005.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00005.png
deleted file mode 100644
index 835a1669..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00000.png b/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00000.png
deleted file mode 100644
index 9696ae12..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00001.png b/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00001.png
deleted file mode 100644
index 55f4b550..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00002.png b/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00002.png
deleted file mode 100644
index 974c4cc2..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00003.png b/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00003.png
deleted file mode 100644
index 0512eb3c..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00004.png b/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00004.png
deleted file mode 100644
index a7fa59ec..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00005.png b/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00005.png
deleted file mode 100644
index f4993b11..00000000
Binary files a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00000.png b/tests_zemu/snapshots/st-sign_application_normal_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00000.png
rename to tests_zemu/snapshots/st-sign_application_normal_blindsign/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00001.png b/tests_zemu/snapshots/st-sign_application_normal_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00001.png
rename to tests_zemu/snapshots/st-sign_application_normal_blindsign/00001.png
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00002.png b/tests_zemu/snapshots/st-sign_application_normal_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00002.png
rename to tests_zemu/snapshots/st-sign_application_normal_blindsign/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00003.png b/tests_zemu/snapshots/st-sign_application_normal_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00003.png
rename to tests_zemu/snapshots/st-sign_application_normal_blindsign/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00004.png b/tests_zemu/snapshots/st-sign_application_normal_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00004.png
rename to tests_zemu/snapshots/st-sign_application_normal_blindsign/00004.png
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00000.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00000.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00001.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00001.png
new file mode 100644
index 00000000..a9273342
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00001.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00002.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00002.png
new file mode 100644
index 00000000..aa9745c9
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00002.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00003.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00003.png
new file mode 100644
index 00000000..78002d23
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00003.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00004.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00004.png
new file mode 100644
index 00000000..bc9ba4c5
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00004.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00005.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00005.png
new file mode 100644
index 00000000..16c0326e
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00005.png differ
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00006.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00006.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00007.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00007.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00000.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00000.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00001.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00001.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00002.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00002.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00003.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00003.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00004.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00004.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00005.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00005.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00005.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00006.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00006.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00006.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00007.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00007.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00007.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00000.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00000.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00001.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00001.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00002.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00002.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00003.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00003.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00008.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00008.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00009.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00009.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00010.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00010.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00011.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00011.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00012.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00012.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00013.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00013.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00014.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00014.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00015.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00015.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00016.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00016.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00017.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00017.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00018.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00018.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00019.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00019.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00020.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00020.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00021.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00021.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00022.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00022.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00023.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00023.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00024.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00020.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00024.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00020.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00025.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00021.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00025.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00021.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00026.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00022.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00026.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00022.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00027.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00023.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00027.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00023.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00028.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00024.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00028.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00024.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00029.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00025.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00029.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00025.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00030.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00026.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00030.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00026.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00031.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00027.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00031.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00027.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00032.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00028.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00032.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00028.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00033.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00029.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00033.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00029.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00034.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00030.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00034.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00030.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00011.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00031.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00011.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00031.png
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00000.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00000.png
deleted file mode 100644
index a3f0b42d..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00001.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00001.png
deleted file mode 100644
index e10e0049..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00002.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00002.png
deleted file mode 100644
index 7e236da6..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00003.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00003.png
deleted file mode 100644
index a3f0b42d..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00004.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00004.png
deleted file mode 100644
index 7e236da6..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00005.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00005.png
deleted file mode 100644
index 56209229..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00006.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00006.png
deleted file mode 100644
index cacc9f04..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00007.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00007.png
deleted file mode 100644
index 89611bec..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00008.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00008.png
deleted file mode 100644
index b6232856..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00009.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00009.png
deleted file mode 100644
index 86e715d1..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00010.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00010.png
deleted file mode 100644
index c7703726..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00000.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00000.png
deleted file mode 100644
index e65c5e9f..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00001.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00001.png
deleted file mode 100644
index 137e102a..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00002.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00002.png
deleted file mode 100644
index 97535479..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00003.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00003.png
deleted file mode 100644
index 15885e6a..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00004.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00004.png
deleted file mode 100644
index e58b5d8e..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00005.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00005.png
deleted file mode 100644
index 18b7d18d..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00006.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00006.png
deleted file mode 100644
index 7f7bd70e..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00007.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00007.png
deleted file mode 100644
index e695ebde..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00008.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00008.png
deleted file mode 100644
index 175609df..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00009.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00009.png
deleted file mode 100644
index 4ff66e32..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00010.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00010.png
deleted file mode 100644
index 542e61f2..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00011.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00011.png
deleted file mode 100644
index a3f0b42d..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00000.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00000.png
deleted file mode 100644
index e65c5e9f..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00001.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00001.png
deleted file mode 100644
index 137e102a..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00002.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00002.png
deleted file mode 100644
index 97535479..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00003.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00003.png
deleted file mode 100644
index 15885e6a..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00004.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00004.png
deleted file mode 100644
index e58b5d8e..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00005.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00005.png
deleted file mode 100644
index 18b7d18d..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00004.png b/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00004.png
deleted file mode 100644
index 7f7bd70e..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00005.png b/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00005.png
deleted file mode 100644
index e695ebde..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00006.png b/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00006.png
deleted file mode 100644
index 175609df..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00007.png b/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00007.png
deleted file mode 100644
index 4ff66e32..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00035.png b/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00035.png
deleted file mode 100644
index a3f0b42d..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00035.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00000.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00000.png
deleted file mode 100644
index e65c5e9f..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00001.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00001.png
deleted file mode 100644
index 137e102a..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00002.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00002.png
deleted file mode 100644
index 97535479..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00003.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00003.png
deleted file mode 100644
index 15885e6a..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00004.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00004.png
deleted file mode 100644
index 28103bbc..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00005.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00005.png
deleted file mode 100644
index c239bf20..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00006.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00006.png
deleted file mode 100644
index 7f7bd70e..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00007.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00007.png
deleted file mode 100644
index e695ebde..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00008.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00008.png
deleted file mode 100644
index 175609df..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00009.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00009.png
deleted file mode 100644
index ba032bd2..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00010.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00010.png
deleted file mode 100644
index 542e61f2..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00011.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00011.png
deleted file mode 100644
index a3f0b42d..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00000.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00000.png
deleted file mode 100644
index e65c5e9f..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00001.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00001.png
deleted file mode 100644
index 137e102a..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00002.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00002.png
deleted file mode 100644
index 97535479..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00003.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00003.png
deleted file mode 100644
index 15885e6a..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00004.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00004.png
deleted file mode 100644
index 28103bbc..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00005.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00005.png
deleted file mode 100644
index c239bf20..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00004.png b/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00004.png
deleted file mode 100644
index 7f7bd70e..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00005.png b/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00005.png
deleted file mode 100644
index e695ebde..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00006.png b/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00006.png
deleted file mode 100644
index 175609df..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00007.png b/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00007.png
deleted file mode 100644
index ba032bd2..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00023.png b/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00023.png
deleted file mode 100644
index a3f0b42d..00000000
Binary files a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00023.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00000.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00000.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00001.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00001.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00002.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00002.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00003.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00003.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00004.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00004.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00005.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00005.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00005.png
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00006.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00006.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00006.png
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00007.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00007.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00007.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00000.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00000.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00001.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00001.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00002.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00002.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00003.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00003.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00008.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00008.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00009.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00009.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00010.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00010.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00011.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00011.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00012.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00012.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00013.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00013.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00014.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00014.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00015.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00015.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00016.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00016.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00017.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00017.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00018.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00018.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00019.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00019.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00020.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00020.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00021.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00021.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00022.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00022.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00035.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00035.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00019.png