diff --git a/app/src/parser/operation_parser.c b/app/src/parser/operation_parser.c
index c61c840a1..f4804c5cc 100644
--- a/app/src/parser/operation_parser.c
+++ b/app/src/parser/operation_parser.c
@@ -116,7 +116,7 @@ TZ_OPERATION_FIELDS(transaction_fields,
     TZ_OPERATION_OPTION_FIELD("_Parameters",
         TZ_OPERATION_TUPLE_FIELD("_Parameters",
             TZ_OPERATION_FIELD("Entrypoint", TZ_OPERATION_FIELD_SMART_ENTRYPOINT, .complex=true),
-            TZ_OPERATION_FIELD("Parameter",  TZ_OPERATION_FIELD_EXPR)),
+            TZ_OPERATION_FIELD("Parameter",  TZ_OPERATION_FIELD_EXPR,             .complex=true)),
         .display_none=false)
 );
 
diff --git a/tests/generate/gen_integration.ml b/tests/generate/gen_integration.ml
index 129ac7cd1..053011190 100644
--- a/tests/generate/gen_integration.ml
+++ b/tests/generate/gen_integration.ml
@@ -279,8 +279,9 @@ let operation_to_screens
           then []
           else
             [
-              need_expert_mode_screen "Parameter";
+              need_expert_mode_screen "Entrypoint";
               make_screen ~title:"Entrypoint" "%a" Entrypoint.pp entrypoint;
+              need_expert_mode_screen "Parameter";
               make_screen ~title:"Parameter" "%a" pp_lazy_expr parameters;
             ]
         in
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00011.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00011.png
index c6158a7d2..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00011.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00012.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00012.png
index aba10d4bb..c6158a7d2 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00012.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00013.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00013.png
index a1d031e41..aba10d4bb 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00013.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00014.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00014.png
index 51e439646..a1d031e41 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00014.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00015.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00015.png
index 81da78627..51e439646 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00015.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00016.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00016.png
index b3c17e476..81da78627 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00016.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00016.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00017.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00017.png
index 373118412..b3c17e476 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00017.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00017.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00018.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00018.png
index 7069eac66..373118412 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00018.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00018.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00019.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00019.png
index fd00c319c..7069eac66 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00019.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00019.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00020.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00020.png
index 529129a7a..fd00c319c 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00020.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00020.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00021.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00021.png
index ea0f2a1b8..529129a7a 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00021.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00021.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00022.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00022.png
index f9c016fd8..ea0f2a1b8 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00022.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00022.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00023.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00023.png
index 3ed39eca9..f9c016fd8 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00023.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00023.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00024.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00024.png
index a1a29a201..3ed39eca9 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00024.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00024.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00025.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00025.png
index a73970865..a1a29a201 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00025.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00025.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00026.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00026.png
index 0778ddec0..a73970865 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00026.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00026.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00027.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00027.png
index dd15dbb89..0778ddec0 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00027.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00027.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00028.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00028.png
index ed77b440e..dd15dbb89 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00028.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00028.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00029.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00029.png
index f12d6df32..ed77b440e 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00029.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00029.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00030.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00030.png
index e67c683e4..f12d6df32 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00030.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00030.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00031.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00031.png
index 4027411b7..e67c683e4 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00031.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00031.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00032.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00032.png
index c3151dcff..4027411b7 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00032.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00032.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00033.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00033.png
index 433736555..c3151dcff 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00033.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00033.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00034.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00034.png
index 6d76960ef..433736555 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00034.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00034.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00035.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00035.png
index 7e0e23820..6d76960ef 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00035.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00035.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00036.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00036.png
new file mode 100644
index 000000000..7e0e23820
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00036.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00011.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00011.png
index de32f3ce0..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00011.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00012.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00012.png
index d1f0c52d8..de32f3ce0 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00012.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00013.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00013.png
index 9068ab50d..d1f0c52d8 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00013.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00014.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00014.png
index ca3d99817..9068ab50d 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00014.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00015.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00015.png
index caae0be86..ca3d99817 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00015.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00016.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00016.png
index 53b2eab90..caae0be86 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00016.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00016.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00017.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00017.png
index f20965b93..53b2eab90 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00017.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00017.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00018.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00018.png
index 91ba67e9d..f20965b93 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00018.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00018.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00019.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00019.png
index e2e233f01..91ba67e9d 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00019.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00019.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00020.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00020.png
index 972f178b3..e2e233f01 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00020.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00020.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00021.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00021.png
index 083033d45..972f178b3 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00021.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00021.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00022.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00022.png
index 9c2054a60..083033d45 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00022.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00022.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00023.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00023.png
index 08b20a837..9c2054a60 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00023.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00023.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00024.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00024.png
index afa9173a2..08b20a837 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00024.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00024.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00025.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00025.png
index 7226a9e23..afa9173a2 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00025.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00025.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00026.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00026.png
index dc7f9b18a..7226a9e23 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00026.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00026.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00027.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00027.png
index 182640db4..dc7f9b18a 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00027.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00027.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00028.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00028.png
index f13eb25ed..182640db4 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00028.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00028.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00029.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00029.png
index 37c456b81..f13eb25ed 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00029.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00029.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00030.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00030.png
index 873a1b0ad..37c456b81 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00030.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00030.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00031.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00031.png
index 7e0e23820..873a1b0ad 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00031.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00031.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00032.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00032.png
new file mode 100644
index 000000000..7e0e23820
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00032.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00011.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00011.png
index 6f75a6599..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00011.png and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00012.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00012.png
index 9fefcab8d..6f75a6599 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00012.png and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00013.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00013.png
index 180bf33b7..9fefcab8d 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00013.png and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00014.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00014.png
index fda55f501..180bf33b7 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00014.png and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00015.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00015.png
new file mode 100644
index 000000000..fda55f501
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00011.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00011.png
index de32f3ce0..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00011.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00012.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00012.png
index d1f0c52d8..de32f3ce0 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00012.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00013.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00013.png
index 9068ab50d..d1f0c52d8 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00013.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00014.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00014.png
index ca3d99817..9068ab50d 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00014.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00015.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00015.png
index caae0be86..ca3d99817 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00015.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00016.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00016.png
index 53b2eab90..caae0be86 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00016.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00016.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00017.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00017.png
index f20965b93..53b2eab90 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00017.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00017.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00018.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00018.png
index 91ba67e9d..f20965b93 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00018.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00018.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00019.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00019.png
index e2e233f01..91ba67e9d 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00019.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00019.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00020.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00020.png
index 972f178b3..e2e233f01 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00020.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00020.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00021.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00021.png
index 083033d45..972f178b3 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00021.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00021.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00022.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00022.png
index 9c2054a60..083033d45 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00022.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00022.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00023.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00023.png
index 08b20a837..9c2054a60 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00023.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00023.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00024.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00024.png
index afa9173a2..08b20a837 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00024.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00024.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00025.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00025.png
index 7226a9e23..afa9173a2 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00025.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00025.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00026.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00026.png
index dc7f9b18a..7226a9e23 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00026.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00026.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00027.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00027.png
index 182640db4..dc7f9b18a 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00027.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00027.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00028.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00028.png
index f13eb25ed..182640db4 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00028.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00028.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00029.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00029.png
index 37c456b81..f13eb25ed 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00029.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00029.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00030.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00030.png
index 873a1b0ad..37c456b81 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00030.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00030.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00031.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00031.png
index 7e0e23820..873a1b0ad 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00031.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00031.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00032.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00032.png
index 970b15944..7e0e23820 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00032.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00032.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00033.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00033.png
new file mode 100644
index 000000000..970b15944
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00033.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00011.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00011.png
index de32f3ce0..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00011.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00012.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00012.png
index d1f0c52d8..de32f3ce0 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00012.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00013.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00013.png
index 9068ab50d..d1f0c52d8 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00013.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00014.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00014.png
index ca3d99817..9068ab50d 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00014.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00015.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00015.png
index caae0be86..ca3d99817 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00015.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00016.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00016.png
index 53b2eab90..caae0be86 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00016.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00016.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00017.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00017.png
index f20965b93..53b2eab90 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00017.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00017.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00018.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00018.png
index 91ba67e9d..f20965b93 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00018.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00018.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00019.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00019.png
index e2e233f01..91ba67e9d 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00019.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00019.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00020.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00020.png
index 972f178b3..e2e233f01 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00020.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00020.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00021.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00021.png
index 083033d45..972f178b3 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00021.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00021.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00022.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00022.png
index 9c2054a60..083033d45 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00022.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00022.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00023.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00023.png
index 08b20a837..9c2054a60 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00023.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00023.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00024.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00024.png
index afa9173a2..08b20a837 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00024.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00024.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00025.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00025.png
index 7226a9e23..afa9173a2 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00025.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00025.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00026.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00026.png
index dc7f9b18a..7226a9e23 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00026.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00026.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00027.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00027.png
index 182640db4..dc7f9b18a 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00027.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00027.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00028.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00028.png
index f13eb25ed..182640db4 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00028.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00028.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00029.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00029.png
index 37c456b81..f13eb25ed 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00029.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00029.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00030.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00030.png
index 873a1b0ad..37c456b81 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00030.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00030.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00031.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00031.png
index 7e0e23820..873a1b0ad 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00031.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00031.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00032.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00032.png
index 970b15944..7e0e23820 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00032.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00032.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00033.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00033.png
new file mode 100644
index 000000000..970b15944
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00033.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/00011.png
index 6f75a6599..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00011.png and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00012.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/00012.png
index 7e0e23820..6f75a6599 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00012.png and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00013.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/00013.png
new file mode 100644
index 000000000..7e0e23820
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00011.png
index 6f75a6599..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00011.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00012.png b/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00012.png
index 7e0e23820..6f75a6599 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00012.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00013.png b/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00013.png
new file mode 100644
index 000000000..7e0e23820
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00012.png b/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00012.png
index 1463263ef..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00012.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00013.png b/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00013.png
index 7e0e23820..1463263ef 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00013.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00014.png b/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00014.png
new file mode 100644
index 000000000..7e0e23820
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00011.png
index 6f75a6599..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00011.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00012.png b/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00012.png
index 7e0e23820..6f75a6599 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00012.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00013.png b/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00013.png
new file mode 100644
index 000000000..7e0e23820
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00009.png b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00009.png
index 431986c71..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00009.png and b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00010.png b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00010.png
index 1acb7d563..431986c71 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00010.png and b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00011.png b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00011.png
index d5afcef1b..1acb7d563 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00011.png and b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00012.png b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00012.png
index 85edb568e..d5afcef1b 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00012.png and b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00013.png b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00013.png
index 8b3b3b148..85edb568e 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00013.png and b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00014.png b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00014.png
index 471324463..8b3b3b148 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00014.png and b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00015.png b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00015.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00009.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00009.png
index c3d918032..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00009.png and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00010.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00010.png
index 393a15fb7..c3d918032 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00010.png and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00011.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00011.png
index 551255b14..393a15fb7 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00011.png and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00012.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00012.png
index 363848ba0..551255b14 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00012.png and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00013.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00013.png
new file mode 100644
index 000000000..363848ba0
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00009.png b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00009.png
index 431986c71..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00009.png and b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00010.png b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00010.png
index 1acb7d563..431986c71 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00010.png and b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00011.png b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00011.png
index d5afcef1b..1acb7d563 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00011.png and b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00012.png b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00012.png
index 85edb568e..d5afcef1b 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00012.png and b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00013.png b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00013.png
index 8b3b3b148..85edb568e 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00013.png and b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00014.png b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00014.png
index 471324463..8b3b3b148 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00014.png and b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00015.png b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00015.png
index 137ca9e49..471324463 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00015.png and b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00016.png b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00016.png
new file mode 100644
index 000000000..137ca9e49
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00016.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00009.png b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00009.png
index 431986c71..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00009.png and b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00010.png b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00010.png
index 1acb7d563..431986c71 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00010.png and b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00011.png b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00011.png
index d5afcef1b..1acb7d563 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00011.png and b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00012.png b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00012.png
index 85edb568e..d5afcef1b 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00012.png and b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00013.png b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00013.png
index 8b3b3b148..85edb568e 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00013.png and b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00014.png b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00014.png
index 471324463..8b3b3b148 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00014.png and b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00015.png b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00015.png
index 137ca9e49..471324463 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00015.png and b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00016.png b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00016.png
new file mode 100644
index 000000000..137ca9e49
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00016.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00009.png
index c3d918032..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00009.png and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00010.png
index 471324463..c3d918032 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00010.png and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00011.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00009.png
index c3d918032..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00009.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00010.png
index 471324463..c3d918032 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00010.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00011.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00009.png
index e9cbcd7e7..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00009.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00010.png
index 471324463..e9cbcd7e7 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00010.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00011.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00009.png
index c3d918032..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00009.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00010.png
index 471324463..c3d918032 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00010.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00011.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00009.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00009.png
index afb2b8618..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00009.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00010.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00010.png
index f45f45fbe..afb2b8618 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00010.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00011.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00011.png
index c1e704a2d..f45f45fbe 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00011.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00012.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00012.png
index 6fb484ac5..c1e704a2d 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00012.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00013.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00013.png
index 2f514b48f..6fb484ac5 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00013.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00014.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00014.png
index 4c6054eae..2f514b48f 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00014.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00015.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00015.png
index db7c22e31..4c6054eae 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00015.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00016.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00016.png
index 914563b11..db7c22e31 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00016.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00016.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00017.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00017.png
index fb4e79186..914563b11 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00017.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00017.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00018.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00018.png
index 43c85f24d..fb4e79186 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00018.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00018.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00019.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00019.png
index 471324463..43c85f24d 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00019.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00019.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00020.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00020.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00020.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00009.png b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00009.png
index 431986c71..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00009.png and b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00010.png b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00010.png
index 1acb7d563..431986c71 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00010.png and b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00011.png b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00011.png
index d5afcef1b..1acb7d563 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00011.png and b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00012.png b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00012.png
index 85edb568e..d5afcef1b 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00012.png and b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00013.png b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00013.png
index 8b3b3b148..85edb568e 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00013.png and b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00014.png b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00014.png
index 471324463..8b3b3b148 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00014.png and b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00015.png b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00015.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00009.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00009.png
index c3d918032..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00009.png and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00010.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00010.png
index 393a15fb7..c3d918032 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00010.png and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00011.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00011.png
index 551255b14..393a15fb7 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00011.png and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00012.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00012.png
index 363848ba0..551255b14 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00012.png and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00013.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00013.png
new file mode 100644
index 000000000..363848ba0
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00009.png b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00009.png
index 431986c71..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00009.png and b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00010.png b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00010.png
index 1acb7d563..431986c71 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00010.png and b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00011.png b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00011.png
index d5afcef1b..1acb7d563 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00011.png and b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00012.png b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00012.png
index 85edb568e..d5afcef1b 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00012.png and b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00013.png b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00013.png
index 8b3b3b148..85edb568e 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00013.png and b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00014.png b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00014.png
index 471324463..8b3b3b148 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00014.png and b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00015.png b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00015.png
index 137ca9e49..471324463 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00015.png and b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00016.png b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00016.png
new file mode 100644
index 000000000..137ca9e49
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00016.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00009.png b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00009.png
index 431986c71..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00009.png and b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00010.png b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00010.png
index 1acb7d563..431986c71 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00010.png and b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00011.png b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00011.png
index d5afcef1b..1acb7d563 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00011.png and b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00012.png b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00012.png
index 85edb568e..d5afcef1b 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00012.png and b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00013.png b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00013.png
index 8b3b3b148..85edb568e 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00013.png and b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00014.png b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00014.png
index 471324463..8b3b3b148 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00014.png and b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00015.png b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00015.png
index 137ca9e49..471324463 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00015.png and b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00015.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00016.png b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00016.png
new file mode 100644
index 000000000..137ca9e49
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00016.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/00009.png
index c3d918032..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00009.png and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00010.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/00010.png
index 471324463..c3d918032 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00010.png and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00011.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/00011.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00009.png
index c3d918032..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00009.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00010.png b/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00010.png
index 471324463..c3d918032 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00010.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00011.png b/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00011.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00009.png
index e9cbcd7e7..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00009.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00010.png b/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00010.png
index 471324463..e9cbcd7e7 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00010.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00011.png b/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00011.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00009.png
index c3d918032..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00009.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00010.png b/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00010.png
index 471324463..c3d918032 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00010.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00011.png b/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00011.png
new file mode 100644
index 000000000..471324463
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00011.png differ
diff --git a/tests/integration/stax/snapshots/test_blindsign_valid/tst_review_003.png b/tests/integration/stax/snapshots/test_blindsign_valid/tst_review_003.png
index 2c6fd401c..93af184c9 100644
Binary files a/tests/integration/stax/snapshots/test_blindsign_valid/tst_review_003.png and b/tests/integration/stax/snapshots/test_blindsign_valid/tst_review_003.png differ
diff --git a/tests/integration/stax/snapshots/test_blindsign_valid/tst_review_004.png b/tests/integration/stax/snapshots/test_blindsign_valid/tst_review_004.png
new file mode 100644
index 000000000..afb0c5601
Binary files /dev/null and b/tests/integration/stax/snapshots/test_blindsign_valid/tst_review_004.png differ
diff --git a/tests/integration/stax/snapshots/test_parsing_errors/tpe_review_0_03_full.png b/tests/integration/stax/snapshots/test_parsing_errors/tpe_review_0_03_full.png
index 2c6fd401c..93af184c9 100644
Binary files a/tests/integration/stax/snapshots/test_parsing_errors/tpe_review_0_03_full.png and b/tests/integration/stax/snapshots/test_parsing_errors/tpe_review_0_03_full.png differ
diff --git a/tests/integration/stax/snapshots/test_parsing_errors/tpe_review_0_04_full.png b/tests/integration/stax/snapshots/test_parsing_errors/tpe_review_0_04_full.png
new file mode 100644
index 000000000..afb0c5601
Binary files /dev/null and b/tests/integration/stax/snapshots/test_parsing_errors/tpe_review_0_04_full.png differ
diff --git a/tests/integration/stax/snapshots/test_sign_transfer/tst_review_003.png b/tests/integration/stax/snapshots/test_sign_transfer/tst_review_003.png
index 2c6fd401c..93af184c9 100644
Binary files a/tests/integration/stax/snapshots/test_sign_transfer/tst_review_003.png and b/tests/integration/stax/snapshots/test_sign_transfer/tst_review_003.png differ
diff --git a/tests/integration/stax/snapshots/test_sign_transfer/tst_review_004.png b/tests/integration/stax/snapshots/test_sign_transfer/tst_review_004.png
new file mode 100644
index 000000000..afb0c5601
Binary files /dev/null and b/tests/integration/stax/snapshots/test_sign_transfer/tst_review_004.png differ
diff --git a/tests/integration/stax/snapshots/test_sign_transfer_without_hash/review_2.png b/tests/integration/stax/snapshots/test_sign_transfer_without_hash/review_2.png
index 2c6fd401c..93af184c9 100644
Binary files a/tests/integration/stax/snapshots/test_sign_transfer_without_hash/review_2.png and b/tests/integration/stax/snapshots/test_sign_transfer_without_hash/review_2.png differ
diff --git a/tests/integration/stax/snapshots/test_sign_transfer_without_hash/review_3.png b/tests/integration/stax/snapshots/test_sign_transfer_without_hash/review_3.png
new file mode 100644
index 000000000..afb0c5601
Binary files /dev/null and b/tests/integration/stax/snapshots/test_sign_transfer_without_hash/review_3.png differ
diff --git a/tests/integration/stax/test_blindsign_valid.py b/tests/integration/stax/test_blindsign_valid.py
index 874026d97..de2465e03 100755
--- a/tests/integration/stax/test_blindsign_valid.py
+++ b/tests/integration/stax/test_blindsign_valid.py
@@ -55,6 +55,10 @@
     app.review.tap()
     app.assert_screen("tst_review_003")
     app.review.tap()
