diff --git a/app/src/ui_stream_nbgl.c b/app/src/ui_stream_nbgl.c
index 1e7d24df8..b84f17278 100644
--- a/app/src/ui_stream_nbgl.c
+++ b/app/src/ui_stream_nbgl.c
@@ -15,7 +15,6 @@
    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. */
-
 #ifdef HAVE_NBGL
 
 #include <nbgl_use_case.h>
@@ -24,9 +23,10 @@
 #include "globals.h"
 #include "ui_stream.h"
 
-bool tz_ui_nav_cb(uint8_t page, nbgl_pageContent_t *content);
+bool tz_ui_nav_cb(void);
 bool has_final_screen(void);
 void tz_ui_stream_start(void);
+void tz_transaction_choice(bool getMorePairs);
 
 void drop_last_screen(void);
 void push_str(const char *text, size_t len, char **out);
@@ -62,8 +62,7 @@ tz_reject(void)
     }
 
     global.step = ST_IDLE;
-    nbgl_useCaseStatus("Transaction rejected", false, ui_home_init);
-
+    nbgl_useCaseReviewStatus(STATUS_TYPE_TRANSACTION_REJECTED, ui_home_init);
     FUNC_LEAVE();
 }
 
@@ -141,6 +140,7 @@ switch_to_blindsigning(__attribute__((unused)) const char *err_type,
 
     TZ_POSTAMBLE;
 }
+
 void
 expert_mode_splash(void)
 {
@@ -195,7 +195,7 @@ tz_accept_ui(void)
     global.keys.apdu.sign.step = SIGN_ST_WAIT_USER_INPUT;
     s->cb(TZ_UI_STREAM_CB_ACCEPT);
 
-    nbgl_useCaseStatus("TRANSACTION\nSIGNED", true, ui_home_init);
+    nbgl_useCaseReviewStatus(STATUS_TYPE_TRANSACTION_SIGNED, ui_home_init);
 
     FUNC_LEAVE();
 }
@@ -223,7 +223,6 @@ tz_ui_continue(void)
 
     if (!s->full) {
         TZ_CHECK(s->cb(TZ_UI_STREAM_CB_REFILL));
-        PRINTF("[DEBUG] total=%d\n", s->total);
     }
 
     TZ_POSTAMBLE;
@@ -233,10 +232,13 @@ void
 tz_ui_stream_cb(void)
 {
     FUNC_ENTER(("void"));
+    bool result = tz_ui_nav_cb();
+    if (result) {
+        tz_ui_stream_t         *s = &global.stream;
+        tz_ui_stream_display_t *c = &s->current_screen;
 
-    nbgl_useCaseForwardOnlyReviewNoSkip("Reject transaction", NULL,
-                                        tz_ui_nav_cb, tz_choice_ui);
-
+        nbgl_useCaseReviewStreamingContinue(&c->list, tz_transaction_choice);
+    }
     FUNC_LEAVE();
 }
 
@@ -267,6 +269,20 @@ tz_ui_review_start(void)
     FUNC_LEAVE();
 }
 
+void
+tz_transaction_choice(bool getMorePairs)
+{
+    FUNC_ENTER();
+    if (getMorePairs) {
+        // get more pairs
+        tz_ui_review_start();
+    } else {
+        tz_reject();
+    }
+
+    FUNC_LEAVE();
+}
+
 void
 tz_ui_stream_init(void (*cb)(tz_ui_cb_type_t cb_type))
 {
@@ -274,6 +290,7 @@ tz_ui_stream_init(void (*cb)(tz_ui_cb_type_t cb_type))
 
     FUNC_ENTER(("cb=%p", cb));
     memset(s, 0x0, sizeof(*s));
+    memset(global.error_code, '\0', sizeof(global.error_code));
     s->cb            = cb;
     s->full          = false;
     s->last          = 0;
@@ -282,10 +299,11 @@ tz_ui_stream_init(void (*cb)(tz_ui_cb_type_t cb_type))
     s->pressed_right = false;
 
     ui_strings_init();
+    nbgl_operationType_t op_type = TYPE_TRANSACTION;
+    nbgl_useCaseReviewStreamingStart(op_type, &C_tezos,
+                                     "Review request to sign operation", NULL,
+                                     tz_transaction_choice);
 
-    nbgl_useCaseReviewStart(&C_tezos, "Review request to sign operation",
-                            NULL, "Reject request", tz_ui_review_start,
-                            tz_reject_ui);
     FUNC_LEAVE();
 }
 
