diff --git a/app/src/parser/operation_parser.c b/app/src/parser/operation_parser.c
index db2a9b495..91c7d72f8 100644
--- a/app/src/parser/operation_parser.c
+++ b/app/src/parser/operation_parser.c
@@ -115,8 +115,8 @@ TZ_OPERATION_FIELDS(transaction_fields,
     TZ_OPERATION_FIELD("Destination", TZ_OPERATION_FIELD_DESTINATION),
     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,             .complex=true)),
+            TZ_OPERATION_FIELD("Entrypoint", TZ_OPERATION_FIELD_SMART_ENTRYPOINT),
+            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 053011190..cf0113820 100644
--- a/tests/generate/gen_integration.ml
+++ b/tests/generate/gen_integration.ml
@@ -279,7 +279,6 @@ let operation_to_screens
           then []
           else
             [
-              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;
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00009.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00009.png
index 92b4bce4e..29807b584 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00009.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00010.png b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00010.png
index 29807b584..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00010.png and b/tests/integration/nano/snapshots/nanos/regression_batched_ops/00010.png differ
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 92b4bce4e..c6158a7d2 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 c6158a7d2..aba10d4bb 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 aba10d4bb..a1d031e41 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 a1d031e41..51e439646 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 51e439646..81da78627 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 81da78627..b3c17e476 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 b3c17e476..373118412 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 373118412..7069eac66 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 7069eac66..fd00c319c 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 fd00c319c..529129a7a 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 529129a7a..ea0f2a1b8 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 ea0f2a1b8..f9c016fd8 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 f9c016fd8..3ed39eca9 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 3ed39eca9..a1a29a201 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 a1a29a201..a73970865 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 a73970865..0778ddec0 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 0778ddec0..dd15dbb89 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 dd15dbb89..ed77b440e 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 ed77b440e..f12d6df32 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 f12d6df32..e67c683e4 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 e67c683e4..4027411b7 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 4027411b7..c3151dcff 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 c3151dcff..433736555 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 433736555..6d76960ef 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 6d76960ef..7e0e23820 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
deleted file mode 100644
index 7e0e23820..000000000
Binary files a/tests/integration/nano/snapshots/nanos/regression_batched_ops/00036.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00009.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00009.png
index 92b4bce4e..d58a3edc0 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00009.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00010.png b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00010.png
index d58a3edc0..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00010.png and b/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00010.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 92b4bce4e..de32f3ce0 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 de32f3ce0..d1f0c52d8 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 d1f0c52d8..9068ab50d 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 9068ab50d..ca3d99817 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 ca3d99817..caae0be86 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 caae0be86..53b2eab90 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 53b2eab90..f20965b93 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 f20965b93..91ba67e9d 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 91ba67e9d..e2e233f01 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 e2e233f01..972f178b3 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 972f178b3..083033d45 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 083033d45..9c2054a60 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 9c2054a60..08b20a837 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 08b20a837..afa9173a2 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 afa9173a2..7226a9e23 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 7226a9e23..dc7f9b18a 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 dc7f9b18a..182640db4 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 182640db4..f13eb25ed 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 f13eb25ed..37c456b81 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 37c456b81..873a1b0ad 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 873a1b0ad..7e0e23820 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
deleted file mode 100644
index 7e0e23820..000000000
Binary files a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00032.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00009.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00009.png
index 92b4bce4e..c40c89919 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00009.png and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00010.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00010.png
index c40c89919..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00010.png and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00010.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 92b4bce4e..6f75a6599 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 6f75a6599..9fefcab8d 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 9fefcab8d..180bf33b7 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 180bf33b7..fda55f501 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_removed_inside/00009.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00009.png
index 92b4bce4e..218dc0511 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00009.png and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00010.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00010.png
index 218dc0511..9fefcab8d 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00010.png and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00011.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00011.png
index 9fefcab8d..180bf33b7 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00011.png and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00012.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00012.png
index 180bf33b7..fda55f501 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00012.png and b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00013.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00013.png
deleted file mode 100644
index fda55f501..000000000
Binary files a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00013.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00009.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00009.png
index 92b4bce4e..d58a3edc0 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00009.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00010.png b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00010.png
index d58a3edc0..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00010.png and b/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00010.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 92b4bce4e..de32f3ce0 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 de32f3ce0..d1f0c52d8 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 d1f0c52d8..9068ab50d 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 9068ab50d..ca3d99817 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 ca3d99817..caae0be86 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 caae0be86..53b2eab90 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 53b2eab90..f20965b93 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 f20965b93..91ba67e9d 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 91ba67e9d..e2e233f01 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 e2e233f01..972f178b3 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 972f178b3..083033d45 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 083033d45..9c2054a60 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 9c2054a60..08b20a837 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 08b20a837..afa9173a2 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 afa9173a2..7226a9e23 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 7226a9e23..dc7f9b18a 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 dc7f9b18a..182640db4 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 182640db4..f13eb25ed 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 f13eb25ed..37c456b81 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 37c456b81..873a1b0ad 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 873a1b0ad..7e0e23820 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 7e0e23820..970b15944 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
deleted file mode 100644
index 970b15944..000000000
Binary files a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00033.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00009.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00009.png
index 92b4bce4e..d58a3edc0 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00009.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00010.png b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00010.png
index d58a3edc0..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00010.png and b/tests/integration/nano/snapshots/nanos/test_reject_transaction/00010.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 92b4bce4e..de32f3ce0 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 de32f3ce0..d1f0c52d8 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 d1f0c52d8..9068ab50d 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 9068ab50d..ca3d99817 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 ca3d99817..caae0be86 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 caae0be86..53b2eab90 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 53b2eab90..f20965b93 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 f20965b93..91ba67e9d 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 91ba67e9d..e2e233f01 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 e2e233f01..972f178b3 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 972f178b3..083033d45 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 083033d45..9c2054a60 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 9c2054a60..08b20a837 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 08b20a837..afa9173a2 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 afa9173a2..7226a9e23 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 7226a9e23..dc7f9b18a 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 dc7f9b18a..182640db4 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 182640db4..f13eb25ed 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 f13eb25ed..37c456b81 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 37c456b81..873a1b0ad 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 873a1b0ad..7e0e23820 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 7e0e23820..970b15944 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
deleted file mode 100644
index 970b15944..000000000
Binary files a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00033.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/00009.png
index 92b4bce4e..c40c89919 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00009.png and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/00010.png
index c40c89919..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00010.png and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/00010.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 92b4bce4e..6f75a6599 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 6f75a6599..7e0e23820 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
deleted file mode 100644
index 7e0e23820..000000000
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00013.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00009.png
index 92b4bce4e..c40c89919 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00009.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00010.png
index c40c89919..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00010.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00010.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 92b4bce4e..6f75a6599 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 6f75a6599..7e0e23820 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
deleted file mode 100644
index 7e0e23820..000000000
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00013.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00010.png
index 92b4bce4e..d58a3edc0 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00010.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00011.png
index d58a3edc0..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00011.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00011.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 92b4bce4e..1463263ef 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 1463263ef..7e0e23820 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
deleted file mode 100644
index 7e0e23820..000000000
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00014.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00009.png
index 92b4bce4e..c40c89919 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00009.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00010.png
index c40c89919..92b4bce4e 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00010.png and b/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00010.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 92b4bce4e..6f75a6599 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 6f75a6599..7e0e23820 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
deleted file mode 100644
index 7e0e23820..000000000
Binary files a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00013.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00009.png b/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00009.png
index 732db8bec..c40c89919 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00009.png and b/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00010.png b/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00010.png
index fda55f501..f76bfbc52 100644
Binary files a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00010.png and b/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00010.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_too_complex_transaction/00011.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00015.png
rename to tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00011.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00007.png b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00007.png
index 59fce75cd..85234247e 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00007.png and b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00008.png b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00008.png
index 85234247e..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00008.png and b/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00008.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 59fce75cd..431986c71 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 431986c71..1acb7d563 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 1acb7d563..d5afcef1b 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 d5afcef1b..85edb568e 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 85edb568e..8b3b3b148 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 8b3b3b148..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00015.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00007.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00007.png
index 59fce75cd..dd996e273 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00007.png and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00008.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00008.png
index dd996e273..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00008.png and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00008.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 59fce75cd..c3d918032 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 c3d918032..393a15fb7 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 393a15fb7..551255b14 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 551255b14..363848ba0 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_removed_inside/00007.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00007.png
index 59fce75cd..ff518831a 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00007.png and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00008.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00008.png
index ff518831a..393a15fb7 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00008.png and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00009.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00009.png
index 393a15fb7..551255b14 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00009.png and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00010.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00010.png
index 551255b14..363848ba0 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00010.png and b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00007.png b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00007.png
index 59fce75cd..85234247e 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00007.png and b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00008.png b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00008.png
index 85234247e..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00008.png and b/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00008.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 59fce75cd..431986c71 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 431986c71..1acb7d563 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 1acb7d563..d5afcef1b 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 d5afcef1b..85edb568e 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 85edb568e..8b3b3b148 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 8b3b3b148..471324463 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 471324463..137ca9e49 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
deleted file mode 100644
index 137ca9e49..000000000
Binary files a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00016.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00007.png b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00007.png
index 59fce75cd..85234247e 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00007.png and b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00008.png b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00008.png
index 85234247e..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00008.png and b/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00008.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 59fce75cd..431986c71 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 431986c71..1acb7d563 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 1acb7d563..d5afcef1b 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 d5afcef1b..85edb568e 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 85edb568e..8b3b3b148 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 8b3b3b148..471324463 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 471324463..137ca9e49 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
deleted file mode 100644
index 137ca9e49..000000000
Binary files a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00016.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00007.png
index 59fce75cd..dd996e273 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00007.png and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00008.png
index dd996e273..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00008.png and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00008.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 59fce75cd..c3d918032 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 c3d918032..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00011.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00007.png
index 59fce75cd..dd996e273 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00007.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00008.png
index dd996e273..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00008.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00008.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 59fce75cd..c3d918032 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 c3d918032..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00011.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00007.png
index 59fce75cd..85234247e 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00007.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00008.png
index 85234247e..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00008.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00008.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 59fce75cd..e9cbcd7e7 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 e9cbcd7e7..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00011.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00007.png
index 59fce75cd..dd996e273 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00007.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00008.png
index dd996e273..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00008.png and b/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00008.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 59fce75cd..c3d918032 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 c3d918032..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00011.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00007.png b/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00007.png
index 624503e64..dd996e273 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00007.png and b/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00008.png b/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00008.png
index 363848ba0..e147cd486 100644
Binary files a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00008.png and b/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00008.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_too_complex_transaction/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00013.png
rename to tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00009.png
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00007.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00007.png
index 59fce75cd..9ad31eb1c 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00007.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00008.png b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00008.png
index 9ad31eb1c..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00008.png and b/tests/integration/nano/snapshots/nanox/regression_batched_ops/00008.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 59fce75cd..afb2b8618 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 afb2b8618..f45f45fbe 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 f45f45fbe..c1e704a2d 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 c1e704a2d..6fb484ac5 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 6fb484ac5..2f514b48f 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 2f514b48f..4c6054eae 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 4c6054eae..db7c22e31 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 db7c22e31..914563b11 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 914563b11..fb4e79186 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 fb4e79186..43c85f24d 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 43c85f24d..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanox/regression_batched_ops/00020.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00007.png b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00007.png
index 59fce75cd..85234247e 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00007.png and b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00008.png b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00008.png
index 85234247e..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00008.png and b/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00008.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 59fce75cd..431986c71 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 431986c71..1acb7d563 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 1acb7d563..d5afcef1b 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 d5afcef1b..85edb568e 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 85edb568e..8b3b3b148 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 8b3b3b148..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00015.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00007.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00007.png
index 59fce75cd..dd996e273 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00007.png and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00008.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00008.png
index dd996e273..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00008.png and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00008.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 59fce75cd..c3d918032 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 c3d918032..393a15fb7 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 393a15fb7..551255b14 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 551255b14..363848ba0 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
deleted file mode 100644
index 363848ba0..000000000
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00013.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00007.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00007.png
index 59fce75cd..ff518831a 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00007.png and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00008.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00008.png
index ff518831a..393a15fb7 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00008.png and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00009.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00009.png
index 393a15fb7..551255b14 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00009.png and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00010.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00010.png
index 551255b14..363848ba0 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00010.png and b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00011.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00011.png
deleted file mode 100644
index 363848ba0..000000000
Binary files a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00011.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00007.png b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00007.png
index 59fce75cd..85234247e 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00007.png and b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00008.png b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00008.png
index 85234247e..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00008.png and b/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00008.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 59fce75cd..431986c71 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 431986c71..1acb7d563 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 1acb7d563..d5afcef1b 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 d5afcef1b..85edb568e 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 85edb568e..8b3b3b148 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 8b3b3b148..471324463 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 471324463..137ca9e49 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
deleted file mode 100644
index 137ca9e49..000000000
Binary files a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00016.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00007.png b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00007.png
index 59fce75cd..85234247e 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00007.png and b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00008.png b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00008.png
index 85234247e..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00008.png and b/tests/integration/nano/snapshots/nanox/test_reject_transaction/00008.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 59fce75cd..431986c71 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 431986c71..1acb7d563 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 1acb7d563..d5afcef1b 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 d5afcef1b..85edb568e 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 85edb568e..8b3b3b148 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 8b3b3b148..471324463 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 471324463..137ca9e49 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
deleted file mode 100644
index 137ca9e49..000000000
Binary files a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00016.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/00007.png
index 59fce75cd..dd996e273 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00007.png and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/00008.png
index dd996e273..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00008.png and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/00008.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 59fce75cd..c3d918032 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 c3d918032..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00011.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00007.png
index 59fce75cd..dd996e273 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00007.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00008.png
index dd996e273..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00008.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00008.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 59fce75cd..c3d918032 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 c3d918032..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00011.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00007.png
index 59fce75cd..85234247e 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00007.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00008.png
index 85234247e..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00008.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00008.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 59fce75cd..e9cbcd7e7 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 e9cbcd7e7..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00011.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00007.png
index 59fce75cd..dd996e273 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00007.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00008.png
index dd996e273..59fce75cd 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00008.png and b/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00008.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 59fce75cd..c3d918032 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 c3d918032..471324463 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
deleted file mode 100644
index 471324463..000000000
Binary files a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00011.png and /dev/null differ
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00007.png b/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00007.png
index 624503e64..dd996e273 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00007.png and b/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00008.png b/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00008.png
index 363848ba0..e147cd486 100644
Binary files a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00008.png and b/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00011.png b/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00011.png
rename to tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00009.png
diff --git a/tests/integration/stax/snapshots/test_expert_mode_rejections/tst_review_003.png b/tests/integration/stax/snapshots/test_expert_mode_rejections/tst_review_003.png
new file mode 100644
index 000000000..93af184c9
Binary files /dev/null and b/tests/integration/stax/snapshots/test_expert_mode_rejections/tst_review_003.png differ
diff --git a/tests/integration/stax/test_blindsign_valid.py b/tests/integration/stax/test_blindsign_valid.py
index de2465e03..585ff9f8c 100755
--- a/tests/integration/stax/test_blindsign_valid.py
+++ b/tests/integration/stax/test_blindsign_valid.py
@@ -49,15 +49,15 @@
     app.review.tap()
     app.assert_screen("tst_review_002")
 
-    app.review.tap()
-    app.expert_mode_splash()
-
     app.review.tap()
     app.assert_screen("tst_review_003")
+
     app.review.tap()
-    app.assert_screen("expert_mode_splash")
+    app.expert_mode_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_expert_mode_rejections.py b/tests/integration/stax/test_expert_mode_rejections.py
index 09c4693aa..ee58efac2 100644
--- a/tests/integration/stax/test_expert_mode_rejections.py
+++ b/tests/integration/stax/test_expert_mode_rejections.py
@@ -31,6 +31,8 @@ def sign_transfer_initialize(app):
     app.assert_screen(f"tst_review_001")
     app.review.tap()
     app.assert_screen("tst_review_002")
+    app.review.tap()
+    app.assert_screen("tst_review_003")
 
 
 
diff --git a/tests/integration/stax/test_parsing_errors.py b/tests/integration/stax/test_parsing_errors.py
index 36d7d4fa6..d528192ee 100755
--- a/tests/integration/stax/test_parsing_errors.py
+++ b/tests/integration/stax/test_parsing_errors.py
@@ -43,8 +43,6 @@
     app.review.tap()
     app.assert_screen("tpe_review_0_02_partial")
     app.review.tap()
-    app.expert_mode_splash()
-    app.review.tap()
     app.assert_screen("tpe_review_0_03")
     app.review.tap()
     verify_err_reject_response(app, "invalid_tag")
@@ -57,11 +55,9 @@
     app.review.tap()
     app.assert_screen("tpe_review_0_02_full")
     app.review.tap()
-    app.assert_screen("expert_mode_splash")
-    app.review.tap()
     app.assert_screen("tpe_review_0_03_full")
     app.review.tap()
-    app.assert_screen("expert_mode_splash")
+    app.expert_mode_splash()
     app.review.tap()
     app.assert_screen("tpe_review_0_04_full")
     app.review.tap()
diff --git a/tests/integration/stax/test_sign_transfer.py b/tests/integration/stax/test_sign_transfer.py
index c1bcc73bd..11c666555 100755
--- a/tests/integration/stax/test_sign_transfer.py
+++ b/tests/integration/stax/test_sign_transfer.py
@@ -39,13 +39,10 @@
     app.assert_screen("tst_review_002")
 
     app.review.tap()
-    app.enable_expert_mode()
-
-    app.review.tap()
-    app.assert_screen("tst_expert_splash")
+    app.assert_screen("tst_review_003")
 
     app.review.tap()
-    app.assert_screen("tst_review_003")
+    app.enable_expert_mode()
 
     app.review.tap()
     app.assert_screen("tst_expert_splash")
@@ -75,9 +72,6 @@
     app.review.tap()
     app.assert_screen("tst_review_002")
 
-    app.review.tap()
-    app.assert_screen("tst_expert_splash")
-
     app.review.tap()
     app.assert_screen("tst_review_003")
 
diff --git a/tests/integration/stax/test_sign_transfer_without_hash.py b/tests/integration/stax/test_sign_transfer_without_hash.py
index 41840b07c..277011488 100755
--- a/tests/integration/stax/test_sign_transfer_without_hash.py
+++ b/tests/integration/stax/test_sign_transfer_without_hash.py
@@ -38,14 +38,11 @@
     app.review.tap()
     app.assert_screen("review_1")
 
-    app.review.tap()
-    app.expert_mode_splash()
-
     app.review.tap()
     app.assert_screen("review_2")
 
     app.review.tap()
-    app.assert_screen("expert_mode_splash")
+    app.expert_mode_splash()
 
     app.review.tap()
     app.assert_screen("review_3")
diff --git a/tests/unit/ctest/tests_parser.c b/tests/unit/ctest/tests_parser.c
index 21f1a65ec..282ccc024 100644
--- a/tests/unit/ctest/tests_parser.c
+++ b/tests/unit/ctest/tests_parser.c
@@ -253,7 +253,7 @@ CTEST2(operation_parser, check_transaction_complexity)
         {"Destination",   false, 5},
  //     {"Option",        _,     6},
   //    {"Tuple",         _,     7},
-        {"Entrypoint",    true,  8},
+        {"Entrypoint",    false, 8},
         {"Parameter",     true,  9},
     };
     check_field_complexity(data, str, fields_check, sizeof(fields_check));
@@ -281,7 +281,7 @@ CTEST2(operation_parser, check_double_transaction_complexity)
         {"Destination",   false, 11},
  //     {"Option",        _,     12},
   //    {"Tuple",         _,     13},
-        {"Entrypoint",    true,  14},
+        {"Entrypoint",    false, 14},
         {"Parameter",     true,  15},
     };
     check_field_complexity(data, str, fields_check, sizeof(fields_check));