diff --git a/src/ui_confirm_selector_nbgl.c b/src/ui_confirm_selector_nbgl.c
index 9b6279c..f0c0439 100644
--- a/src/ui_confirm_selector_nbgl.c
+++ b/src/ui_confirm_selector_nbgl.c
@@ -14,44 +14,35 @@ static void approveCallback(void) {
 
 static void confirmationCallback(bool confirm) {
     if (confirm) {
-        nbgl_useCaseStatus("SELECTOR\nAPPROVED", true, ui_idle);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_OPERATION_SIGNED, ui_idle);
         approveCallback();
     }
     else {
-        nbgl_useCaseStatus("Selector rejected", false, ui_idle);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_OPERATION_REJECTED, ui_idle);
         rejectCallback();
     }
 }
 
-static void continueCallback(void) {
-    tagValueList.pairs = tagValuePair;
-    tagValueList.smallCaseForValue = false;
-
-    infoLongPress.text = "Approve selector";
-    infoLongPress.icon = &C_celo_64px;
-    infoLongPress.longPressText = "Hold to sign";
-    infoLongPress.longPressToken = 0;
-    infoLongPress.tuneId = TUNE_TAP_CASUAL;
-
-    nbgl_useCaseStaticReview(&tagValueList, &infoLongPress, "Cancel", confirmationCallback);
-}
-
 void ui_confirm_selector_flow(void) {
     tagValuePair[0].item = "Selector";
     tagValuePair[0].value = (char*)strings.tmp.tmp;
 
+    tagValueList.nbMaxLinesForValue = 0;
     tagValueList.nbPairs = 1;
+    tagValueList.pairs = tagValuePair;
 
-    nbgl_useCaseReviewStart(&C_celo_64px, "Verify selector", "", "Cancel", continueCallback, rejectCallback);
+    nbgl_useCaseReview(TYPE_TRANSACTION, &tagValueList, &C_celo_64px, "Verify selector", NULL, "Confirm selector", confirmationCallback);
 }
 
 void ui_confirm_parameter_flow(void) {
     tagValuePair[0].item = "Parameter";
     tagValuePair[0].value = (char*)strings.tmp.tmp;
 
+    tagValueList.nbMaxLinesForValue = 0;
     tagValueList.nbPairs = 1;
+    tagValueList.pairs = tagValuePair;
 
-    nbgl_useCaseReviewStart(&C_celo_64px, "Verify", strings.tmp.tmp2, "Cancel", continueCallback, rejectCallback);
+    nbgl_useCaseReview(TYPE_TRANSACTION, &tagValueList, &C_celo_64px, "Verify", NULL, "Confirm", confirmationCallback);
 }
 
 #endif // HAVE_NBGL
diff --git a/src/ui_display_public_nbgl.c b/src/ui_display_public_nbgl.c
index 814535c..79376b9 100644
--- a/src/ui_display_public_nbgl.c
+++ b/src/ui_display_public_nbgl.c
@@ -4,13 +4,13 @@
 #include "bolos_target.h"
 
 static void address_cancel(void) {
-    nbgl_useCaseStatus("Address rejected", false, ui_idle);
+    nbgl_useCaseReviewStatus(STATUS_TYPE_ADDRESS_REJECTED, ui_idle);
     io_seproxyhal_touch_address_cancel();
 }
 
 static void address_confirmation(bool confirm) {
     if (confirm) {
-        nbgl_useCaseStatus("ADDRESS\nAPPROVED", true, ui_idle);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_ADDRESS_VERIFIED, ui_idle);
         io_seproxyhal_touch_address_ok();
     }
     else {
@@ -18,17 +18,13 @@ static void address_confirmation(bool confirm) {
     }
 }
 
-static void address_display(void) {
-    nbgl_useCaseAddressConfirmation(strings.common.fullAddress, address_confirmation);
-}
-
 void ui_display_public_flow(void) {
-    nbgl_useCaseReviewStart(&C_celo_64px,
-                            "Verify Celo\naddress",
-                            "",
-                            "Cancel",
-                            address_display,
-                            address_cancel);
+    nbgl_useCaseAddressReview(tmpCtx.publicKeyContext.address,
+                              NULL,
+                              &C_celo_64px,
+                              "Verify Celo\naddress",
+                              NULL,
+                              address_confirmation);
 }
 
 #endif // HAVE_NBGL