@@ -313,20 +331,16 @@ tz_ui_stream_close(void)
 }
 
 bool
-tz_ui_nav_cb(uint8_t page, nbgl_pageContent_t *content)
+tz_ui_nav_cb(void)
 {
-    FUNC_ENTER(("page=%d, content=%p", page, content));
+    FUNC_ENTER(("void"));
 
     tz_ui_stream_t         *s      = &global.stream;
     tz_ui_stream_display_t *c      = &s->current_screen;
     bool                    result = true;
     tz_parser_state        *st = &global.keys.apdu.sign.u.clear.parser_state;
 
-    PRINTF(
-        "[DEBUG] pressed_right=%d, current=%d, total=%d, full=%d, "
-        "global.step= %d\n",
-        s->pressed_right, s->current, s->total, s->full, global.step);
-
+    // Continue receiving data from the apdu until s->full is true.
     while (((s->total < 0) || ((s->current == s->total) && !s->full))
            && (st->errno < TZ_ERR_INVALID_TAG)) {
         PRINTF("tz_ui_nav_cb: Looping...\n");
@@ -343,11 +357,6 @@ tz_ui_nav_cb(uint8_t page, nbgl_pageContent_t *content)
         s->total++;
     }
 
-    PRINTF(
-        "[DEBUG] pressed_right=%d, current=%d, total=%d, full=%d, "
-        "global.step=%d\n",
-        s->pressed_right, s->current, s->total, s->full, global.step);
-
     if (global.step == ST_ERROR) {
         global.step = ST_IDLE;
         ui_home_init();
@@ -356,18 +365,9 @@ tz_ui_nav_cb(uint8_t page, nbgl_pageContent_t *content)
         result = false;
     } else if ((s->current == s->total) && s->full) {
         PRINTF("[DEBUG] signing...\n");
-        content->type                        = INFO_LONG_PRESS;
-        content->infoLongPress.icon          = &C_tezos;
-        content->infoLongPress.text          = "Sign transaction?";
-        content->infoLongPress.longPressText = "Hold to sign";
-    } else if (page == LAST_PAGE_FOR_REVIEW) {
-        s->current = s->total;
-        result     = false;
-
+        result = false;
+        nbgl_useCaseReviewStreamingFinish(SIGN("transaction"), tz_choice_ui);
     } else if (s->total >= 0) {
-        PRINTF("[DEBUG] Display: curr=%d total=%d pr=%d\n", s->current,
-               s->total, s->pressed_right);
-
         if (s->current < s->total) {
             s->current++;
         }
@@ -395,10 +395,7 @@ tz_ui_nav_cb(uint8_t page, nbgl_pageContent_t *content)
             c->list.nbPairs           = s->screens[bucket].nb_pairs;
             c->list.smallCaseForValue = false;
             c->list.wrapping          = true;
-
-            content->type         = TAG_VALUE_LIST;
-            content->tagValueList = c->list;
-            result                = true;
+            result                    = true;
         }
     }
 
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_too_deep/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_blindsign_too_deep/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_too_deep/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_blindsign_too_deep/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_too_deep/tbtd_review_0.png b/tests/integration/touch/snapshots/flex/test_blindsign_too_deep/tbtd_review_0.png
index 7ebfa46ea..fb3c6310c 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_too_deep/tbtd_review_0.png and b/tests/integration/touch/snapshots/flex/test_blindsign_too_deep/tbtd_review_0.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_too_deep_rejections/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_blindsign_too_deep_rejections/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_too_deep_rejections/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_blindsign_too_deep_rejections/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_too_deep_rejections/tbtdr_review_0.png b/tests/integration/touch/snapshots/flex/test_blindsign_too_deep_rejections/tbtdr_review_0.png
index 7ebfa46ea..fb3c6310c 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_too_deep_rejections/tbtdr_review_0.png and b/tests/integration/touch/snapshots/flex/test_blindsign_too_deep_rejections/tbtdr_review_0.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_too_large/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_blindsign_too_large/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_too_large/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_blindsign_too_large/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_valid/operation_sign.png b/tests/integration/touch/snapshots/flex/test_blindsign_valid/operation_sign.png
index 2a33cd67a..5e787d8ed 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_valid/operation_sign.png and b/tests/integration/touch/snapshots/flex/test_blindsign_valid/operation_sign.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_valid/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_blindsign_valid/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_valid/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_blindsign_valid/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_valid/signing_successful.png b/tests/integration/touch/snapshots/flex/test_blindsign_valid/signing_successful.png
index 2f04101d6..be51a9d55 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_valid/signing_successful.png and b/tests/integration/touch/snapshots/flex/test_blindsign_valid/signing_successful.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_01.png b/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_01.png
index b8a8cc373..9c28d3c9f 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_01.png and b/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_01.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_02.png b/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_02.png
index e1f4d3e8d..4b312ef04 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_02.png and b/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_02.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_03.png b/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_03.png
index 5244d4fe6..23a94933b 100644
Binary files a/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_03.png and b/tests/integration/touch/snapshots/flex/test_blindsign_valid/tst_review_03.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/tst_review_01.png b/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/tst_review_01.png
index b8a8cc373..9c28d3c9f 100644
Binary files a/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/tst_review_01.png and b/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/tst_review_01.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/tst_review_02.png b/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/tst_review_02.png
index e1f4d3e8d..4b312ef04 100644
Binary files a/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/tst_review_02.png and b/tests/integration/touch/snapshots/flex/test_expert_mode_rejections/tst_review_02.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_parsing_errors/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_parsing_errors/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_parsing_errors/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_parsing_errors/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_01.png b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_01.png
index b8a8cc373..9c28d3c9f 100644
Binary files a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_01.png and b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_01.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02.png b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02.png
index 312b49206..9bc554df5 100644
Binary files a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02.png and b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02_dest_only.png b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02_dest_only.png
index 81d49263c..b7ef39171 100644
Binary files a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02_dest_only.png and b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02_dest_only.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02_full.png b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02_full.png
index e1f4d3e8d..4b312ef04 100644
Binary files a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02_full.png and b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_02_full.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_03_full.png b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_03_full.png
index 5244d4fe6..23a94933b 100644
Binary files a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_03_full.png and b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_0_03_full.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_1_01.png b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_1_01.png
index 9603939c3..cd84a05a6 100644
Binary files a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_1_01.png and b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_1_01.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_too_deep_0.png b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_too_deep_0.png
index 7ebfa46ea..fb3c6310c 100644
Binary files a/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_too_deep_0.png and b/tests/integration/touch/snapshots/flex/test_parsing_errors/tpe_review_too_deep_0.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_reject_review_operation/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_reject_review_operation/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_reject_review_operation/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_reject_review_operation/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_reject_transfer/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_reject_transfer/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_reject_transfer/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_reject_transfer/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_reject_transfer/trt_review_1.png b/tests/integration/touch/snapshots/flex/test_reject_transfer/trt_review_1.png
index b8a8cc373..9c28d3c9f 100644
Binary files a/tests/integration/touch/snapshots/flex/test_reject_transfer/trt_review_1.png and b/tests/integration/touch/snapshots/flex/test_reject_transfer/trt_review_1.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_0.png b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_0.png
index 55ec6995d..c5a7ad65c 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_0.png and b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_0.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_1.png b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_1.png
index f58838db7..75d9e4e15 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_1.png and b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_1.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_2.png b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_2.png
index ce60e1686..e4814a994 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_2.png and b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_proof_396...834_2.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_sign.png b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_sign.png
index d9f368525..5e787d8ed 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_sign.png and b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/operation_sign.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/signing_successful.png b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/signing_successful.png
index 2f04101d6..be51a9d55 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/signing_successful.png and b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/signing_successful.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/tseom_review_00.png b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/tseom_review_00.png
index 9603939c3..cd84a05a6 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/tseom_review_00.png and b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/tseom_review_00.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/tseom_review_01.png b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/tseom_review_01.png
index 7aead597b..ccf1749b1 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/tseom_review_01.png and b/tests/integration/touch/snapshots/flex/test_sign_execute_outbox_messages/tseom_review_01.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer/operation_sign.png b/tests/integration/touch/snapshots/flex/test_sign_transfer/operation_sign.png
index 2a33cd67a..5e787d8ed 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer/operation_sign.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer/operation_sign.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_sign_transfer/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer/signing_successful.png b/tests/integration/touch/snapshots/flex/test_sign_transfer/signing_successful.png
index 2f04101d6..be51a9d55 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer/signing_successful.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer/signing_successful.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_01.png b/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_01.png
index b8a8cc373..9c28d3c9f 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_01.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_01.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_02.png b/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_02.png
index e1f4d3e8d..4b312ef04 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_02.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_02.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_03.png b/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_03.png
index 5244d4fe6..23a94933b 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_03.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer/tst_review_03.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/operation_sign.png b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/operation_sign.png
index 2a33cd67a..5e787d8ed 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/operation_sign.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/operation_sign.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_01.png b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_01.png
index b8a8cc373..9c28d3c9f 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_01.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_01.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_02.png b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_02.png
index e1f4d3e8d..4b312ef04 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_02.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_02.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_03.png b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_03.png
index 5244d4fe6..23a94933b 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_03.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_03.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_request_sign_operation.png b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_request_sign_operation.png
index 9d3ba29a5..00bec06df 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_request_sign_operation.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/signing_successful.png b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/signing_successful.png
index 2f04101d6..be51a9d55 100644
Binary files a/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/signing_successful.png and b/tests/integration/touch/snapshots/flex/test_sign_transfer_without_hash/signing_successful.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_too_deep/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_blindsign_too_deep/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_too_deep/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_blindsign_too_deep/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_too_deep/tbtd_review_0.png b/tests/integration/touch/snapshots/stax/test_blindsign_too_deep/tbtd_review_0.png
index 41efa88a1..55cace9a3 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_too_deep/tbtd_review_0.png and b/tests/integration/touch/snapshots/stax/test_blindsign_too_deep/tbtd_review_0.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_too_deep_rejections/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_blindsign_too_deep_rejections/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_too_deep_rejections/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_blindsign_too_deep_rejections/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_too_deep_rejections/tbtdr_review_0.png b/tests/integration/touch/snapshots/stax/test_blindsign_too_deep_rejections/tbtdr_review_0.png
index 41efa88a1..55cace9a3 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_too_deep_rejections/tbtdr_review_0.png and b/tests/integration/touch/snapshots/stax/test_blindsign_too_deep_rejections/tbtdr_review_0.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_too_large/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_blindsign_too_large/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_too_large/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_blindsign_too_large/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_valid/operation_sign.png b/tests/integration/touch/snapshots/stax/test_blindsign_valid/operation_sign.png
index 86df262c7..c1e5457de 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_valid/operation_sign.png and b/tests/integration/touch/snapshots/stax/test_blindsign_valid/operation_sign.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_valid/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_blindsign_valid/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_valid/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_blindsign_valid/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_valid/signing_successful.png b/tests/integration/touch/snapshots/stax/test_blindsign_valid/signing_successful.png
index a24543af4..392165d4f 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_valid/signing_successful.png and b/tests/integration/touch/snapshots/stax/test_blindsign_valid/signing_successful.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_01.png b/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_01.png
index 2307a8814..2b7e7f5bd 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_01.png and b/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_01.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_02.png b/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_02.png
index ac9f785e6..99f8b3d23 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_02.png and b/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_02.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_03.png b/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_03.png
index d48444ff1..a754bd99a 100644
Binary files a/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_03.png and b/tests/integration/touch/snapshots/stax/test_blindsign_valid/tst_review_03.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/tst_review_01.png b/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/tst_review_01.png
index 2307a8814..2b7e7f5bd 100644
Binary files a/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/tst_review_01.png and b/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/tst_review_01.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/tst_review_02.png b/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/tst_review_02.png
index ac9f785e6..99f8b3d23 100644
Binary files a/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/tst_review_02.png and b/tests/integration/touch/snapshots/stax/test_expert_mode_rejections/tst_review_02.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_parsing_errors/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_parsing_errors/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_parsing_errors/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_parsing_errors/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_01.png b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_01.png
index 2307a8814..2b7e7f5bd 100644
Binary files a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_01.png and b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_01.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02.png b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02.png
index 53edbdc44..7b910dfe5 100644
Binary files a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02.png and b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02_dest_only.png b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02_dest_only.png
index 5a317c134..63cfead84 100644
Binary files a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02_dest_only.png and b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02_dest_only.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02_full.png b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02_full.png
index ac9f785e6..99f8b3d23 100644
Binary files a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02_full.png and b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_02_full.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_03_full.png b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_03_full.png
index d48444ff1..a754bd99a 100644
Binary files a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_03_full.png and b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_0_03_full.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_1_01.png b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_1_01.png
index 6c3863b91..38c0ba0df 100644
Binary files a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_1_01.png and b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_1_01.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_too_deep_0.png b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_too_deep_0.png
index 41efa88a1..55cace9a3 100644
Binary files a/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_too_deep_0.png and b/tests/integration/touch/snapshots/stax/test_parsing_errors/tpe_review_too_deep_0.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_reject_review_operation/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_reject_review_operation/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_reject_review_operation/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_reject_review_operation/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_reject_transfer/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_reject_transfer/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_reject_transfer/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_reject_transfer/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_reject_transfer/trt_review_1.png b/tests/integration/touch/snapshots/stax/test_reject_transfer/trt_review_1.png
index 2307a8814..2b7e7f5bd 100644
Binary files a/tests/integration/touch/snapshots/stax/test_reject_transfer/trt_review_1.png and b/tests/integration/touch/snapshots/stax/test_reject_transfer/trt_review_1.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_0.png b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_0.png
index 61753131d..c58bef7b0 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_0.png and b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_0.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_1.png b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_1.png
index afdf8da80..d8d320a1e 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_1.png and b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_1.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_2.png b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_2.png
index c16356118..59731fe56 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_2.png and b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_proof_396...834_2.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_sign.png b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_sign.png
index 4cddc94eb..c1e5457de 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_sign.png and b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/operation_sign.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/signing_successful.png b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/signing_successful.png
index a24543af4..392165d4f 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/signing_successful.png and b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/signing_successful.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/tseom_review_00.png b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/tseom_review_00.png
index 6c3863b91..38c0ba0df 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/tseom_review_00.png and b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/tseom_review_00.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/tseom_review_01.png b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/tseom_review_01.png
index b529a3dd1..6db2e7fd5 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/tseom_review_01.png and b/tests/integration/touch/snapshots/stax/test_sign_execute_outbox_messages/tseom_review_01.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer/operation_sign.png b/tests/integration/touch/snapshots/stax/test_sign_transfer/operation_sign.png
index 86df262c7..c1e5457de 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer/operation_sign.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer/operation_sign.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_sign_transfer/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer/signing_successful.png b/tests/integration/touch/snapshots/stax/test_sign_transfer/signing_successful.png
index a24543af4..392165d4f 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer/signing_successful.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer/signing_successful.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_01.png b/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_01.png
index 2307a8814..2b7e7f5bd 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_01.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_01.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_02.png b/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_02.png
index ac9f785e6..99f8b3d23 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_02.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_02.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_03.png b/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_03.png
index d48444ff1..a754bd99a 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_03.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer/tst_review_03.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/operation_sign.png b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/operation_sign.png
index 86df262c7..c1e5457de 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/operation_sign.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/operation_sign.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_01.png b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_01.png
index 2307a8814..2b7e7f5bd 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_01.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_01.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_02.png b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_02.png
index ac9f785e6..99f8b3d23 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_02.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_02.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_03.png b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_03.png
index d48444ff1..a754bd99a 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_03.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_03.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_request_sign_operation.png b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_request_sign_operation.png
index f63326a66..68c268b95 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_request_sign_operation.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/review_request_sign_operation.png differ
diff --git a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/signing_successful.png b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/signing_successful.png
index a24543af4..392165d4f 100644
Binary files a/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/signing_successful.png and b/tests/integration/touch/snapshots/stax/test_sign_transfer_without_hash/signing_successful.png differ