diff --git a/tests/ragger/snapshots/flex/test_blind_sign_rejected/00002.png b/tests/ragger/snapshots/flex/test_blind_sign_rejected/00002.png
index cf3b20e5b..783bb5b6d 100644
Binary files a/tests/ragger/snapshots/flex/test_blind_sign_rejected/00002.png and b/tests/ragger/snapshots/flex/test_blind_sign_rejected/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_blind_sign_rejected/00003.png b/tests/ragger/snapshots/flex/test_blind_sign_rejected/00003.png
index 68b268c9f..fdf1457d2 100644
Binary files a/tests/ragger/snapshots/flex/test_blind_sign_rejected/00003.png and b/tests/ragger/snapshots/flex/test_blind_sign_rejected/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_blind_sign_signed/00002.png b/tests/ragger/snapshots/flex/test_blind_sign_signed/00002.png
index cf3b20e5b..783bb5b6d 100644
Binary files a/tests/ragger/snapshots/flex/test_blind_sign_signed/00002.png and b/tests/ragger/snapshots/flex/test_blind_sign_signed/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_blind_sign_signed/00003.png b/tests/ragger/snapshots/flex/test_blind_sign_signed/00003.png
index 68b268c9f..fdf1457d2 100644
Binary files a/tests/ragger/snapshots/flex/test_blind_sign_signed/00003.png and b/tests/ragger/snapshots/flex/test_blind_sign_signed/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/00011.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/00011.png
index cf3b20e5b..783bb5b6d 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/00011.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/00011.png differ
diff --git a/tests/ragger/snapshots/flex/test_sign_parameter_selector/00012.png b/tests/ragger/snapshots/flex/test_sign_parameter_selector/00012.png
index 68b268c9f..fdf1457d2 100644
Binary files a/tests/ragger/snapshots/flex/test_sign_parameter_selector/00012.png and b/tests/ragger/snapshots/flex/test_sign_parameter_selector/00012.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00002.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00002.png
index 0a6a82343..a6dd2f97d 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00002.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00003.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00003.png
index 04f6b02d7..c26bc5381 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00003.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00004.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00004.png
index 8a8c617ae..1c82aa59f 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00004.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00005.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00005.png
index 9f2651390..54014a23c 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00005.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00006.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00006.png
index 424902998..0a6a82343 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00006.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00007.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00007.png
index bb4b73f5c..04f6b02d7 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00007.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00008.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00008.png
index b7a5302cd..8a8c617ae 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00008.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00009.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00009.png
index cc968dc82..424902998 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00009.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00010.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00010.png
index 861f858ef..bb4b73f5c 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00010.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00011.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00011.png
index 9c7e7049c..b7a5302cd 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00011.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00011.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00012.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00012.png
index ce795f34e..cc968dc82 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00012.png and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00012.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00013.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00013.png
new file mode 100644
index 000000000..861f858ef
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00013.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00014.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00014.png
new file mode 100644
index 000000000..9c7e7049c
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00014.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00015.png b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00015.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_blind_sign_rejected/00015.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00002.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00002.png
index 0a6a82343..a6dd2f97d 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00002.png and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00002.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00003.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00003.png
index 04f6b02d7..c26bc5381 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00003.png and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00003.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00004.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00004.png
index 8a8c617ae..1c82aa59f 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00004.png and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00004.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00005.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00005.png
index 9f2651390..54014a23c 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00005.png and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00005.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00006.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00006.png
index 424902998..0a6a82343 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00006.png and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00006.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00007.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00007.png
index bb4b73f5c..04f6b02d7 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00007.png and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00007.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00008.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00008.png
index b7a5302cd..8a8c617ae 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00008.png and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00008.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00009.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00009.png
index cc968dc82..424902998 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00009.png and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00009.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00010.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00010.png
index 861f858ef..bb4b73f5c 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00010.png and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00010.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00011.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00011.png
index ce795f34e..b7a5302cd 100644
Binary files a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00011.png and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00011.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00012.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00012.png
new file mode 100644
index 000000000..cc968dc82
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00012.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00013.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00013.png
new file mode 100644
index 000000000..861f858ef
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00013.png differ
diff --git a/tests/ragger/snapshots/nanos/test_blind_sign_signed/00014.png b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00014.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_blind_sign_signed/00014.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00014.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00014.png
index 0a6a82343..a6dd2f97d 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00014.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00014.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00015.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00015.png
index 04f6b02d7..c26bc5381 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00015.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00015.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00016.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00016.png
index 8a8c617ae..1c82aa59f 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00016.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00016.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00017.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00017.png
index 9f2651390..54014a23c 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00017.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00017.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00018.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00018.png
index 424902998..0a6a82343 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00018.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00018.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00019.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00019.png
index bb4b73f5c..04f6b02d7 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00019.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00019.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00020.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00020.png
index b7a5302cd..8a8c617ae 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00020.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00020.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00021.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00021.png
index cc968dc82..424902998 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00021.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00021.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00022.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00022.png
index 861f858ef..bb4b73f5c 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00022.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00022.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00023.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00023.png
index ce795f34e..b7a5302cd 100644
Binary files a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00023.png and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00023.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00024.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00024.png
new file mode 100644
index 000000000..cc968dc82
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00024.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00025.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00025.png
new file mode 100644
index 000000000..861f858ef
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00025.png differ
diff --git a/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00026.png b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00026.png
new file mode 100644
index 000000000..ce795f34e
Binary files /dev/null and b/tests/ragger/snapshots/nanos/test_sign_parameter_selector/00026.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00002.png b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00002.png
index 1ac2ab077..07995577f 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00002.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00003.png b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00003.png
index cdcc19d05..5ba4dadb0 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00003.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00004.png b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00004.png
index d704566c0..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00004.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00005.png b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00005.png
index 4eaf73596..d704566c0 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00005.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00006.png b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00006.png
index c753939d8..4eaf73596 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00006.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00007.png b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00007.png
index c4c84cf4c..c753939d8 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00007.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00008.png b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00008.png
index a58590b98..c4c84cf4c 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00008.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00009.png b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00009.png
new file mode 100644
index 000000000..a58590b98
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_blind_sign_rejected/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00002.png b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00002.png
index 1ac2ab077..07995577f 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00002.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00003.png b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00003.png
index cdcc19d05..5ba4dadb0 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00003.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00004.png b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00004.png
index d704566c0..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00004.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00005.png b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00005.png
index 4eaf73596..d704566c0 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00005.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00005.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00006.png b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00006.png
index c753939d8..4eaf73596 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00006.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00006.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00007.png b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00007.png
index a58590b98..c753939d8 100644
Binary files a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00007.png and b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00008.png b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00008.png
new file mode 100644
index 000000000..a58590b98
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_blind_sign_signed/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00011.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00011.png
index 1ac2ab077..07995577f 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00011.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00011.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00012.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00012.png
index cdcc19d05..5ba4dadb0 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00012.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00012.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00013.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00013.png
index d704566c0..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00013.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00013.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00014.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00014.png
index 4eaf73596..d704566c0 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00014.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00014.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00015.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00015.png
index c753939d8..4eaf73596 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00015.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00015.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00016.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00016.png
index a58590b98..c753939d8 100644
Binary files a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00016.png and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00016.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00017.png b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00017.png
new file mode 100644
index 000000000..a58590b98
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_sign_parameter_selector/00017.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00002.png b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00002.png
index 1ac2ab077..07995577f 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00002.png and b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00003.png b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00003.png
index cdcc19d05..5ba4dadb0 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00003.png and b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00004.png b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00004.png
index d704566c0..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00004.png and b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00005.png b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00005.png
index 4eaf73596..d704566c0 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00005.png and b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00006.png b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00006.png
index c753939d8..4eaf73596 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00006.png and b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00007.png b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00007.png
index c4c84cf4c..c753939d8 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00007.png and b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00008.png b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00008.png
index a58590b98..c4c84cf4c 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00008.png and b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00009.png b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00009.png
new file mode 100644
index 000000000..a58590b98
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_blind_sign_rejected/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00002.png b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00002.png
index 1ac2ab077..07995577f 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00002.png and b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00003.png b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00003.png
index cdcc19d05..5ba4dadb0 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00003.png and b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00004.png b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00004.png
index d704566c0..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00004.png and b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00005.png b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00005.png
index 4eaf73596..d704566c0 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00005.png and b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00005.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00006.png b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00006.png
index c753939d8..4eaf73596 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00006.png and b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00006.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00007.png b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00007.png
index a58590b98..c753939d8 100644
Binary files a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00007.png and b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/test_blind_sign_signed/00008.png b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00008.png
new file mode 100644
index 000000000..a58590b98
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_blind_sign_signed/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00011.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00011.png
index 1ac2ab077..07995577f 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00011.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00011.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00012.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00012.png
index cdcc19d05..5ba4dadb0 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00012.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00012.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00013.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00013.png
index d704566c0..1ac2ab077 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00013.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00013.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00014.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00014.png
index 4eaf73596..d704566c0 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00014.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00014.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00015.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00015.png
index c753939d8..4eaf73596 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00015.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00015.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00016.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00016.png
index a58590b98..c753939d8 100644
Binary files a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00016.png and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00016.png differ
diff --git a/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00017.png b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00017.png
new file mode 100644
index 000000000..a58590b98
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_sign_parameter_selector/00017.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00001.png b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00001.png
index d1b475b4c..e993bf998 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00001.png and b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00002.png b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00002.png
index 83bb1fee0..648b561d1 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00002.png and b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00003.png b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00003.png
index aaf64ddf9..fcccc77df 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00003.png and b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00004.png b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00004.png
index abc9677f7..3c89d74c4 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00004.png and b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00005.png b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00005.png
index 2b6697001..abc9677f7 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00005.png and b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00005.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_rejected/00006.png b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00006.png
new file mode 100644
index 000000000..2b6697001
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_blind_sign_rejected/00006.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00001.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00001.png
index d1b475b4c..e993bf998 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_signed/00001.png and b/tests/ragger/snapshots/stax/test_blind_sign_signed/00001.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00002.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00002.png
index 83bb1fee0..648b561d1 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_signed/00002.png and b/tests/ragger/snapshots/stax/test_blind_sign_signed/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00003.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00003.png
index aaf64ddf9..fcccc77df 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_signed/00003.png and b/tests/ragger/snapshots/stax/test_blind_sign_signed/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00004.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00004.png
index 392165d4f..3c89d74c4 100644
Binary files a/tests/ragger/snapshots/stax/test_blind_sign_signed/00004.png and b/tests/ragger/snapshots/stax/test_blind_sign_signed/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_blind_sign_signed/00005.png b/tests/ragger/snapshots/stax/test_blind_sign_signed/00005.png
new file mode 100644
index 000000000..392165d4f
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_blind_sign_signed/00005.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00010.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00010.png
index d1b475b4c..e993bf998 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00010.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00010.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00011.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00011.png
index 83bb1fee0..648b561d1 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00011.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00011.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00012.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00012.png
index aaf64ddf9..fcccc77df 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00012.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00012.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00013.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00013.png
index 392165d4f..3c89d74c4 100644
Binary files a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00013.png and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00013.png differ
diff --git a/tests/ragger/snapshots/stax/test_sign_parameter_selector/00014.png b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00014.png
new file mode 100644
index 000000000..392165d4f
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_sign_parameter_selector/00014.png differ
diff --git a/tests/ragger/test_blind_sign.py b/tests/ragger/test_blind_sign.py
index cb2568718..99fb59d33 100644
--- a/tests/ragger/test_blind_sign.py
+++ b/tests/ragger/test_blind_sign.py
@@ -51,8 +51,7 @@ def common_tx_params() -> dict:
     }
 
 