+    app.assert_screen("expert_mode_splash")
+    app.review.tap()
+    app.assert_screen("tst_review_004")
+    app.review.tap()
     app.assert_screen("operation_sign")
 
     expected_apdu = "f6d5fa0e79cac216e25104938ac873ca17ee9d7f06763719293b413cf2ed475cf63d045a1cc9f73eee5775c5d496fa9d3aa9ae57fb97217f746a8728639795b7b2220e84ce5759ed111399ea3263d810c230d6a4fffcb6e82797c5ca673a17089000"
diff --git a/tests/integration/stax/test_parsing_errors.py b/tests/integration/stax/test_parsing_errors.py
index a758024d1..36d7d4fa6 100755
--- a/tests/integration/stax/test_parsing_errors.py
+++ b/tests/integration/stax/test_parsing_errors.py
@@ -61,6 +61,10 @@
     app.review.tap()
     app.assert_screen("tpe_review_0_03_full")
     app.review.tap()
+    app.assert_screen("expert_mode_splash")
+    app.review.tap()
+    app.assert_screen("tpe_review_0_04_full")
+    app.review.tap()
 
     verify_err_reject_response(app, "invalid_tag")
 
diff --git a/tests/integration/stax/test_sign_transfer.py b/tests/integration/stax/test_sign_transfer.py
index 89bce1dfd..c1bcc73bd 100755
--- a/tests/integration/stax/test_sign_transfer.py
+++ b/tests/integration/stax/test_sign_transfer.py
@@ -47,6 +47,12 @@
     app.review.tap()
     app.assert_screen("tst_review_003")
 