diff --git a/src/ui_settings_nbgl.c b/src/ui_settings_nbgl.c
index ea9aa3c..e1f29a1 100644
--- a/src/ui_settings_nbgl.c
+++ b/src/ui_settings_nbgl.c
@@ -10,9 +10,8 @@
 #define IS_TOUCHABLE false
 
 // Forward declaration
-static void displaySettingsMenu(void);
-static void settingsControlsCallback(int token, uint8_t index);
-static bool settingsNavCallback(uint8_t page, nbgl_pageContent_t *content);
+static uint8_t initSettingPage;
+static void controls_callback(int token, uint8_t index, int page);
 
 enum {
     SWITCH_CONTRACT_DATA_SET_TOKEN = FIRST_USER_TOKEN,
@@ -20,44 +19,33 @@ enum {
     NB_SETTINGS_SWITCHES,
 };
 
-static nbgl_layoutSwitch_t switches[NB_SETTINGS_SWITCHES - FIRST_USER_TOKEN];
+static nbgl_contentSwitch_t switches[NB_SETTINGS_SWITCHES - FIRST_USER_TOKEN];
 
-static const char* const infoTypes[] = {"Version", "Celo App"};
-static const char* const infoContents[] = {APPVERSION, "(c) 2022 Ledger"};
+static const char* const infoTypes[NB_INFO_FIELDS] = {"Version", "Celo App"};
+static const char* const infoContents[NB_INFO_FIELDS] = {APPVERSION, "(c) 2022 Ledger"};
 
 static void onQuitCallback(void) {
     os_sched_exit(-1);
 }
 
-static bool settingsNavCallback(uint8_t page, nbgl_pageContent_t *content) {
-    if (page == 0) {
-        content->type = INFOS_LIST;
-        content->infosList.nbInfos = NB_INFO_FIELDS;
-        content->infosList.infoTypes = (const char**) infoTypes;
-        content->infosList.infoContents = (const char**) infoContents;
-    }
-    else if (page == 1) {
-        switches[0].text = "Contract data";
-        switches[0].subText = "Allow contract data\nin transactions";
-        switches[0].token = SWITCH_CONTRACT_DATA_SET_TOKEN;
-        switches[0].tuneId = TUNE_TAP_CASUAL;
-        switches[0].initState = N_storage.dataAllowed;
+static const nbgl_contentInfoList_t infoList = {
+    .nbInfos = NB_INFO_FIELDS,
+    .infoTypes = (const char**) infoTypes,
+    .infoContents = (const char**) infoContents,
+};
 
-        switches[1].text = "Debug data";
-        switches[1].subText = "Display contract data details";
-        switches[1].token = SWITCH_DEBUG_DATA_SET_TOKEN;
-        switches[1].tuneId = TUNE_TAP_CASUAL; 
-        switches[1].initState = N_storage.contractDetails;
 
-        content->type = SWITCHES_LIST;
-        content->switchesList.nbSwitches = NB_SETTINGS_SWITCHES - FIRST_USER_TOKEN,
-        content->switchesList.switches = (nbgl_layoutSwitch_t*) switches;
-    }
-    else {
-        return false;
-    }
-    return true;
-}
+// settings menu definition
+#define SETTING_CONTENTS_NB 1
+static const nbgl_content_t contents[SETTING_CONTENTS_NB] = {
+    {.type = SWITCHES_LIST,
+     .content.switchesList.nbSwitches = NB_SETTINGS_SWITCHES - FIRST_USER_TOKEN,
+     .content.switchesList.switches = (nbgl_layoutSwitch_t*) switches,
+     .contentActionCallback = controls_callback}};
+
+static const nbgl_genericContents_t settingContents = {.callbackCallNeeded = false,
+                                                       .contentsList = contents,
+                                                       .nbContents = SETTING_CONTENTS_NB};
 
 static void switch_settings_contract_data() {
   uint8_t value = (N_storage.dataAllowed ? 0 : 1);
@@ -68,14 +56,14 @@ static void switch_settings_display_data() {
   uint8_t value = (N_storage.contractDetails ? 0 : 1);
   nvm_write(&N_storage.contractDetails, (void*)&value, sizeof(uint8_t));
 }
-
-static void settingsControlsCallback(int token, uint8_t index) {
+static void controls_callback(int token, uint8_t index, int page) {
     UNUSED(index);
+    initSettingPage = page;
     switch(token)
     {
         case SWITCH_CONTRACT_DATA_SET_TOKEN:
             switch_settings_contract_data();
-            break;   
+            break;
 
         case SWITCH_DEBUG_DATA_SET_TOKEN:
             switch_settings_display_data();
@@ -88,19 +76,31 @@ static void settingsControlsCallback(int token, uint8_t index) {
 
     switches[0].initState = N_storage.dataAllowed;
     switches[1].initState = N_storage.contractDetails;
-
-    displaySettingsMenu();
-}
-
-static void displaySettingsMenu(void) {
-    nbgl_useCaseSettings("Celo settings", PAGE_START, NB_PAGE_SETTING, IS_TOUCHABLE, ui_idle, 
-            settingsNavCallback, settingsControlsCallback);
 }
 
 void ui_idle(void) {
-    nbgl_useCaseHome("Celo", &C_celo_64px, 
-            NULL, true, 
-            displaySettingsMenu, onQuitCallback);
+        switches[0].initState = N_storage.dataAllowed;
+        switches[0].text = "Contract data";
+        switches[0].subText = "Allow contract data\nin transactions";
+        switches[0].token = SWITCH_CONTRACT_DATA_SET_TOKEN;
+        switches[0].tuneId = TUNE_TAP_CASUAL;
+
+        switches[1].initState = N_storage.contractDetails;
+        switches[1].text = "Debug data";
+        switches[1].subText = "Display contract data details";
+        switches[1].token = SWITCH_DEBUG_DATA_SET_TOKEN;
+        switches[1].tuneId = TUNE_TAP_CASUAL;
+
+    nbgl_useCaseHomeAndSettings(
+        "Celo",
+        &C_celo_64px,
+        NULL,
+        INIT_HOME_PAGE,
+        &settingContents,
+        &infoList,
+        NULL,
+        onQuitCallback
+    );
 }
 
 #endif // HAVE_NBGL
diff --git a/src/ui_sign_nbgl.c b/src/ui_sign_nbgl.c
index 7d16d78..3486429 100644
--- a/src/ui_sign_nbgl.c
+++ b/src/ui_sign_nbgl.c
@@ -5,13 +5,13 @@
 #include "bolos_target.h"
 
 static void sign_cancel(void) {
-    nbgl_useCaseStatus("Message rejected", false, ui_idle);
+    nbgl_useCaseReviewStatus(STATUS_TYPE_MESSAGE_REJECTED, ui_idle);
     io_seproxyhal_touch_signMessage_cancel();
 }
 
 static void sign_confirmation(bool confirm) {
     if (confirm) {
-        nbgl_useCaseStatus("MESSAGE\nAPPROVED", true, ui_idle);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_MESSAGE_SIGNED, ui_idle);
         io_seproxyhal_touch_signMessage_ok();
     }
     else {
@@ -19,7 +19,7 @@ static void sign_confirmation(bool confirm) {
     }
 }
 
-static void sign_display(void) {
+void ui_display_sign_flow(void) {
     tagValuePair[0].item = "Message hash";
     tagValuePair[0].value = (char*)strings.common.fullAddress;
 
@@ -27,21 +27,6 @@ static void sign_display(void) {
     tagValueList.pairs = tagValuePair;
     tagValueList.smallCaseForValue = false;
 
-    infoLongPress.text = "Sign message";
-    infoLongPress.icon = &C_celo_64px;
-    infoLongPress.longPressText = "Hold to sign";
-    infoLongPress.longPressToken = 0;
-    infoLongPress.tuneId = TUNE_TAP_CASUAL;
-
-    nbgl_useCaseStaticReview(&tagValueList, &infoLongPress, "Cancel", sign_confirmation);
-}
-
-void ui_display_sign_flow(void) {
-    nbgl_useCaseReviewStart(&C_celo_64px,
-                            "Review message",
-                            "",
-                            "Cancel",
-                            sign_display,
-                            sign_cancel);
+    nbgl_useCaseReview(TYPE_MESSAGE, &tagValueList, &C_celo_64px, "Review message", NULL, "Sign message", sign_confirmation);
 }
 #endif // HAVE_NBGL
diff --git a/src/ui_tx_nbgl.c b/src/ui_tx_nbgl.c
index c26222a..56548de 100644
--- a/src/ui_tx_nbgl.c
+++ b/src/ui_tx_nbgl.c
@@ -14,11 +14,11 @@ static void approveCallback(void) {
 
 static void confirmationCallback(bool confirm) {
     if (confirm) {
-        nbgl_useCaseStatus("TRANSACTION\nAPPROVED", true, ui_idle);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_TRANSACTION_SIGNED, ui_idle);
         approveCallback();
     }
     else {
-        nbgl_useCaseStatus("Transaction rejected", false, ui_idle);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_TRANSACTION_REJECTED, ui_idle);
         rejectCallback();
     }
 }
@@ -36,7 +36,7 @@ static void continueCallback(void) {
 }
 
 static void warningCallback(void) {
-    nbgl_useCaseReviewStart(&C_warning64px, "WARNING", "Data present", "Cancel", continueCallback, rejectCallback);
+    nbgl_useCaseReviewStart(&C_Warning_64px, "WARNING", "Data present", "Cancel", continueCallback, rejectCallback);
 }
 
 static void fill_data_tx(void) {
@@ -50,6 +50,7 @@ static void fill_data_tx(void) {
     tagValuePair[2].value = (char*)strings.common.maxFee;
 
     tagValueList.nbPairs = 3;
+    tagValueList.pairs = tagValuePair;
 }
 
 static void fill_gateway_tx(void) {
@@ -69,6 +70,7 @@ static void fill_gateway_tx(void) {
     tagValuePair[4].value = (char*)strings.common.fullGatewayAddress;
 
     tagValueList.nbPairs = 5;
+    tagValueList.pairs = tagValuePair;
 }
 
 static void fill_lock_relock(void) {
@@ -82,6 +84,7 @@ static void fill_lock_relock(void) {
     tagValuePair[2].value = (char*)strings.common.maxFee;
 
     tagValueList.nbPairs = 3;
+    tagValueList.pairs = tagValuePair;
 }
 
 static void fill_withdraw_or_create_account(void) {
@@ -92,6 +95,7 @@ static void fill_withdraw_or_create_account(void) {
     tagValuePair[1].value = (char*)strings.common.maxFee;
 
     tagValueList.nbPairs = 2;
+    tagValueList.pairs = tagValuePair;
 }
 
 static void fill_activate(void) {
@@ -105,6 +109,7 @@ static void fill_activate(void) {
     tagValuePair[2].value = (char*)strings.common.maxFee;
 
     tagValueList.nbPairs = 3;
+    tagValueList.pairs = tagValuePair;
 }
 
 static void fill_vote_revoke(void) {
@@ -121,11 +126,12 @@ static void fill_vote_revoke(void) {
     tagValuePair[3].value = (char*)strings.common.maxFee;
 
     tagValueList.nbPairs = 4;
+    tagValueList.pairs = tagValuePair;
 }
 
 void ui_approval_celo_tx_flow(void) {
     fill_data_tx();
-    nbgl_useCaseReviewStart(&C_celo_64px, "Review transaction", "", "Cancel", continueCallback, rejectCallback);
+    nbgl_useCaseReview(TYPE_TRANSACTION, &tagValueList, &C_celo_64px, "Review transaction", NULL, "Approve Transaction", confirmationCallback);
 }
 
 void ui_approval_celo_data_warning_tx_flow(void) {
@@ -135,7 +141,7 @@ void ui_approval_celo_data_warning_tx_flow(void) {
 
 void ui_approval_celo_gateway_tx_flow(void) {
     fill_gateway_tx();
-    nbgl_useCaseReviewStart(&C_celo_64px, "Review transaction", "", "Cancel", continueCallback, rejectCallback);
+    nbgl_useCaseReview(TYPE_TRANSACTION, &tagValueList, &C_celo_64px, "Review transaction", NULL, "Approve Transaction", confirmationCallback);
 }
 
 void ui_approval_celo_data_warning_gateway_tx_flow(void) {
@@ -145,32 +151,31 @@ void ui_approval_celo_data_warning_gateway_tx_flow(void) {
 
 void ui_approval_celo_lock_unlock_flow(void) {
     fill_lock_relock();
-    nbgl_useCaseReviewStart(&C_celo_64px, "Review transaction", "", "Cancel", continueCallback, rejectCallback);
+    nbgl_useCaseReview(TYPE_TRANSACTION, &tagValueList, &C_celo_64px, "Review transaction", NULL, "Approve Transaction", confirmationCallback);
 }
 
 void ui_approval_celo_relock_flow(void) {
     fill_lock_relock();
-    nbgl_useCaseReviewStart(&C_celo_64px, "Review transaction", "", "Cancel", continueCallback, rejectCallback);
+    nbgl_useCaseReview(TYPE_TRANSACTION, &tagValueList, &C_celo_64px, "Review transaction", NULL, "Approve Transaction", confirmationCallback);
 }
 
 void ui_approval_celo_withdraw_flow(void) {
     fill_withdraw_or_create_account();
-    nbgl_useCaseReviewStart(&C_celo_64px, "Review transaction", "", "Cancel", continueCallback, rejectCallback);
+    nbgl_useCaseReview(TYPE_TRANSACTION, &tagValueList, &C_celo_64px, "Review transaction", NULL, "Approve Transaction", confirmationCallback);
 }
 
 void ui_approval_celo_create_account_flow(void) {
     fill_withdraw_or_create_account();
-    nbgl_useCaseReviewStart(&C_celo_64px, "Review transaction", "", "Cancel", continueCallback, rejectCallback);
-}
+    nbgl_useCaseReview(TYPE_TRANSACTION, &tagValueList, &C_celo_64px, "Review transaction", NULL, "Approve Transaction", confirmationCallback);}
 
 void ui_approval_celo_activate_flow(void) {
     fill_activate();
-    nbgl_useCaseReviewStart(&C_celo_64px, "Review transaction", "", "Cancel", continueCallback, rejectCallback);
+    nbgl_useCaseReview(TYPE_TRANSACTION, &tagValueList, &C_celo_64px, "Review transaction", NULL, "Approve Transaction", confirmationCallback);
 }
 
 void ui_approval_celo_vote_revoke_flow(void) {
     fill_vote_revoke();
-    nbgl_useCaseReviewStart(&C_celo_64px, "Review transaction", "", "Cancel", continueCallback, rejectCallback);
+    nbgl_useCaseReview(TYPE_TRANSACTION, &tagValueList, &C_celo_64px, "Review transaction", NULL, "Approve Transaction", confirmationCallback);
 }
 
 #endif // HAVE_NBGL
diff --git a/tests/python/snapshots/flex/test_celo_derive_address/00000.png b/tests/python/snapshots/flex/test_celo_derive_address/00000.png
index 27ec97d..b43dda0 100644
Binary files a/tests/python/snapshots/flex/test_celo_derive_address/00000.png and b/tests/python/snapshots/flex/test_celo_derive_address/00000.png differ
diff --git a/tests/python/snapshots/flex/test_celo_derive_address/00001.png b/tests/python/snapshots/flex/test_celo_derive_address/00001.png
index 256443f..ad3809f 100644
Binary files a/tests/python/snapshots/flex/test_celo_derive_address/00001.png and b/tests/python/snapshots/flex/test_celo_derive_address/00001.png differ
diff --git a/tests/python/snapshots/flex/test_celo_derive_address/00002.png b/tests/python/snapshots/flex/test_celo_derive_address/00002.png
index 6e602b5..0acd7a7 100644
Binary files a/tests/python/snapshots/flex/test_celo_derive_address/00002.png and b/tests/python/snapshots/flex/test_celo_derive_address/00002.png differ
diff --git a/tests/python/snapshots/flex/test_celo_derive_address/00003.png b/tests/python/snapshots/flex/test_celo_derive_address/00003.png
index 256443f..ad3809f 100644
Binary files a/tests/python/snapshots/flex/test_celo_derive_address/00003.png and b/tests/python/snapshots/flex/test_celo_derive_address/00003.png differ
diff --git a/tests/python/snapshots/flex/test_celo_derive_address/00004.png b/tests/python/snapshots/flex/test_celo_derive_address/00004.png
index 3f6e5f4..4321e60 100644
Binary files a/tests/python/snapshots/flex/test_celo_derive_address/00004.png and b/tests/python/snapshots/flex/test_celo_derive_address/00004.png differ
diff --git a/tests/python/snapshots/flex/test_sign_data/00000.png b/tests/python/snapshots/flex/test_sign_data/00000.png
index 7d44e97..3cbed78 100644
Binary files a/tests/python/snapshots/flex/test_sign_data/00000.png and b/tests/python/snapshots/flex/test_sign_data/00000.png differ
diff --git a/tests/python/snapshots/flex/test_sign_data/00001.png b/tests/python/snapshots/flex/test_sign_data/00001.png
index 1bb99bb..29e5d9b 100644
Binary files a/tests/python/snapshots/flex/test_sign_data/00001.png and b/tests/python/snapshots/flex/test_sign_data/00001.png differ
diff --git a/tests/python/snapshots/flex/test_sign_data/00002.png b/tests/python/snapshots/flex/test_sign_data/00002.png
index 27d33ad..9f5657a 100644
Binary files a/tests/python/snapshots/flex/test_sign_data/00002.png and b/tests/python/snapshots/flex/test_sign_data/00002.png differ
diff --git a/tests/python/snapshots/flex/test_sign_data/00003.png b/tests/python/snapshots/flex/test_sign_data/00003.png
index 6232a6f..8b981d4 100644
Binary files a/tests/python/snapshots/flex/test_sign_data/00003.png and b/tests/python/snapshots/flex/test_sign_data/00003.png differ
diff --git a/tests/python/snapshots/flex/test_sign_transaction_cip64/00000.png b/tests/python/snapshots/flex/test_sign_transaction_cip64/00000.png
index 564d6c0..0a24b22 100644
Binary files a/tests/python/snapshots/flex/test_sign_transaction_cip64/00000.png and b/tests/python/snapshots/flex/test_sign_transaction_cip64/00000.png differ
diff --git a/tests/python/snapshots/flex/test_sign_transaction_cip64/00001.png b/tests/python/snapshots/flex/test_sign_transaction_cip64/00001.png
index 03645c3..852ebd3 100644
Binary files a/tests/python/snapshots/flex/test_sign_transaction_cip64/00001.png and b/tests/python/snapshots/flex/test_sign_transaction_cip64/00001.png differ
diff --git a/tests/python/snapshots/flex/test_sign_transaction_cip64/00002.png b/tests/python/snapshots/flex/test_sign_transaction_cip64/00002.png
index 9b4d36c..361fa53 100644
Binary files a/tests/python/snapshots/flex/test_sign_transaction_cip64/00002.png and b/tests/python/snapshots/flex/test_sign_transaction_cip64/00002.png differ
diff --git a/tests/python/snapshots/flex/test_sign_transaction_cip64/00003.png b/tests/python/snapshots/flex/test_sign_transaction_cip64/00003.png
index dd45f7c..be51a9d 100644
Binary files a/tests/python/snapshots/flex/test_sign_transaction_cip64/00003.png and b/tests/python/snapshots/flex/test_sign_transaction_cip64/00003.png differ
diff --git a/tests/python/snapshots/flex/test_sign_transaction_eip1559/00004.png b/tests/python/snapshots/flex/test_sign_transaction_eip1559/00004.png
index dd45f7c..be51a9d 100644
Binary files a/tests/python/snapshots/flex/test_sign_transaction_eip1559/00004.png and b/tests/python/snapshots/flex/test_sign_transaction_eip1559/00004.png differ
diff --git a/tests/python/snapshots/stax/test_celo_derive_address/00000.png b/tests/python/snapshots/stax/test_celo_derive_address/00000.png
index e819ad6..144f75a 100644
Binary files a/tests/python/snapshots/stax/test_celo_derive_address/00000.png and b/tests/python/snapshots/stax/test_celo_derive_address/00000.png differ
diff --git a/tests/python/snapshots/stax/test_celo_derive_address/00001.png b/tests/python/snapshots/stax/test_celo_derive_address/00001.png
index 4951441..00928d8 100644
Binary files a/tests/python/snapshots/stax/test_celo_derive_address/00001.png and b/tests/python/snapshots/stax/test_celo_derive_address/00001.png differ
diff --git a/tests/python/snapshots/stax/test_celo_derive_address/00002.png b/tests/python/snapshots/stax/test_celo_derive_address/00002.png
index 925d273..92ab0a3 100644
Binary files a/tests/python/snapshots/stax/test_celo_derive_address/00002.png and b/tests/python/snapshots/stax/test_celo_derive_address/00002.png differ
diff --git a/tests/python/snapshots/stax/test_celo_derive_address/00003.png b/tests/python/snapshots/stax/test_celo_derive_address/00003.png
index 4951441..00928d8 100644
Binary files a/tests/python/snapshots/stax/test_celo_derive_address/00003.png and b/tests/python/snapshots/stax/test_celo_derive_address/00003.png differ
diff --git a/tests/python/snapshots/stax/test_celo_derive_address/00004.png b/tests/python/snapshots/stax/test_celo_derive_address/00004.png
index e5a5f1f..7a49478 100644
Binary files a/tests/python/snapshots/stax/test_celo_derive_address/00004.png and b/tests/python/snapshots/stax/test_celo_derive_address/00004.png differ
diff --git a/tests/python/snapshots/stax/test_sign_data/00000.png b/tests/python/snapshots/stax/test_sign_data/00000.png
index 30470eb..ff7093c 100644
Binary files a/tests/python/snapshots/stax/test_sign_data/00000.png and b/tests/python/snapshots/stax/test_sign_data/00000.png differ
diff --git a/tests/python/snapshots/stax/test_sign_data/00001.png b/tests/python/snapshots/stax/test_sign_data/00001.png
index d89d8dc..5259473 100644
Binary files a/tests/python/snapshots/stax/test_sign_data/00001.png and b/tests/python/snapshots/stax/test_sign_data/00001.png differ
diff --git a/tests/python/snapshots/stax/test_sign_data/00002.png b/tests/python/snapshots/stax/test_sign_data/00002.png
index 3ec7bd5..8be9f6d 100644
Binary files a/tests/python/snapshots/stax/test_sign_data/00002.png and b/tests/python/snapshots/stax/test_sign_data/00002.png differ
diff --git a/tests/python/snapshots/stax/test_sign_data/00003.png b/tests/python/snapshots/stax/test_sign_data/00003.png
index 512ecf7..cfee3ae 100644
Binary files a/tests/python/snapshots/stax/test_sign_data/00003.png and b/tests/python/snapshots/stax/test_sign_data/00003.png differ
diff --git a/tests/python/snapshots/stax/test_sign_transaction_cip64/00000.png b/tests/python/snapshots/stax/test_sign_transaction_cip64/00000.png
index e85f35a..58ef483 100644
Binary files a/tests/python/snapshots/stax/test_sign_transaction_cip64/00000.png and b/tests/python/snapshots/stax/test_sign_transaction_cip64/00000.png differ
diff --git a/tests/python/snapshots/stax/test_sign_transaction_cip64/00001.png b/tests/python/snapshots/stax/test_sign_transaction_cip64/00001.png
index 0d5572e..cb67d88 100644
Binary files a/tests/python/snapshots/stax/test_sign_transaction_cip64/00001.png and b/tests/python/snapshots/stax/test_sign_transaction_cip64/00001.png differ
diff --git a/tests/python/snapshots/stax/test_sign_transaction_cip64/00002.png b/tests/python/snapshots/stax/test_sign_transaction_cip64/00002.png
index fb6ac54..0b31f76 100644
Binary files a/tests/python/snapshots/stax/test_sign_transaction_cip64/00002.png and b/tests/python/snapshots/stax/test_sign_transaction_cip64/00002.png differ
diff --git a/tests/python/snapshots/stax/test_sign_transaction_cip64/00003.png b/tests/python/snapshots/stax/test_sign_transaction_cip64/00003.png
index e1fc433..392165d 100644
Binary files a/tests/python/snapshots/stax/test_sign_transaction_cip64/00003.png and b/tests/python/snapshots/stax/test_sign_transaction_cip64/00003.png differ
diff --git a/tests/python/snapshots/stax/test_sign_transaction_eip1559/00004.png b/tests/python/snapshots/stax/test_sign_transaction_eip1559/00004.png
index e1fc433..392165d 100644
Binary files a/tests/python/snapshots/stax/test_sign_transaction_eip1559/00004.png and b/tests/python/snapshots/stax/test_sign_transaction_eip1559/00004.png differ