diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
index 641950a4..0fac4278 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and b/tests_zemu/snapshots/s-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
index 641950a4..0fac4278 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00010.png and b/tests_zemu/snapshots/s-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00000.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00000.png
new file mode 100644
index 00000000..49639ec9
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00000.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00001.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00001.png
new file mode 100644
index 00000000..368d6198
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00001.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00002.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00002.png
new file mode 100644
index 00000000..56fe9ab2
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00002.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00003.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00003.png
new file mode 100644
index 00000000..9dae9154
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00003.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00004.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00004.png
new file mode 100644
index 00000000..08fc31e0
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00004.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00005.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00005.png
new file mode 100644
index 00000000..7ee7a7ba
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00005.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00006.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00006.png
new file mode 100644
index 00000000..006c26ab
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00007.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00007.png
new file mode 100644
index 00000000..131855e2
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00007.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
index 16bb08a0..c0ce7660 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00004.png and b/tests_zemu/snapshots/sp-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
index 16bb08a0..c0ce7660 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00010.png and b/tests_zemu/snapshots/sp-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00000.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00000.png
new file mode 100644
index 00000000..50c23a06
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00000.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00001.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00001.png
new file mode 100644
index 00000000..0f9cfb13
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00002.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00002.png
new file mode 100644
index 00000000..b47dabb4
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00003.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00003.png
new file mode 100644
index 00000000..4e0f2906
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00004.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00004.png
new file mode 100644
index 00000000..a51f4624
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00005.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00005.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00006.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00006.png
new file mode 100644
index 00000000..430a37e8
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00006.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index 16bb08a0..c0ce7660 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00004.png and b/tests_zemu/snapshots/x-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
index 16bb08a0..c0ce7660 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00010.png and b/tests_zemu/snapshots/x-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00000.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00000.png
new file mode 100644
index 00000000..50c23a06
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_basic_extra_fields/00000.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00001.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00001.png
new file mode 100644
index 00000000..0f9cfb13
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_basic_extra_fields/00001.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00002.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00002.png
new file mode 100644
index 00000000..b47dabb4
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_basic_extra_fields/00002.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00003.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00003.png
new file mode 100644
index 00000000..4e0f2906
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_basic_extra_fields/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00004.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00004.png
new file mode 100644
index 00000000..a51f4624
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_basic_extra_fields/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00005.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00005.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_basic_extra_fields/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00006.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00006.png
new file mode 100644
index 00000000..430a37e8
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_basic_extra_fields/00006.png differ