+    app.review.tap()
+    app.assert_screen("tst_expert_splash")
+
+    app.review.tap()
+    app.assert_screen("tst_review_004")
+
     app.review.tap()
     app.assert_screen("operation_sign")
 
@@ -75,6 +81,12 @@
     app.review.tap()
     app.assert_screen("tst_review_003")
 
+    app.review.tap()
+    app.assert_screen("tst_expert_splash")
+
+    app.review.tap()
+    app.assert_screen("tst_review_004")
+
     app.review.tap()
     app.assert_screen("operation_sign")
 
diff --git a/tests/integration/stax/test_sign_transfer_without_hash.py b/tests/integration/stax/test_sign_transfer_without_hash.py
index 0804261c4..41840b07c 100755
--- a/tests/integration/stax/test_sign_transfer_without_hash.py
+++ b/tests/integration/stax/test_sign_transfer_without_hash.py
@@ -44,6 +44,12 @@
     app.review.tap()
     app.assert_screen("review_2")
 
+    app.review.tap()
+    app.assert_screen("expert_mode_splash")
+
+    app.review.tap()
+    app.assert_screen("review_3")
+
     app.review.tap()
     app.assert_screen("operation_sign")
 
diff --git a/tests/unit/ctest/tests_parser.c b/tests/unit/ctest/tests_parser.c
index 4e8e5c95b..21f1a65ec 100644
--- a/tests/unit/ctest/tests_parser.c
+++ b/tests/unit/ctest/tests_parser.c
@@ -234,6 +234,7 @@ CTEST2(operation_parser, check_simple_transaction_complexity)
         {"Storage limit", false, 3},
         {"Amount",        false, 4},
         {"Destination",   false, 5},
