diff --git a/src/ui_nbgl.c b/src/ui_nbgl.c
index cc7f5e2f..2087bd1f 100644
--- a/src/ui_nbgl.c
+++ b/src/ui_nbgl.c
@@ -37,6 +37,10 @@
 
 #include "nbgl_use_case.h"
 
+//  -----------------------------------------------------------
+//  -------------------------- INFO ---------------------------
+//  -----------------------------------------------------------
+
 typedef enum {
     CHAIN_IDX = 0,
     PKH_IDX,
@@ -54,36 +58,20 @@ static const char* const infoTypes[INFO_NB] =
 static const char* infoContents[INFO_NB];
 static char infoContentsBridge[INFO_NB][MAX_LENGTH];
 
-enum {
-    HWM_ENABLED_TOKEN = FIRST_USER_TOKEN
-};
-enum {
-    HWM_ENABLED_TOKEN_ID = 0,
-    SETTINGS_SWITCHES_NB
-};
-
-static nbgl_layoutSwitch_t switches[SETTINGS_SWITCHES_NB] = {0};
+static const nbgl_contentInfoList_t infoList = {.nbInfos = INFO_NB,
+                                                .infoTypes = infoTypes,
+                                                .infoContents = infoContents};
 
 /**
- * @brief Callback to fill the settings page content
- *
- * @param page: page of the settings
- * @param content: content to fill
- * @return bool: if the page is not out of bounds
+ * @brief Initializes info values
  */
-static bool navigation_cb_baking(uint8_t page, nbgl_pageContent_t* content) {
-    if (page > 2u) {
-        return false;
-    }
-
+static void initInfo(void) {
     tz_exc exc = SW_OK;
 
     for (tz_infoIndex_t idx = 0; idx < INFO_NB; idx++) {
         infoContents[idx] = infoContentsBridge[idx];
     }
 
-    const bool hwm_disabled = g_hwm.hwm_disabled;
-
     TZ_ASSERT(chain_id_to_string_with_aliases(infoContentsBridge[CHAIN_IDX],
                                               MAX_LENGTH,
                                               &g_hwm.main_chain_id) >= 0,
@@ -110,72 +98,96 @@ static bool navigation_cb_baking(uint8_t page, nbgl_pageContent_t* content) {
     TZ_ASSERT(copy_string(infoContentsBridge[COPYRIGHT_IDX], MAX_LENGTH, "(c) 2023 Ledger") >= 0,
               EXC_WRONG_LENGTH);
 
-    switch (page) {
-        case 0:
-            switches[HWM_ENABLED_TOKEN_ID].initState = (nbgl_state_t) (!hwm_disabled);
-            switches[HWM_ENABLED_TOKEN_ID].text = "High Watermark";
-            switches[HWM_ENABLED_TOKEN_ID].subText = "Track high watermark\n in Ledger";
-            switches[HWM_ENABLED_TOKEN_ID].token = HWM_ENABLED_TOKEN;
-            switches[HWM_ENABLED_TOKEN_ID].tuneId = TUNE_TAP_CASUAL;
-            content->type = SWITCHES_LIST;
-            content->switchesList.nbSwitches = SETTINGS_SWITCHES_NB;
-            content->switchesList.switches = (nbgl_layoutSwitch_t*) switches;
-            break;
-        case 1:
-            content->type = INFOS_LIST;
-            content->infosList.nbInfos = 3;
-            content->infosList.infoTypes = infoTypes;
-            content->infosList.infoContents = (const char* const*) infoContents;
-            break;
-        case 2:
-            content->type = INFOS_LIST;
-            content->infosList.nbInfos = 3;
-            content->infosList.infoTypes = infoTypes + 3;
-            content->infosList.infoContents = (const char* const*) infoContents + 3;
-            break;
-        default:
-            return false;
-    }
-    return true;
 end:
     TZ_EXC_PRINT(exc);
-    return true;
 }
 
-static void controls_callback(int token, uint8_t index) {
+//  -----------------------------------------------------------
+//  ------------------------ SETTINGS -------------------------
+//  -----------------------------------------------------------
+
+typedef enum {
+    HWM_ENABLED_TOKEN = FIRST_USER_TOKEN,
+    NEXT_TOKEN
+} tz_settingsToken_t;
+
+//  -------------------- SWITCHES SETTINGS --------------------
+
+typedef enum {
+    HWM_ENABLED_IDX = 0,
+    SETTINGS_SWITCHES_NB
+} tz_settingsSwitchesIndex_t;
+
+static nbgl_contentSwitch_t settingsSwitches[SETTINGS_SWITCHES_NB] = {0};
+
+/**
+ * @brief Initializes switches settings values
+ */
+static void initSettingsSwitches(void) {
+    nbgl_contentSwitch_t* hwmSwitch = &settingsSwitches[HWM_ENABLED_IDX];
+    hwmSwitch->text = "High Watermark";
+    hwmSwitch->subText = "Track high watermark\n in Ledger";
+    hwmSwitch->initState = (nbgl_state_t) (!g_hwm.hwm_disabled);
+    hwmSwitch->token = HWM_ENABLED_TOKEN;
+}
+
+/**
+ * @brief Callback to controle switches impact
+ *
+ * @param token: token of the switch toggled
+ * @param index: settings index
+ * @param page: page index
+ */
+static void settingsSwitchesToggleCallback(tz_settingsToken_t token, uint8_t index, int page) {
     UNUSED(index);
+    UNUSED(page);
     if (token == HWM_ENABLED_TOKEN) {
         toggle_hwm();
     }
 }
 
-#define TOTAL_SETTINGS_PAGE  (3)
-#define INIT_SETTINGS_PAGE   (0)
-#define DISABLE_SUB_SETTINGS false
+#define SETTINGS_SWITCHES_CONTENTS                                                             \
+    {                                                                                          \
+        .type = SWITCHES_LIST,                                                                 \
+        .content.switchesList = {.switches = settingsSwitches,                                 \
+                                 .nbSwitches = SETTINGS_SWITCHES_NB},                          \
+        .contentActionCallback = (nbgl_contentActionCallback_t) settingsSwitchesToggleCallback \
+    }
+
+//  ---------------------- ALL SETTINGS -----------------------
+
+typedef enum {
+    SWITCHES_IDX = 0,
+    SETTINGS_PAGE_NB
+} tz_settingsIndex_t;
+
+static const nbgl_content_t settingsContentsList[SETTINGS_PAGE_NB] = {SETTINGS_SWITCHES_CONTENTS};
+
+static const nbgl_genericContents_t settingsContents = {.callbackCallNeeded = false,
+                                                        .contentsList = settingsContentsList,
+                                                        .nbContents = SETTINGS_PAGE_NB};
 
 /**
- * @brief Draws settings pages
- *
+ * @brief Initializes settings values
  */
-static void ui_menu_about_baking(void) {
-    nbgl_useCaseSettings("Tezos baking",
-                         INIT_SETTINGS_PAGE,
-                         TOTAL_SETTINGS_PAGE,
-                         DISABLE_SUB_SETTINGS,
-                         ui_initial_screen,
-                         navigation_cb_baking,
-                         controls_callback);
+static void initSettings(void) {
+    initSettingsSwitches();
 }
 
-#define SETTINGS_BUTTON_ENABLED (true)
+//  -----------------------------------------------------------
 
 void ui_initial_screen(void) {
-    nbgl_useCaseHome("Tezos Baking",
-                     &C_tezos,
-                     NULL,
-                     SETTINGS_BUTTON_ENABLED,
-                     ui_menu_about_baking,
-                     app_exit);
+    initSettings();
+    initInfo();
+
+    nbgl_useCaseHomeAndSettings("Tezos Baking",
+                                &C_tezos,
+                                NULL,
+                                INIT_HOME_PAGE,
+                                &settingsContents,
+                                &infoList,
+                                NULL,
+                                app_exit);
 }
 
 #endif  // HAVE_NBGL
diff --git a/test/snapshots/flex/description.png b/test/snapshots/flex/description.png
index a5424575..4bda8927 100644
Binary files a/test/snapshots/flex/description.png and b/test/snapshots/flex/description.png differ
diff --git a/test/snapshots/flex/hwm_status_disabled.png b/test/snapshots/flex/hwm_status_disabled.png
index 44c9799b..3e3214e5 100644
Binary files a/test/snapshots/flex/hwm_status_disabled.png and b/test/snapshots/flex/hwm_status_disabled.png differ
diff --git a/test/snapshots/flex/hwm_status_enabled.png b/test/snapshots/flex/hwm_status_enabled.png
index b60bcfda..cd520f5f 100644
Binary files a/test/snapshots/flex/hwm_status_enabled.png and b/test/snapshots/flex/hwm_status_enabled.png differ
diff --git a/test/snapshots/flex/test_deauthorize/authorized_key_after_authorize.png b/test/snapshots/flex/test_deauthorize/authorized_key_after_authorize.png
index 92873788..bf988165 100644
Binary files a/test/snapshots/flex/test_deauthorize/authorized_key_after_authorize.png and b/test/snapshots/flex/test_deauthorize/authorized_key_after_authorize.png differ
diff --git a/test/snapshots/flex/test_deauthorize/authorized_key_before_authorize.png b/test/snapshots/flex/test_deauthorize/authorized_key_before_authorize.png
index 92873788..bf988165 100644
Binary files a/test/snapshots/flex/test_deauthorize/authorized_key_before_authorize.png and b/test/snapshots/flex/test_deauthorize/authorized_key_before_authorize.png differ
diff --git a/test/snapshots/flex/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context.png b/test/snapshots/flex/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context.png
deleted file mode 100644
index b6bd04c3..00000000
Binary files a/test/snapshots/flex/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context.png and /dev/null differ
diff --git a/test/snapshots/flex/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context_1.png b/test/snapshots/flex/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context_1.png
new file mode 100644
index 00000000..cd504432
Binary files /dev/null and b/test/snapshots/flex/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context_1.png differ
diff --git a/test/snapshots/flex/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context_2.png b/test/snapshots/flex/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context_2.png
new file mode 100644
index 00000000..bca95c61
Binary files /dev/null and b/test/snapshots/flex/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context_2.png differ
diff --git a/test/snapshots/flex/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context.png b/test/snapshots/flex/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context.png
deleted file mode 100644
index 1658e33f..00000000
Binary files a/test/snapshots/flex/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context.png and /dev/null differ
diff --git a/test/snapshots/flex/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context_1.png b/test/snapshots/flex/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context_1.png
new file mode 100644
index 00000000..d9a44106
Binary files /dev/null and b/test/snapshots/flex/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context_1.png differ
diff --git a/test/snapshots/flex/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context_2.png b/test/snapshots/flex/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context_2.png
new file mode 100644
index 00000000..bca95c61
Binary files /dev/null and b/test/snapshots/flex/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context_2.png differ
diff --git a/test/snapshots/flex/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context.png b/test/snapshots/flex/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context.png
deleted file mode 100644
index 31a7ef36..00000000
Binary files a/test/snapshots/flex/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context.png and /dev/null differ
diff --git a/test/snapshots/flex/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context_1.png b/test/snapshots/flex/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context_1.png
new file mode 100644
index 00000000..bb200b2f
Binary files /dev/null and b/test/snapshots/flex/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context_1.png differ
diff --git a/test/snapshots/flex/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context_2.png b/test/snapshots/flex/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context_2.png
new file mode 100644
index 00000000..bca95c61
Binary files /dev/null and b/test/snapshots/flex/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context_2.png differ
diff --git a/test/snapshots/flex/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context.png b/test/snapshots/flex/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context.png
deleted file mode 100644
index b186ae95..00000000
Binary files a/test/snapshots/flex/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context.png and /dev/null differ
diff --git a/test/snapshots/flex/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context_1.png b/test/snapshots/flex/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context_1.png
new file mode 100644
index 00000000..f3f25d94
Binary files /dev/null and b/test/snapshots/flex/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context_1.png differ
diff --git a/test/snapshots/flex/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context_2.png b/test/snapshots/flex/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context_2.png
new file mode 100644
index 00000000..bca95c61
Binary files /dev/null and b/test/snapshots/flex/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context_2.png differ
diff --git a/test/snapshots/flex/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context.png b/test/snapshots/flex/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context.png
deleted file mode 100644
index f5913574..00000000
Binary files a/test/snapshots/flex/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context.png and /dev/null differ
diff --git a/test/snapshots/flex/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context_1.png b/test/snapshots/flex/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context_1.png
new file mode 100644
index 00000000..d3a5f150
Binary files /dev/null and b/test/snapshots/flex/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context_1.png differ
diff --git a/test/snapshots/flex/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context_2.png b/test/snapshots/flex/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context_2.png
new file mode 100644
index 00000000..bca95c61
Binary files /dev/null and b/test/snapshots/flex/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context_2.png differ
diff --git a/test/snapshots/flex/test_review_home/app_context.png b/test/snapshots/flex/test_review_home/app_context.png
deleted file mode 100644
index 1dc79152..00000000
Binary files a/test/snapshots/flex/test_review_home/app_context.png and /dev/null differ
diff --git a/test/snapshots/flex/test_review_home/app_context_1.png b/test/snapshots/flex/test_review_home/app_context_1.png
new file mode 100644
index 00000000..eeb13a2a
Binary files /dev/null and b/test/snapshots/flex/test_review_home/app_context_1.png differ
diff --git a/test/snapshots/flex/test_review_home/app_context_2.png b/test/snapshots/flex/test_review_home/app_context_2.png
new file mode 100644
index 00000000..4f5a33db
Binary files /dev/null and b/test/snapshots/flex/test_review_home/app_context_2.png differ
diff --git a/test/snapshots/flex/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/test/snapshots/flex/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
index 7c695c73..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png and b/test/snapshots/flex/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/flex/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 7c695c73..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/flex/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/test/snapshots/flex/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
index 92873788..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png and b/test/snapshots/flex/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/flex/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 92873788..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/flex/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/test/snapshots/flex/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
index ff174ae3..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png and b/test/snapshots/flex/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/flex/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index ff174ae3..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/flex/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/test/snapshots/flex/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
index 7a1b1d5b..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png and b/test/snapshots/flex/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/flex/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 7a1b1d5b..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/flex/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/test/snapshots/flex/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
index 38a09893..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png and b/test/snapshots/flex/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/flex/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 38a09893..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/flex/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/test/snapshots/flex/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
index 7c695c73..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png and b/test/snapshots/flex/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/flex/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 7c695c73..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/flex/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
index 92873788..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png and b/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 92873788..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
index ff174ae3..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png and b/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index ff174ae3..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/flex/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/test/snapshots/flex/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
index 7a1b1d5b..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png and b/test/snapshots/flex/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/flex/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 7a1b1d5b..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/flex/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/test/snapshots/flex/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
index 38a09893..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png and b/test/snapshots/flex/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/flex/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 38a09893..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/flex/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/test/snapshots/flex/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
index 7c695c73..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png and b/test/snapshots/flex/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/flex/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 7c695c73..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/flex/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/test/snapshots/flex/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
index 92873788..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png and b/test/snapshots/flex/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/flex/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 92873788..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/flex/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/test/snapshots/flex/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
index ff174ae3..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png and b/test/snapshots/flex/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/flex/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index ff174ae3..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/flex/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/test/snapshots/flex/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
index 7a1b1d5b..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png and b/test/snapshots/flex/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/flex/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 7a1b1d5b..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/flex/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/test/snapshots/flex/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
index 38a09893..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png and b/test/snapshots/flex/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/flex/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 38a09893..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/flex/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/test/snapshots/flex/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
index 7c695c73..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png and b/test/snapshots/flex/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/flex/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 7c695c73..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/flex/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/test/snapshots/flex/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
index 92873788..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png and b/test/snapshots/flex/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/flex/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 92873788..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/flex/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/test/snapshots/flex/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
index ff174ae3..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png and b/test/snapshots/flex/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/flex/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index ff174ae3..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/flex/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/test/snapshots/flex/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
index 7a1b1d5b..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png and b/test/snapshots/flex/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/flex/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 7a1b1d5b..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/flex/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/flex/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/test/snapshots/flex/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
index 38a09893..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png and b/test/snapshots/flex/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png differ
diff --git a/test/snapshots/flex/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/flex/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 38a09893..4f5a33db 100644
Binary files a/test/snapshots/flex/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/flex/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/description.png b/test/snapshots/stax/description.png
index b231d4a2..b84a3901 100644
Binary files a/test/snapshots/stax/description.png and b/test/snapshots/stax/description.png differ
diff --git a/test/snapshots/stax/hwm_status_disabled.png b/test/snapshots/stax/hwm_status_disabled.png
index 053292be..9a2f52ae 100644
Binary files a/test/snapshots/stax/hwm_status_disabled.png and b/test/snapshots/stax/hwm_status_disabled.png differ
diff --git a/test/snapshots/stax/hwm_status_enabled.png b/test/snapshots/stax/hwm_status_enabled.png
index 5c4dfa37..832e525b 100644
Binary files a/test/snapshots/stax/hwm_status_enabled.png and b/test/snapshots/stax/hwm_status_enabled.png differ
diff --git a/test/snapshots/stax/test_deauthorize/authorized_key_after_authorize.png b/test/snapshots/stax/test_deauthorize/authorized_key_after_authorize.png
index 96ac9687..56270951 100644
Binary files a/test/snapshots/stax/test_deauthorize/authorized_key_after_authorize.png and b/test/snapshots/stax/test_deauthorize/authorized_key_after_authorize.png differ
diff --git a/test/snapshots/stax/test_deauthorize/authorized_key_before_authorize.png b/test/snapshots/stax/test_deauthorize/authorized_key_before_authorize.png
index 96ac9687..56270951 100644
Binary files a/test/snapshots/stax/test_deauthorize/authorized_key_before_authorize.png and b/test/snapshots/stax/test_deauthorize/authorized_key_before_authorize.png differ
diff --git a/test/snapshots/stax/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context.png b/test/snapshots/stax/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context.png
index 3a6ab445..830c2714 100644
Binary files a/test/snapshots/stax/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context.png and b/test/snapshots/stax/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context.png differ
diff --git a/test/snapshots/stax/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context.png b/test/snapshots/stax/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context.png
index 82d67b97..fab90571 100644
Binary files a/test/snapshots/stax/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context.png and b/test/snapshots/stax/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context.png differ
diff --git a/test/snapshots/stax/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context.png b/test/snapshots/stax/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context.png
index 4e822de7..7a4461ea 100644
Binary files a/test/snapshots/stax/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context.png and b/test/snapshots/stax/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context.png differ
diff --git a/test/snapshots/stax/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context.png b/test/snapshots/stax/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context.png
index 5fbdddad..0cba858d 100644
Binary files a/test/snapshots/stax/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context.png and b/test/snapshots/stax/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context.png differ
diff --git a/test/snapshots/stax/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context.png b/test/snapshots/stax/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context.png
index 54278f0f..92521722 100644
Binary files a/test/snapshots/stax/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context.png and b/test/snapshots/stax/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context.png differ
diff --git a/test/snapshots/stax/test_review_home/app_context.png b/test/snapshots/stax/test_review_home/app_context.png
index deaf07c0..4c7e8936 100644
Binary files a/test/snapshots/stax/test_review_home/app_context.png and b/test/snapshots/stax/test_review_home/app_context.png differ
diff --git a/test/snapshots/stax/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/test/snapshots/stax/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
index fe338f36..3a6da2ef 100644
Binary files a/test/snapshots/stax/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png and b/test/snapshots/stax/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/stax/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index fe338f36..3a6da2ef 100644
Binary files a/test/snapshots/stax/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/stax/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/test/snapshots/stax/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
index 96ac9687..56270951 100644
Binary files a/test/snapshots/stax/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png and b/test/snapshots/stax/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/stax/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 96ac9687..56270951 100644
Binary files a/test/snapshots/stax/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/stax/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/test/snapshots/stax/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
index 427c9ebb..11bdddc2 100644
Binary files a/test/snapshots/stax/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png and b/test/snapshots/stax/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/stax/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 427c9ebb..11bdddc2 100644
Binary files a/test/snapshots/stax/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/stax/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/test/snapshots/stax/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
index 87f26849..d79966b3 100644
Binary files a/test/snapshots/stax/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png and b/test/snapshots/stax/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/stax/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 87f26849..d79966b3 100644
Binary files a/test/snapshots/stax/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/stax/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/test/snapshots/stax/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
index f3500ace..53d0f9b7 100644
Binary files a/test/snapshots/stax/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png and b/test/snapshots/stax/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/stax/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index f3500ace..53d0f9b7 100644
Binary files a/test/snapshots/stax/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/stax/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/test/snapshots/stax/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
index fe338f36..3a6da2ef 100644
Binary files a/test/snapshots/stax/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png and b/test/snapshots/stax/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/stax/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index fe338f36..3a6da2ef 100644
Binary files a/test/snapshots/stax/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/stax/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
index 96ac9687..56270951 100644
Binary files a/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png and b/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 96ac9687..56270951 100644
Binary files a/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
index 427c9ebb..11bdddc2 100644
Binary files a/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png and b/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 427c9ebb..11bdddc2 100644
Binary files a/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/stax/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/test/snapshots/stax/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
index 87f26849..d79966b3 100644
Binary files a/test/snapshots/stax/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png and b/test/snapshots/stax/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/stax/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 87f26849..d79966b3 100644
Binary files a/test/snapshots/stax/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/stax/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/test/snapshots/stax/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
index f3500ace..53d0f9b7 100644
Binary files a/test/snapshots/stax/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png and b/test/snapshots/stax/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/stax/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index f3500ace..53d0f9b7 100644
Binary files a/test/snapshots/stax/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/stax/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/test/snapshots/stax/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
index fe338f36..3a6da2ef 100644
Binary files a/test/snapshots/stax/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png and b/test/snapshots/stax/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/stax/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index fe338f36..3a6da2ef 100644
Binary files a/test/snapshots/stax/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/stax/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/test/snapshots/stax/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
index 96ac9687..56270951 100644
Binary files a/test/snapshots/stax/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png and b/test/snapshots/stax/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/stax/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 96ac9687..56270951 100644
Binary files a/test/snapshots/stax/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/stax/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/test/snapshots/stax/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
index 427c9ebb..11bdddc2 100644
Binary files a/test/snapshots/stax/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png and b/test/snapshots/stax/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/stax/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 427c9ebb..11bdddc2 100644
Binary files a/test/snapshots/stax/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/stax/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/test/snapshots/stax/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
index 87f26849..d79966b3 100644
Binary files a/test/snapshots/stax/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png and b/test/snapshots/stax/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/stax/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 87f26849..d79966b3 100644
Binary files a/test/snapshots/stax/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/stax/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/test/snapshots/stax/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
index f3500ace..53d0f9b7 100644
Binary files a/test/snapshots/stax/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png and b/test/snapshots/stax/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/stax/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index f3500ace..53d0f9b7 100644
Binary files a/test/snapshots/stax/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/stax/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/test/snapshots/stax/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
index fe338f36..3a6da2ef 100644
Binary files a/test/snapshots/stax/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png and b/test/snapshots/stax/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/stax/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index fe338f36..3a6da2ef 100644
Binary files a/test/snapshots/stax/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/stax/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/test/snapshots/stax/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
index 96ac9687..56270951 100644
Binary files a/test/snapshots/stax/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png and b/test/snapshots/stax/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/stax/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 96ac9687..56270951 100644
Binary files a/test/snapshots/stax/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/stax/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/test/snapshots/stax/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
index 427c9ebb..11bdddc2 100644
Binary files a/test/snapshots/stax/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png and b/test/snapshots/stax/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/stax/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 427c9ebb..11bdddc2 100644
Binary files a/test/snapshots/stax/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/stax/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/test/snapshots/stax/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
index 87f26849..d79966b3 100644
Binary files a/test/snapshots/stax/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png and b/test/snapshots/stax/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/stax/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 87f26849..d79966b3 100644
Binary files a/test/snapshots/stax/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/stax/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/test/snapshots/stax/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
index f3500ace..53d0f9b7 100644
Binary files a/test/snapshots/stax/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png and b/test/snapshots/stax/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png differ
diff --git a/test/snapshots/stax/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/stax/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index f3500ace..53d0f9b7 100644
Binary files a/test/snapshots/stax/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/stax/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/test_instructions.py b/test/test_instructions.py
index af083d5e..487e85b7 100644
--- a/test/test_instructions.py
+++ b/test/test_instructions.py
@@ -158,13 +158,31 @@ def test_review_home(account: Optional[Account],
         tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_HMW_ENABLED)
         tezos_navigator.settings.next()
         backend.wait_for_screen_change()
-        tezos_navigator.assert_screen("app_context", snap_path)
+        if tezos_navigator.firmware == Firmware.STAX:
+            # chain_id + pkh + hwm
+            tezos_navigator.assert_screen("app_context", snap_path)
+        elif tezos_navigator.firmware == Firmware.FLEX:
+            # chain_id + pkh
+            tezos_navigator.assert_screen("app_context_1", snap_path)
+            tezos_navigator.settings.next()
+            backend.wait_for_screen_change()
+            # hwm + version
+            tezos_navigator.assert_screen("app_context_2", snap_path)
         tezos_navigator.settings.next()
         backend.wait_for_screen_change()
         tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_DESCRIPTION)
         tezos_navigator.settings.previous()
         backend.wait_for_screen_change()
-        tezos_navigator.assert_screen("app_context", snap_path)
+        if tezos_navigator.firmware == Firmware.STAX:
+            # chain_id + pkh + hwm
+            tezos_navigator.assert_screen("app_context", snap_path)
+        elif tezos_navigator.firmware == Firmware.FLEX:
+            # hwm + version
+            tezos_navigator.assert_screen("app_context_2", snap_path)
+            tezos_navigator.settings.previous()
+            backend.wait_for_screen_change()
+            # chain_id + pkh
+            tezos_navigator.assert_screen("app_context_1", snap_path)
         tezos_navigator.settings.previous()
         backend.wait_for_screen_change()
         tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_HMW_ENABLED)
@@ -179,13 +197,31 @@ def test_review_home(account: Optional[Account],
         tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_HMW_DISABLED)
         tezos_navigator.settings.next()
         backend.wait_for_screen_change()
-        tezos_navigator.assert_screen("app_context", snap_path)
+        if tezos_navigator.firmware == Firmware.STAX:
+            # chain_id + pkh + hwm
+            tezos_navigator.assert_screen("app_context", snap_path)
+        elif tezos_navigator.firmware == Firmware.FLEX:
+            # chain_id + pkh
+            tezos_navigator.assert_screen("app_context_1", snap_path)
+            tezos_navigator.settings.next()
+            backend.wait_for_screen_change()
+            # hwm + version
+            tezos_navigator.assert_screen("app_context_2", snap_path)
         tezos_navigator.settings.next()
         backend.wait_for_screen_change()
         tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_DESCRIPTION)
         tezos_navigator.settings.previous()
         backend.wait_for_screen_change()
-        tezos_navigator.assert_screen("app_context", snap_path)
+        if tezos_navigator.firmware == Firmware.STAX:
+            # chain_id + pkh + hwm
+            tezos_navigator.assert_screen("app_context", snap_path)
+        elif tezos_navigator.firmware == Firmware.FLEX:
+            # hwm + version
+            tezos_navigator.assert_screen("app_context_2", snap_path)
+            tezos_navigator.settings.previous()
+            backend.wait_for_screen_change()
+            # chain_id + pkh
+            tezos_navigator.assert_screen("app_context_1", snap_path)
         tezos_navigator.settings.previous()
         backend.wait_for_screen_change()
         tezos_navigator.assert_screen(TouchFixedScreen.SETTINGS_HMW_DISABLED)
diff --git a/test/utils/navigator.py b/test/utils/navigator.py
index 1464c8b4..f77f9639 100644
--- a/test/utils/navigator.py
+++ b/test/utils/navigator.py
@@ -348,6 +348,8 @@ def goto_home_public_key(self) -> Generator[None, None, None]:
             self.settings.next()
             self.backend.wait_for_screen_change()
 
+        # Stax: chain_id + pkh + hwm
+        # Flex: chain_id + pkh
         yield
 
         if self.firmware.is_nano:
@@ -386,7 +388,13 @@ def goto_home_hwm(self) -> Generator[None, None, None]:
             # hwm_status
             self.settings.next()
             self.backend.wait_for_screen_change()
+            if self.firmware == Firmware.FLEX:
+                # chain_id + pkh
+                self.settings.next()
+                self.backend.wait_for_screen_change()
 
+        # Stax: chain_id + pkh + hwm
+        # Flex: hwm + version
         yield
 
         if self.firmware.is_nano: