diff --git a/app/Makefile.version b/app/Makefile.version
index 438ccf4e..140ebb66 100644
--- a/app/Makefile.version
+++ b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=35
 # This is the patch version of this release
-APPVERSION_P=17
+APPVERSION_P=18
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
index ddbc4c55..8de0d02d 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 ddbc4c55..8de0d02d 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/00001.png b/tests_zemu/snapshots/s-sign_basic/00001.png
index 368d6198..5be09342 100644
Binary files a/tests_zemu/snapshots/s-sign_basic/00001.png and b/tests_zemu/snapshots/s-sign_basic/00001.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00002.png b/tests_zemu/snapshots/s-sign_basic/00002.png
index 56fe9ab2..0041b258 100644
Binary files a/tests_zemu/snapshots/s-sign_basic/00002.png and b/tests_zemu/snapshots/s-sign_basic/00002.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00003.png b/tests_zemu/snapshots/s-sign_basic/00003.png
index 9dae9154..368d6198 100644
Binary files a/tests_zemu/snapshots/s-sign_basic/00003.png and b/tests_zemu/snapshots/s-sign_basic/00003.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00004.png b/tests_zemu/snapshots/s-sign_basic/00004.png
index 08fc31e0..56fe9ab2 100644
Binary files a/tests_zemu/snapshots/s-sign_basic/00004.png and b/tests_zemu/snapshots/s-sign_basic/00004.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00005.png b/tests_zemu/snapshots/s-sign_basic/00005.png
index 7ee7a7ba..9dae9154 100644
Binary files a/tests_zemu/snapshots/s-sign_basic/00005.png and b/tests_zemu/snapshots/s-sign_basic/00005.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00006.png b/tests_zemu/snapshots/s-sign_basic/00006.png
index 006c26ab..08fc31e0 100644
Binary files a/tests_zemu/snapshots/s-sign_basic/00006.png and b/tests_zemu/snapshots/s-sign_basic/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00007.png b/tests_zemu/snapshots/s-sign_basic/00007.png
index 131855e2..7ee7a7ba 100644
Binary files a/tests_zemu/snapshots/s-sign_basic/00007.png and b/tests_zemu/snapshots/s-sign_basic/00007.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00008.png b/tests_zemu/snapshots/s-sign_basic/00008.png
new file mode 100644
index 00000000..006c26ab
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic/00008.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00009.png b/tests_zemu/snapshots/s-sign_basic/00009.png
new file mode 100644
index 00000000..131855e2
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic/00009.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
index 368d6198..5be09342 100644
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00001.png 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
index 56fe9ab2..0041b258 100644
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00002.png 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
index 9dae9154..368d6198 100644
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00003.png 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
index 08fc31e0..56fe9ab2 100644
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00004.png 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
index 7ee7a7ba..9dae9154 100644
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00005.png 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
index 006c26ab..08fc31e0 100644
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00006.png 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
index 131855e2..7ee7a7ba 100644
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00007.png and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00007.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00008.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00008.png
new file mode 100644
index 00000000..006c26ab
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00008.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00009.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00009.png
new file mode 100644
index 00000000..131855e2
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_basic_extra_fields/00009.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
index 7e2cf019..57e29fc4 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 7e2cf019..57e29fc4 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/00002.png b/tests_zemu/snapshots/sp-sign_basic/00002.png
index b47dabb4..d5c15863 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00002.png and b/tests_zemu/snapshots/sp-sign_basic/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00003.png b/tests_zemu/snapshots/sp-sign_basic/00003.png
index 4e0f2906..b47dabb4 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00003.png and b/tests_zemu/snapshots/sp-sign_basic/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00004.png b/tests_zemu/snapshots/sp-sign_basic/00004.png
index a51f4624..4e0f2906 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00004.png and b/tests_zemu/snapshots/sp-sign_basic/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00005.png b/tests_zemu/snapshots/sp-sign_basic/00005.png
index 1e4be699..a51f4624 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00005.png and b/tests_zemu/snapshots/sp-sign_basic/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00006.png b/tests_zemu/snapshots/sp-sign_basic/00006.png
index 430a37e8..1e4be699 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic/00006.png and b/tests_zemu/snapshots/sp-sign_basic/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00007.png b/tests_zemu/snapshots/sp-sign_basic/00007.png
new file mode 100644
index 00000000..430a37e8
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_basic/00007.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
index b47dabb4..d5c15863 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00002.png 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
index 4e0f2906..b47dabb4 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00003.png 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
index a51f4624..4e0f2906 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00004.png 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
index 1e4be699..a51f4624 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00005.png 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
index 430a37e8..1e4be699 100644
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00006.png and b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00006.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00007.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00007.png
new file mode 100644
index 00000000..430a37e8
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00007.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.png
index 416afe49..47b645c3 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00001.png and b/tests_zemu/snapshots/st-mainmenu/00001.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00001.png b/tests_zemu/snapshots/st-sign_basic/00001.png
index d9c11af8..e3f499c1 100644
Binary files a/tests_zemu/snapshots/st-sign_basic/00001.png and b/tests_zemu/snapshots/st-sign_basic/00001.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00002.png b/tests_zemu/snapshots/st-sign_basic/00002.png
index 08c557da..ed9f206f 100644
Binary files a/tests_zemu/snapshots/st-sign_basic/00002.png and b/tests_zemu/snapshots/st-sign_basic/00002.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00003.png b/tests_zemu/snapshots/st-sign_basic/00003.png
index f384cce6..c78dbcd7 100644
Binary files a/tests_zemu/snapshots/st-sign_basic/00003.png and b/tests_zemu/snapshots/st-sign_basic/00003.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00004.png b/tests_zemu/snapshots/st-sign_basic/00004.png
index ba2e8a92..7da083e4 100644
Binary files a/tests_zemu/snapshots/st-sign_basic/00004.png and b/tests_zemu/snapshots/st-sign_basic/00004.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00005.png b/tests_zemu/snapshots/st-sign_basic/00005.png
new file mode 100644
index 00000000..ba2e8a92
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_basic/00005.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00001.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00001.png
index d9c11af8..e3f499c1 100644
Binary files a/tests_zemu/snapshots/st-sign_basic_extra_fields/00001.png and b/tests_zemu/snapshots/st-sign_basic_extra_fields/00001.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00002.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00002.png
index 08c557da..ed9f206f 100644
Binary files a/tests_zemu/snapshots/st-sign_basic_extra_fields/00002.png and b/tests_zemu/snapshots/st-sign_basic_extra_fields/00002.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00003.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00003.png
index f384cce6..c78dbcd7 100644
Binary files a/tests_zemu/snapshots/st-sign_basic_extra_fields/00003.png and b/tests_zemu/snapshots/st-sign_basic_extra_fields/00003.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00004.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00004.png
index ba2e8a92..7da083e4 100644
Binary files a/tests_zemu/snapshots/st-sign_basic_extra_fields/00004.png and b/tests_zemu/snapshots/st-sign_basic_extra_fields/00004.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00005.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00005.png
new file mode 100644
index 00000000..ba2e8a92
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_basic_extra_fields/00005.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index 7e2cf019..57e29fc4 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 7e2cf019..57e29fc4 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/00002.png b/tests_zemu/snapshots/x-sign_basic/00002.png
index 5a83f183..88e2d4c9 100644
Binary files a/tests_zemu/snapshots/x-sign_basic/00002.png and b/tests_zemu/snapshots/x-sign_basic/00002.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00003.png b/tests_zemu/snapshots/x-sign_basic/00003.png
index 88e82f3d..5a83f183 100644
Binary files a/tests_zemu/snapshots/x-sign_basic/00003.png and b/tests_zemu/snapshots/x-sign_basic/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00004.png b/tests_zemu/snapshots/x-sign_basic/00004.png
index a51f4624..88e82f3d 100644
Binary files a/tests_zemu/snapshots/x-sign_basic/00004.png and b/tests_zemu/snapshots/x-sign_basic/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00005.png b/tests_zemu/snapshots/x-sign_basic/00005.png
index 1e4be699..a51f4624 100644
Binary files a/tests_zemu/snapshots/x-sign_basic/00005.png and b/tests_zemu/snapshots/x-sign_basic/00005.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00006.png b/tests_zemu/snapshots/x-sign_basic/00006.png
index 430a37e8..1e4be699 100644
Binary files a/tests_zemu/snapshots/x-sign_basic/00006.png and b/tests_zemu/snapshots/x-sign_basic/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00007.png b/tests_zemu/snapshots/x-sign_basic/00007.png
new file mode 100644
index 00000000..430a37e8
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_basic/00007.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
index 5a83f183..88e2d4c9 100644
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00002.png 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
index 88e82f3d..5a83f183 100644
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00003.png 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
index a51f4624..88e82f3d 100644
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00004.png 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
index 1e4be699..a51f4624 100644
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00005.png 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
index 430a37e8..1e4be699 100644
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00006.png and b/tests_zemu/snapshots/x-sign_basic_extra_fields/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00007.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00007.png
new file mode 100644
index 00000000..430a37e8
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_basic_extra_fields/00007.png differ