-# Token approval, would require loading the "internal plugin" &
-# providing the token metadata from the CAL
+# Token approval, would require providing the token metadata from the CAL
 def test_blind_sign(firmware: Firmware,
                     backend: BackendInterface,
                     navigator: Navigator,
@@ -81,12 +80,29 @@ def test_blind_sign(firmware: Firmware,
                 # blind signing warning
                 moves += [NavInsID.RIGHT_CLICK]
 
-                # review | from | amount | to | fees
-                moves += [NavInsID.RIGHT_CLICK] * 5
+                # review
+                moves += [NavInsID.RIGHT_CLICK]
 
+                # tx hash
                 if firmware == Firmware.NANOS:
-                    # for the two addresses
                     moves += [NavInsID.RIGHT_CLICK] * 4
+                else:
+                    moves += [NavInsID.RIGHT_CLICK] * 2
+
+                # from
+                if firmware == Firmware.NANOS:
+                    moves += [NavInsID.RIGHT_CLICK] * 3
+                else:
+                    moves += [NavInsID.RIGHT_CLICK]
+
+                # to
+                if firmware == Firmware.NANOS:
+                    moves += [NavInsID.RIGHT_CLICK] * 3
+                else:
+                    moves += [NavInsID.RIGHT_CLICK]
+
+                # fees
+                moves += [NavInsID.RIGHT_CLICK]
 
                 if not sign:
                     moves += [NavInsID.RIGHT_CLICK]
@@ -95,10 +111,7 @@ def test_blind_sign(firmware: Firmware,
             else:
                 moves += [NavInsID.USE_CASE_CHOICE_REJECT]
 
-                if firmware == Firmware.STAX:
-                    moves += [NavInsID.SWIPE_CENTER_TO_LEFT] * 2
-                else:
-                    moves += [NavInsID.SWIPE_CENTER_TO_LEFT] * 3
+                moves += [NavInsID.SWIPE_CENTER_TO_LEFT] * 3
 
                 if sign:
                     moves += [NavInsID.USE_CASE_REVIEW_CONFIRM]
@@ -171,21 +184,18 @@ def test_sign_parameter_selector(firmware: Firmware,
                 moves += [NavInsID.RIGHT_CLICK] * 4 + [NavInsID.BOTH_CLICK]
                 # parameter 2
                 moves += [NavInsID.RIGHT_CLICK] * 3 + [NavInsID.BOTH_CLICK]
-                # blind signing | review | from | amount | to | fees
-                moves += [NavInsID.RIGHT_CLICK] * 10
+                # blind signing | review | tx hash | from | to | fees
+                moves += [NavInsID.RIGHT_CLICK] * 13
             else:
                 # (verify | parameter) * flows
                 moves += ([NavInsID.RIGHT_CLICK] * 2 + [NavInsID.BOTH_CLICK]) * params
                 # blind signing | review | from | amount | to | fees
-                moves += [NavInsID.RIGHT_CLICK] * 6
+                moves += [NavInsID.RIGHT_CLICK] * 7
             moves += [NavInsID.BOTH_CLICK]
         else:
             moves += ([NavInsID.SWIPE_CENTER_TO_LEFT] * 2 + [NavInsID.USE_CASE_REVIEW_CONFIRM]) * (1 + params)
             moves += [NavInsID.USE_CASE_CHOICE_REJECT]
-            if firmware == Firmware.STAX:
-                tap_number = 2
-            else:
-                tap_number = 3
+            tap_number = 3
             moves += [NavInsID.SWIPE_CENTER_TO_LEFT] * tap_number
             moves += [NavInsID.USE_CASE_REVIEW_CONFIRM]
         navigator.navigate_and_compare(default_screenshot_path,