+ //     {"Option",        _,     6},
     };
     check_field_complexity(data, str, fields_check, sizeof(fields_check));
 }
@@ -250,8 +251,10 @@ CTEST2(operation_parser, check_transaction_complexity)
         {"Storage limit", false, 3},
         {"Amount",        false, 4},
         {"Destination",   false, 5},
-        {"Entrypoint",    true,  6},
-        {"Parameter",     true,  6},
+ //     {"Option",        _,     6},
+  //    {"Tuple",         _,     7},
+        {"Entrypoint",    true,  8},
+        {"Parameter",     true,  9},
     };
     check_field_complexity(data, str, fields_check, sizeof(fields_check));
 }
@@ -270,14 +273,16 @@ CTEST2(operation_parser, check_double_transaction_complexity)
         {"Storage limit", false, 3 },
         {"Amount",        false, 4 },
         {"Destination",   false, 5 },
- // {"None"     ,   false, 6 },
+ //     {"Option",        _,     6 },
         {"Source",        false, 7 },
         {"Fee",           false, 8 },
         {"Storage limit", false, 9 },
         {"Amount",        false, 10},
         {"Destination",   false, 11},
-        {"Entrypoint",    true,  12},
-        {"Parameter",     true,  12},
+ //     {"Option",        _,     12},
+  //    {"Tuple",         _,     13},
+        {"Entrypoint",    true,  14},
+        {"Parameter",     true,  15},
     };
     check_field_complexity(data, str, fields_check, sizeof(fields_check));
 }
