diff --git a/app/src/parser/micheline_parser.c b/app/src/parser/micheline_parser.c
index a7209c77..0b33a9d8 100644
--- a/app/src/parser/micheline_parser.c
+++ b/app/src/parser/micheline_parser.c
@@ -47,6 +47,7 @@ tz_micheline_parser_init(tz_parser_state *state)
 
     m->frame         = m->stack;
     m->stack[0].step = TZ_MICHELINE_STEP_TAG;
+    m->is_unit       = false;
 }
 
 /**
@@ -373,6 +374,12 @@ tz_micheline_parser_step(tz_parser_state *state)
         }
         m->frame->step         = TZ_MICHELINE_STEP_PRIM_NAME;
         m->frame->step_prim.op = op;
+        // clang-format off
+        m->is_unit = ((m->frame == m->stack)
+                      && (op == TZ_MICHELSON_OP_Unit)
+                      && (m->frame->step_prim.nargs == 0)
+                      && (!m->frame->step_prim.annot));
+        // clang-format on
         break;
     case TZ_MICHELINE_STEP_PRIM_NAME:
         if (m->frame->step_prim.wrap && m->frame->step_prim.first) {
diff --git a/app/src/parser/micheline_state.h b/app/src/parser/micheline_state.h
index d77ddaf5..6584396d 100644
--- a/app/src/parser/micheline_state.h
+++ b/app/src/parser/micheline_state.h
@@ -129,4 +129,5 @@ typedef struct {
         stack[TZ_MICHELINE_STACK_DEPTH];  /// stack of frames
     tz_micheline_parser_frame *frame;     /// current frame
                                           /// init == stack, NULL when done
+    bool is_unit;  /// indicates whether the micheline read is a unit
 } tz_micheline_state;
diff --git a/app/src/parser/operation_parser.c b/app/src/parser/operation_parser.c
index 9703d2ca..118ec8fb 100644
--- a/app/src/parser/operation_parser.c
+++ b/app/src/parser/operation_parser.c
@@ -573,6 +573,9 @@ tz_step_read_micheline(tz_parser_state *state)
     }
     tz_micheline_parser_step(state);
     if (state->errno == TZ_BLO_DONE) {
+        if (state->micheline.is_unit) {
+            state->field_info.is_field_complex = false;
+        }
         if ((op->frame->stop != 0) && (state->ofs != op->frame->stop)) {
             tz_raise(TOO_LARGE);
         }
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00000.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00000.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00000.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00001.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00001.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00001.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00002.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00002.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00002.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00003.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00003.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00003.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00004.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00004.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00004.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00005.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00005.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00005.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00006.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00006.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00006.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00007.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00007.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00007.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00008.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00008.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00008.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00008.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00009.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00009.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00010.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00010.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00010.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00011.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00011.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00011.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00012.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00012.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00012.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00012.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00000.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00000.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00000.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00001.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00001.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00001.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00002.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00002.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00002.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00003.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00003.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00003.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00004.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00004.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00004.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00005.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00005.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00005.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00006.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00006.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00006.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00007.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00007.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00007.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00008.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00008.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00008.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00008.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00009.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00009.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00010.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00010.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00010.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00011.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00011.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00011.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00000.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00000.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00000.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00001.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00001.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00001.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00002.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00002.png
new file mode 100644
index 00000000..6e050042
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00003.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00003.png
new file mode 100644
index 00000000..0d3ab690
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00004.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00004.png
new file mode 100644
index 00000000..854d29dd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00005.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00005.png
new file mode 100644
index 00000000..18da5662
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00006.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00006.png
new file mode 100644
index 00000000..4027411b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00006.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00006.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00007.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00008.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00008.png
new file mode 100644
index 00000000..6b463a2b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00009.png
new file mode 100644
index 00000000..6d7683ae
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00010.png
new file mode 100644
index 00000000..8b185a73
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00011.png
new file mode 100644
index 00000000..469b7797
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00012.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00010.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00012.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00013.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00013.png
new file mode 100644
index 00000000..cd7a29d1
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00013.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00014.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00014.png
new file mode 100644
index 00000000..ef13ffa1
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00031.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00015.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00031.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00015.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00000.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00000.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00000.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00001.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00001.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00001.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00002.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00002.png
new file mode 100644
index 00000000..6e050042
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00003.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00003.png
new file mode 100644
index 00000000..0d3ab690
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00004.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00004.png
new file mode 100644
index 00000000..854d29dd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00005.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00005.png
new file mode 100644
index 00000000..18da5662
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00006.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00006.png
new file mode 100644
index 00000000..4027411b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00007.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00007.png
new file mode 100644
index 00000000..1e80339b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00008.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00008.png
new file mode 100644
index 00000000..6b463a2b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00009.png
new file mode 100644
index 00000000..6d7683ae
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00010.png
new file mode 100644
index 00000000..ec8d1dab
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00011.png
new file mode 100644
index 00000000..ea964d44
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00012.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00009.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00012.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00000.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00000.png
new file mode 100644
index 00000000..053fc534
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00001.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00001.png
new file mode 100644
index 00000000..e033929e
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00002.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00002.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00002.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00003.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00003.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00003.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00004.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00004.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00004.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00005.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00005.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00005.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00006.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00006.png
new file mode 100644
index 00000000..1e80339b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00007.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00007.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00007.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/00008.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00008.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/00008.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00008.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00009.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00009.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00010.png
new file mode 100644
index 00000000..92b4bce4
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00011.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00011.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00011.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00012.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00012.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00012.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00012.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00013.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00013.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00013.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00013.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00014.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00014.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00014.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00014.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00015.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00015.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00015.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00015.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00016.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00016.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00016.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00016.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00017.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00017.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00017.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00017.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00018.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00018.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00018.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00018.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00019.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00019.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00019.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00019.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00020.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00020.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00020.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00020.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00021.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00021.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00021.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00021.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00022.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00022.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00022.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00022.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00023.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00023.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00023.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00023.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00024.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00024.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00024.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00024.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00025.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00025.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00025.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00025.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00026.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00026.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00026.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00026.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00027.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00027.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00027.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00027.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00028.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00028.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00028.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00028.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00029.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00029.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00029.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00029.png
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00030.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00030.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00030.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00030.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00031.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00031.png
new file mode 100644
index 00000000..7e0e2382
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00031.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_reject_transaction/00032.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00032.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_reject_transaction/00032.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00032.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00000.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00000.png
new file mode 100644
index 00000000..053fc534
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00001.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00001.png
new file mode 100644
index 00000000..e033929e
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00002.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00002.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00002.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00003.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00003.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00003.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00004.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00004.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00004.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00005.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00005.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00005.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00006.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_sign_simple_transaction/00006.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00006.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00007.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00007.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00007.png
diff --git a/tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00008.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00008.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanos/test_too_complex_transaction/00008.png
rename to tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00008.png
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00009.png
new file mode 100644
index 00000000..7e0e2382
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00000.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00000.png
new file mode 100644
index 00000000..053fc534
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00001.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00001.png
new file mode 100644
index 00000000..e033929e
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00002.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00002.png
new file mode 100644
index 00000000..6e050042
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00003.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00003.png
new file mode 100644
index 00000000..0d3ab690
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00004.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00004.png
new file mode 100644
index 00000000..854d29dd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00005.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00005.png
new file mode 100644
index 00000000..18da5662
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00006.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00006.png
new file mode 100644
index 00000000..4027411b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00007.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00007.png
new file mode 100644
index 00000000..28e21d7b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00008.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00008.png
new file mode 100644
index 00000000..6b463a2b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00009.png
new file mode 100644
index 00000000..6d7683ae
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00010.png
new file mode 100644
index 00000000..f7dcb203
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00011.png
new file mode 100644
index 00000000..ea964d44
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00012.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00012.png
new file mode 100644
index 00000000..7e0e2382
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00000.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00000.png
new file mode 100644
index 00000000..053fc534
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00001.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00001.png
new file mode 100644
index 00000000..e033929e
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00002.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00002.png
new file mode 100644
index 00000000..6e050042
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00003.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00003.png
new file mode 100644
index 00000000..0d3ab690
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00004.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00004.png
new file mode 100644
index 00000000..854d29dd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00005.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00005.png
new file mode 100644
index 00000000..18da5662
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00006.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00006.png
new file mode 100644
index 00000000..4027411b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00007.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00007.png
new file mode 100644
index 00000000..92b4eda7
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00008.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00008.png
new file mode 100644
index 00000000..6b463a2b
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00009.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00009.png
new file mode 100644
index 00000000..6d7683ae
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00010.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00010.png
new file mode 100644
index 00000000..9d926e91
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00011.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00011.png
new file mode 100644
index 00000000..ea964d44
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00011.png differ
diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00012.png b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00012.png
new file mode 100644
index 00000000..7e0e2382
Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00012.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00000.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00000.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00001.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00001.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00002.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00002.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00003.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00003.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00004.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00004.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00005.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00005.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00006.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00006.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00007.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00007.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00008.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00008.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00008.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00009.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00009.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00010.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00010.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00010.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00000.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00000.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00001.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00001.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00002.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00002.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00003.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00003.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00004.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00004.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00005.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00005.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00006.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00006.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00007.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00007.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00008.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00008.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00008.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00009.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00009.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00000.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00000.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00001.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00001.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00002.png
new file mode 100644
index 00000000..bd3139cd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00003.png
new file mode 100644
index 00000000..f9d21814
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00004.png
new file mode 100644
index 00000000..914563b1
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00005.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00005.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00006.png
new file mode 100644
index 00000000..e2923d15
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00007.png
new file mode 100644
index 00000000..edbb1c94
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/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/delegate_parameters/00008.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00008.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00008.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00009.png
new file mode 100644
index 00000000..85e22f17
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00010.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00010.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00010.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00000.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00000.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00001.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00001.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00002.png
new file mode 100644
index 00000000..bd3139cd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00003.png
new file mode 100644
index 00000000..f9d21814
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00004.png
new file mode 100644
index 00000000..914563b1
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00005.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00005.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00006.png
new file mode 100644
index 00000000..e2923d15
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00007.png
new file mode 100644
index 00000000..76a2d691
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00008.png
new file mode 100644
index 00000000..6b562f76
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00014.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00009.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00000.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00000.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00001.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00001.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00002.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00002.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00003.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00003.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00004.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00004.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00005.png
new file mode 100644
index 00000000..ca012810
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/00006.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00006.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00007.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00007.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00008.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00008.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00008.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00009.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00009.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00010.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00010.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00010.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00011.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00011.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00011.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00012.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00012.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00012.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00013.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00013.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00013.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00014.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00014.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00014.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_transaction/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00015.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_reject_transaction/00015.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00015.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00000.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00000.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00001.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00001.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00002.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00002.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00003.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00003.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00004.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00004.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00005.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00005.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_too_complex_transaction/00006.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00006.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanosp/test_sign_simple_transaction/00007.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00007.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00000.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00000.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00001.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00001.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00002.png
new file mode 100644
index 00000000..bd3139cd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00003.png
new file mode 100644
index 00000000..f9d21814
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00004.png
new file mode 100644
index 00000000..914563b1
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00005.png
new file mode 100644
index 00000000..75222033
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00006.png
new file mode 100644
index 00000000..e2923d15
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00007.png
new file mode 100644
index 00000000..85012b10
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00008.png
new file mode 100644
index 00000000..6b562f76
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00007.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00009.png
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00000.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00000.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00000.png
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00001.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00001.png
rename to tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00001.png
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00002.png
new file mode 100644
index 00000000..bd3139cd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00003.png
new file mode 100644
index 00000000..f9d21814
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00004.png
new file mode 100644
index 00000000..914563b1
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00005.png
new file mode 100644
index 00000000..3b29ccc7
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00006.png
new file mode 100644
index 00000000..e2923d15
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00007.png
new file mode 100644
index 00000000..5ec827ea
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00008.png
new file mode 100644
index 00000000..6b562f76
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00009.png
new file mode 100644
index 00000000..47132446
Binary files /dev/null and b/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00000.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00000.png
new file mode 100644
index 00000000..9fa51df2
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00001.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00001.png
new file mode 100644
index 00000000..7009edb4
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00002.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00002.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00002.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00003.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00003.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00003.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00004.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00004.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00004.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00005.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00005.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00005.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00006.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00006.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00006.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00007.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00007.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00008.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00008.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00008.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00009.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00009.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00010.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00010.png
new file mode 100644
index 00000000..47132446
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00000.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00000.png
new file mode 100644
index 00000000..9fa51df2
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00001.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00001.png
new file mode 100644
index 00000000..7009edb4
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00002.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00002.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00002.png
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00003.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00003.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00003.png
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00004.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00004.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00004.png
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00005.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00005.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00005.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00006.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00006.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00006.png
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00007.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00007.png
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00008.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00008.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00008.png
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00009.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00009.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00000.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00000.png
new file mode 100644
index 00000000..9fa51df2
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00001.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00001.png
new file mode 100644
index 00000000..7009edb4
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00002.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00002.png
new file mode 100644
index 00000000..bd3139cd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00003.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00003.png
new file mode 100644
index 00000000..f9d21814
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00004.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00004.png
new file mode 100644
index 00000000..914563b1
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00005.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00005.png
new file mode 100644
index 00000000..ca012810
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00006.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00006.png
new file mode 100644
index 00000000..e2923d15
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00007.png
new file mode 100644
index 00000000..edbb1c94
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00008.png
new file mode 100644
index 00000000..59fce75c
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00009.png
new file mode 100644
index 00000000..85e22f17
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00010.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00010.png
new file mode 100644
index 00000000..47132446
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00010.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00000.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00000.png
new file mode 100644
index 00000000..9fa51df2
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00001.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00001.png
new file mode 100644
index 00000000..7009edb4
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00002.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00002.png
new file mode 100644
index 00000000..bd3139cd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00003.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00003.png
new file mode 100644
index 00000000..f9d21814
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00004.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00004.png
new file mode 100644
index 00000000..914563b1
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00005.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00005.png
new file mode 100644
index 00000000..ca012810
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00006.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00006.png
new file mode 100644
index 00000000..e2923d15
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00007.png
new file mode 100644
index 00000000..76a2d691
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00008.png
new file mode 100644
index 00000000..6b562f76
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00009.png
new file mode 100644
index 00000000..47132446
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00000.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00000.png
new file mode 100644
index 00000000..9fa51df2
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00001.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00001.png
new file mode 100644
index 00000000..7009edb4
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00002.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00002.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00002.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00003.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00003.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00003.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00004.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00004.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00004.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00005.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00005.png
new file mode 100644
index 00000000..ca012810
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/00006.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/00006.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00006.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00007.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00007.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00007.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00008.png
new file mode 100644
index 00000000..59fce75c
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00009.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00009.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00009.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00010.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00010.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00010.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00010.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00011.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00011.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00011.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00011.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00012.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00012.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00012.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00012.png
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00013.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00013.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00013.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00013.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00014.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00014.png
new file mode 100644
index 00000000..47132446
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00014.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_reject_transaction/00015.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00015.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_reject_transaction/00015.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00015.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00000.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00000.png
new file mode 100644
index 00000000..9fa51df2
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00001.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00001.png
new file mode 100644
index 00000000..7009edb4
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00002.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00002.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00002.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00002.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00003.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00003.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00003.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00003.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00004.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00004.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00004.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00004.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00005.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00005.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_sign_simple_transaction/00005.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00005.png
diff --git a/tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00006.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00006.png
similarity index 100%
rename from tests/integration/nano/snapshots/nanox/test_too_complex_transaction/00006.png
rename to tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00006.png
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00007.png
new file mode 100644
index 00000000..47132446
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00000.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00000.png
new file mode 100644
index 00000000..9fa51df2
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00001.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00001.png
new file mode 100644
index 00000000..7009edb4
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00002.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00002.png
new file mode 100644
index 00000000..bd3139cd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00003.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00003.png
new file mode 100644
index 00000000..f9d21814
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00004.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00004.png
new file mode 100644
index 00000000..914563b1
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00005.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00005.png
new file mode 100644
index 00000000..75222033
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00006.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00006.png
new file mode 100644
index 00000000..e2923d15
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00007.png
new file mode 100644
index 00000000..85012b10
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00008.png
new file mode 100644
index 00000000..6b562f76
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00009.png
new file mode 100644
index 00000000..47132446
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00009.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00000.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00000.png
new file mode 100644
index 00000000..9fa51df2
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00000.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00001.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00001.png
new file mode 100644
index 00000000..7009edb4
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00001.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00002.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00002.png
new file mode 100644
index 00000000..bd3139cd
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00002.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00003.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00003.png
new file mode 100644
index 00000000..f9d21814
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00003.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00004.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00004.png
new file mode 100644
index 00000000..914563b1
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00004.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00005.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00005.png
new file mode 100644
index 00000000..3b29ccc7
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00005.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00006.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00006.png
new file mode 100644
index 00000000..e2923d15
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00006.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00007.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00007.png
new file mode 100644
index 00000000..5ec827ea
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00007.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00008.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00008.png
new file mode 100644
index 00000000..6b562f76
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00008.png differ
diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00009.png b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00009.png
new file mode 100644
index 00000000..47132446
Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00009.png differ
diff --git a/tests/integration/nano/test_reject_transaction.py b/tests/integration/nano/test_reject_transaction.py
deleted file mode 100755
index d56bf2f9..00000000
--- a/tests/integration/nano/test_reject_transaction.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2023 Functori <contact@functori.com>
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from pathlib import Path
-
-from utils.app import Screen, DEFAULT_ACCOUNT
-from utils.message import Message
-
-def test_reject_transaction(app):
-    test_name = Path(__file__).stem
-
-    app.setup_expert_mode()
-
-    message = Message.from_bytes("0300000000000000000000000000000000000000000000000000000000000000006c00ffdd6102321bc251e4a5190ad5b12b251069d9b4904e0203040001000000000000000000000000000000000000000000ff01000001070200000102076501000000015b076501000000015a0765010000000159076501000000015807650100000001570765010000000156076501000000015507650100000001540765010000000153076501000000015207650100000001510765010000000150076501000000014f076501000000014e076501000000014d076501000000014c076501000000014b076501000000014a0765010000000149076501000000014807650100000001470765010000000146076501000000014507650100000001440765010000000143076501000000014202000000000765000a0765000907650008076500070765000607650005076500040765000307650002076500010200000000")
-
-    app.reject_signing(DEFAULT_ACCOUNT,
-                       message,
-                       with_hash=True,
-                       path=test_name)
-
-    app.quit()
diff --git a/tests/integration/nano/test_sign_simple_transaction.py b/tests/integration/nano/test_sign_simple_transaction.py
deleted file mode 100644
index dcbbae6c..00000000
--- a/tests/integration/nano/test_sign_simple_transaction.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2023 Functori <contact@functori.com>
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from pathlib import Path
-
-from utils.app import Screen, DEFAULT_ACCOUNT
-from utils.message import Message
-
-# Operation (0): Transaction
-# Fee: 0.5 XTZ
-# Storage limit: 4
-# Amount: 0.01 XTZ
-# Destination: KT18amZmM5W7qDWVt2pH6uj7sCEd3kbzLrHT
-
-def test_sign_simple_transaction(app):
-    test_name = Path(__file__).stem
-
-    app.setup_expert_mode()
-
-    message = Message.from_bytes("0300000000000000000000000000000000000000000000000000000000000000006c00ffdd6102321bc251e4a5190ad5b12b251069d9b4a0c21e020304904e0100000000000000000000000000000000000000000000")
-
-    data = app.sign(DEFAULT_ACCOUNT,
-                    message,
-                    with_hash=True,
-                    path=test_name)
-
-    app.checker.check_signature(
-        account=DEFAULT_ACCOUNT,
-        message=message,
-        with_hash=True,
-        data=data)
-
-    app.quit()
diff --git a/tests/integration/nano/test_sign_transaction.py b/tests/integration/nano/test_sign_transaction.py
index a1b702dc..da641010 100755
--- a/tests/integration/nano/test_sign_transaction.py
+++ b/tests/integration/nano/test_sign_transaction.py
@@ -15,19 +15,22 @@
 
 from pathlib import Path
 
-from utils.app import Screen, DEFAULT_ACCOUNT
+from utils.app import Screen, Screen_text, DEFAULT_ACCOUNT
+from utils.backend import StatusCode
 from utils.message import Message
 
+test_path = Path(Path(__file__).stem)
+
 # Operation (0): Transaction
+# Source: tz2JPgTWZZpxZZLqHMfS69UAy1UHm4Aw5iHu
 # Fee: 0.05 XTZ
 # Storage limit: 45
 # Amount: 0.24 XTZ
 # Destination: KT18amZmM5W7qDWVt2pH6uj7sCEd3kbzLrHT
 # Entrypoint: do
 # Parameter: CAR
-
 def test_sign_transaction(app):
-    test_name = Path(__file__).stem
+    path = test_path / "basic"
 
     app.setup_expert_mode()
 
@@ -36,7 +39,190 @@ def test_sign_transaction(app):
     data = app.sign(DEFAULT_ACCOUNT,
                     message,
                     with_hash=True,
-                    path=test_name)
+                    path=path)
+
+    app.checker.check_signature(
+        account=DEFAULT_ACCOUNT,
+        message=message,
+        with_hash=True,
+        data=data)
+
+    app.quit()
+
+# Operation (0): Transaction
+# Source: tz1ixvCiPJYyMjsp2nKBVaq54f6AdbV8hCKa
+# Fee: 0.01 XTZ
+# Storage limit: 4
+# Amount: 0 XTZ
+# Destination: KT18amZmM5W7qDWVt2pH6uj7sCEd3kbzLrHT
+# Entrypoint: root
+# Data: {pair "[" (pair "Z" (pair "Y" (pair "X" (pair "W" (pair "V" (pair "U" (pair "T" (pair "S" (pair "R" (pair "Q" (pair "P" (pair "O" (pair "N" (pair "M" (pair "L" (pair "K" (pair "J" (pair "I" (pair "H" (pair "G" (pair "F" (pair "E" (pair "D" (pair "C" (pair "B" {})))))))))))))))))))))))));pair 10 (pair 9 (pair 8 (pair 7 (pair 6 (pair 5 (pair 4 (pair 3 (pair 2 (pair 1 {})))))))))}
+def test_reject_transaction(app):
+    path = test_path / "reject"
+
+    app.setup_expert_mode()
+
+    message = Message.from_bytes("0300000000000000000000000000000000000000000000000000000000000000006c00ffdd6102321bc251e4a5190ad5b12b251069d9b4904e0203040001000000000000000000000000000000000000000000ff01000001070200000102076501000000015b076501000000015a0765010000000159076501000000015807650100000001570765010000000156076501000000015507650100000001540765010000000153076501000000015207650100000001510765010000000150076501000000014f076501000000014e076501000000014d076501000000014c076501000000014b076501000000014a0765010000000149076501000000014807650100000001470765010000000146076501000000014507650100000001440765010000000143076501000000014202000000000765000a0765000907650008076500070765000607650005076500040765000307650002076500010200000000")
+
+    app.reject_signing(DEFAULT_ACCOUNT,
+                       message,
+                       with_hash=True,
+                       path=path)
+
+    app.quit()
+
+# Operation (0): Transaction
+# Source: tz1ixvCiPJYyMjsp2nKBVaq54f6AdbV8hCKa
+# Fee: 0.5 XTZ
+# Storage limit: 4
+# Amount: 0.01 XTZ
+# Destination: KT18amZmM5W7qDWVt2pH6uj7sCEd3kbzLrHT
+def test_sign_simple_transaction(app):
+    path = test_path / "simple"
+
+    app.setup_expert_mode()
+
+    message = Message.from_bytes("0300000000000000000000000000000000000000000000000000000000000000006c00ffdd6102321bc251e4a5190ad5b12b251069d9b4a0c21e020304904e0100000000000000000000000000000000000000000000")
+
+    data = app.sign(DEFAULT_ACCOUNT,
+                    message,
+                    with_hash=True,
+                    path=path)
+
+    app.checker.check_signature(
+        account=DEFAULT_ACCOUNT,
+        message=message,
+        with_hash=True,
+        data=data)
+
+    app.quit()
+
+# Operation (0): Transaction
+# Source: tz2JPgTWZZpxZZLqHMfS69UAy1UHm4Aw5iHu
+# Fee: 0.05 XTZ
+# Storage limit: 45
+# Amount: 0.24 XTZ
+# Destination: KT18amZmM5W7qDWVt2pH6uj7sCEd3kbzLrHT
+# Entrypoint: do
+# Parameter: CAR
+def test_too_complex_transaction(app):
+    path = test_path / "complex"
+    app.assert_screen(Screen.Home)
+
+    message = Message.from_bytes("0300000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e01000000000000000000000000000000000000000000ff02000000020316")
+
+    app._failing_signing(DEFAULT_ACCOUNT,
+                         message,
+                         with_hash=True,
+                         text=Screen_text.Back_home,
+                         status_code=StatusCode.REJECT,
+                         path=path)
+
+    app.quit()
+
+# Operation (0): Transaction
+# Source: tz2WmivuMG8MMRKMEmzKRMMxMApxZQWYNS4W
+# Fee: 0.04 XTZ
+# Storage limit: 2
+# Amount: 1000 XTZ
+# Destination: tz2CJBeWWLsUDjVUDqGZL6od3DeBCNzYXrXk
+# Entrypoint: stake
+# Parameter: Unit
+def test_sign_stake_transaction(app):
+    path = test_path / "stake"
+
+    app.setup_expert_mode()
+
+    message = Message.from_bytes("0300000000000000000000000000000000000000000000000000000000000000006c01f6552df4f5ff51c3d13347cab045cfdb8b9bd803c0b8020031028094ebdc0300012bad922d045c068660fabe19576f8506a1fa8fa3ff0600000002030b")
+
+    data = app.sign(DEFAULT_ACCOUNT,
+                    message,
+                    with_hash=True,
+                    path=path)
+
+    app.checker.check_signature(
+        account=DEFAULT_ACCOUNT,
+        message=message,
+        with_hash=True,
+        data=data)
+
+    app.quit()
+
+# Operation (0): Transaction
+# Source: tz2WmivuMG8MMRKMEmzKRMMxMApxZQWYNS4W
+# Fee: 0.04 XTZ
+# Storage limit: 2
+# Amount: 500 XTZ
+# Destination: tz2CJBeWWLsUDjVUDqGZL6od3DeBCNzYXrXk
+# Entrypoint: unstake
+# Parameter: Unit
+def test_sign_unstake_transaction(app):
+    path = test_path / "unstake"
+
+    app.setup_expert_mode()
+
+    message = Message.from_bytes("0300000000000000000000000000000000000000000000000000000000000000006c01f6552df4f5ff51c3d13347cab045cfdb8b9bd803c0b80200310280cab5ee0100012bad922d045c068660fabe19576f8506a1fa8fa3ff0700000002030b")
+
+    data = app.sign(DEFAULT_ACCOUNT,
+                    message,
+                    with_hash=True,
+                    path=path)
+
+    app.checker.check_signature(
+        account=DEFAULT_ACCOUNT,
+        message=message,
+        with_hash=True,
+        data=data)
+
+    app.quit()
+
+# Operation (0): Transaction
+# Source: tz2WmivuMG8MMRKMEmzKRMMxMApxZQWYNS4W
+# Fee: 0.04 XTZ
+# Storage limit: 2
+# Amount: 0 XTZ
+# Destination: tz2CJBeWWLsUDjVUDqGZL6od3DeBCNzYXrXk
+# Entrypoint: finalize_unstake
+# Parameter: Unit
+def test_sign_finalize_unstake_transaction(app):
+    path = test_path / "finalize_unstake"
+
+    app.setup_expert_mode()
+
+    message = Message.from_bytes("0300000000000000000000000000000000000000000000000000000000000000006c01f6552df4f5ff51c3d13347cab045cfdb8b9bd803c0b8020031020000012bad922d045c068660fabe19576f8506a1fa8fa3ff0800000002030b")
+
+    data = app.sign(DEFAULT_ACCOUNT,
+                    message,
+                    with_hash=True,
+                    path=path)
+
+    app.checker.check_signature(
+        account=DEFAULT_ACCOUNT,
+        message=message,
+        with_hash=True,
+        data=data)
+
+    app.quit()
+
+# Operation (0): Transaction
+# Source: tz2WmivuMG8MMRKMEmzKRMMxMApxZQWYNS4W
+# Fee: 0.04 XTZ
+# Storage limit: 2
+# Amount: 0 XTZ
+# Destination: tz2CJBeWWLsUDjVUDqGZL6od3DeBCNzYXrXk
+# Entrypoint: set_delegate_parameters
+# Parameter: Pair 4000000 (Pair 20000000 Unit)
+def test_sign_set_delegate_parameters_transaction(app):
+    path = test_path / "delegate_parameters"
+
+    app.setup_expert_mode()
+
+    message = Message.from_bytes("0300000000000000000000000000000000000000000000000000000000000000006c01f6552df4f5ff51c3d13347cab045cfdb8b9bd803c0b8020031020000012bad922d045c068660fabe19576f8506a1fa8fa3ff090000001007070080a4e80307070080b48913030b")
+
+    data = app.sign(DEFAULT_ACCOUNT,
+                    message,
+                    with_hash=True,
+                    path=path)
 
     app.checker.check_signature(
         account=DEFAULT_ACCOUNT,
diff --git a/tests/integration/nano/test_too_complex_transaction.py b/tests/integration/nano/test_too_complex_transaction.py
deleted file mode 100644
index 342a4cd6..00000000
--- a/tests/integration/nano/test_too_complex_transaction.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2023 Functori <contact@functori.com>
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from pathlib import Path
-
-from utils.app import Screen, Screen_text, DEFAULT_ACCOUNT
-from utils.backend import StatusCode
-from utils.message import Message
-
-# Operation (0): Transaction
-# Fee: 0.05 XTZ
-# Storage limit: 45
-# Amount: 0.24 XTZ
-# Destination: KT18amZmM5W7qDWVt2pH6uj7sCEd3kbzLrHT
-# Entrypoint: do
-# Parameter: CAR
-
-def test_too_complex_transaction(app):
-    test_name = Path(__file__).stem
-
-    app.assert_screen(Screen.Home)
-
-    message = Message.from_bytes("0300000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e01000000000000000000000000000000000000000000ff02000000020316")
-
-    app._failing_signing(DEFAULT_ACCOUNT,
-                         message,
-                         with_hash=True,
-                         text=Screen_text.Back_home,
-                         status_code=StatusCode.REJECT,
-                         path=test_name)
-
-    app.quit()
diff --git a/tests/unit/ctest/tests_parser.c b/tests/unit/ctest/tests_parser.c
index 3b80a084..6d0db9ce 100644
--- a/tests/unit/ctest/tests_parser.c
+++ b/tests/unit/ctest/tests_parser.c
@@ -289,6 +289,87 @@ CTEST2(operation_parser, check_double_transaction_complexity)
     check_field_complexity(data, str, fields_check, sizeof(fields_check));
 }
 
+CTEST2(operation_parser, check_stake_complexity)
+{
+    char str[]
+        = "030000000000000000000000000000000000000000000000000000000000000000"
+          "6c01f6552df4f5ff51c3d13347cab045cfdb8b9bd803c0b8020031028094ebdc03"
+          "00012bad922d045c068660fabe19576f8506a1fa8fa3ff0600000002030b";
+    const tz_fields_check fields_check[] = {
+        {"Source",        false, 1},
+        {"Fee",           false, 2},
+        {"Storage limit", false, 3},
+        {"Amount",        false, 4},
+        {"Destination",   false, 5},
+ //     {"Option",        _,     6},
+  //    {"Tuple",         _,     7},
+        {"Entrypoint",    false, 8},
+        {"Parameter",     false, 9},
+    };
+    check_field_complexity(data, str, fields_check, sizeof(fields_check));
+}
+
+CTEST2(operation_parser, check_unstake_complexity)
+{
+    char str[]
+        = "030000000000000000000000000000000000000000000000000000000000000000"
+          "6c01f6552df4f5ff51c3d13347cab045cfdb8b9bd803c0b80200310280cab5ee01"
+          "00012bad922d045c068660fabe19576f8506a1fa8fa3ff0700000002030b";
+    const tz_fields_check fields_check[] = {
+        {"Source",        false, 1},
+        {"Fee",           false, 2},
+        {"Storage limit", false, 3},
+        {"Amount",        false, 4},
+        {"Destination",   false, 5},
+ //     {"Option",        _,     6},
+  //    {"Tuple",         _,     7},
+        {"Entrypoint",    false, 8},
+        {"Parameter",     false, 9},
+    };
+    check_field_complexity(data, str, fields_check, sizeof(fields_check));
+}
+
+CTEST2(operation_parser, check_finalize_unstake_complexity)
+{
+    char str[]
+        = "030000000000000000000000000000000000000000000000000000000000000000"
+          "6c01f6552df4f5ff51c3d13347cab045cfdb8b9bd803c0b8020031020000012bad"
+          "922d045c068660fabe19576f8506a1fa8fa3ff0800000002030b";
+    const tz_fields_check fields_check[] = {
+        {"Source",        false, 1},
+        {"Fee",           false, 2},
+        {"Storage limit", false, 3},
+        {"Amount",        false, 4},
+        {"Destination",   false, 5},
+ //     {"Option",        _,     6},
+  //    {"Tuple",         _,     7},
+        {"Entrypoint",    false, 8},
+        {"Parameter",     false, 9},
+    };
+    check_field_complexity(data, str, fields_check, sizeof(fields_check));
+}
+
+CTEST2(operation_parser, check_set_delegate_parameters_complexity)
+{
+    char str[]
+        = "030000000000000000000000000000000000000000000000000000000000000000"
+          "6c01f6552df4f5ff51c3d13347cab045cfdb8b9bd803c0b8020031020000012bad"
+          "922d045c068660fabe19576f8506a1fa8fa3ff090000001007070080a4e8030707"
+          "0080b48913030b";
+    const tz_fields_check fields_check[] = {
+        {"Source",        false, 1},
+        {"Fee",           false, 2},
+        {"Storage limit", false, 3},
+        {"Amount",        false, 4},
+        {"Destination",   false, 5},
+ //     {"Option",        _,     6},
+  //    {"Tuple",         _,     7},
+        {"Entrypoint",    false, 8},
+        {"Parameter",     true,  9},
+    };
+    check_field_complexity(data, str, fields_check, sizeof(fields_check));
+}
+
 CTEST2(operation_parser, check_origination_complexity)
 {
     char str[]