@@ -293,7 +298,7 @@ CTEST2(operation_parser, check_origination_complexity)
         {"Fee",           false, 2},
         {"Storage limit", false, 3},
         {"Balance",       false, 4},
-        {"Delegate",      false, 5},
+        {"Delegate",      false, 5}, // None
         {"Code",          true,  6},
         {"Storage",       true,  7},
     };
@@ -310,7 +315,8 @@ CTEST2(operation_parser, check_delegation_complexity)
         {"Source",        false, 1},
         {"Fee",           false, 2},
         {"Storage limit", false, 3},
-        {"Delegate",      false, 4},
+ //     {"Option",        _,     4},
+        {"Delegate",      false, 5},
     };
     check_field_complexity(data, str, fields_check, sizeof(fields_check));
 }
@@ -330,7 +336,7 @@ CTEST2(operation_parser, check_register_global_constant_complexity)
     check_field_complexity(data, str, fields_check, sizeof(fields_check));
 }
 
-CTEST2(operation_parser, check_set_deposit_limite_complexity)
+CTEST2(operation_parser, check_set_deposit_limit_complexity)
 {
     char str[]
         = "030000000000000000000000000000000000000000000000000000000000000000"
@@ -340,7 +346,8 @@ CTEST2(operation_parser, check_set_deposit_limite_complexity)
         {"Source",        false, 1},
         {"Fee",           false, 2},
         {"Storage limit", false, 3},
-        {"Staking limit", false, 4},
+ //     {"Option",        _,     4},
+        {"Staking limit", false, 5},
     };
     check_field_complexity(data, str, fields_check, sizeof(fields_check));
 }