diff --git a/src/apdu_query.c b/src/apdu_query.c
index 52ab478e..152fb97d 100644
--- a/src/apdu_query.c
+++ b/src/apdu_query.c
@@ -40,21 +40,14 @@ int handle_query_all_hwm(void) {
     write_u32_be(resp, offset, N_data.hwm.main.highest_level);
     offset += sizeof(uint32_t);
 
-    bool has_a_chain_migrated =
-        N_data.hwm.main.migrated_to_tenderbake || N_data.hwm.test.migrated_to_tenderbake;
-
-    if (has_a_chain_migrated) {
-        write_u32_be(resp, offset, N_data.hwm.main.highest_round);
-        offset += sizeof(uint32_t);
-    }
+    write_u32_be(resp, offset, N_data.hwm.main.highest_round);
+    offset += sizeof(uint32_t);
 
     write_u32_be(resp, offset, N_data.hwm.test.highest_level);
     offset += sizeof(uint32_t);
 
-    if (has_a_chain_migrated) {
-        write_u32_be(resp, offset, N_data.hwm.test.highest_round);
-        offset += sizeof(uint32_t);
-    }
+    write_u32_be(resp, offset, N_data.hwm.test.highest_round);
+    offset += sizeof(uint32_t);
 
     write_u32_be(resp, offset, N_data.main_chain_id.v);
     offset += sizeof(uint32_t);
@@ -69,10 +62,8 @@ int handle_query_main_hwm(void) {
     write_u32_be(resp, offset, N_data.hwm.main.highest_level);
     offset += sizeof(uint32_t);
 
-    if (N_data.hwm.main.migrated_to_tenderbake) {
-        write_u32_be(resp, offset, N_data.hwm.main.highest_round);
-        offset += sizeof(uint32_t);
-    }
+    write_u32_be(resp, offset, N_data.hwm.main.highest_round);
+    offset += sizeof(uint32_t);
 
     return io_send_response_pointer(resp, offset, SW_OK);
 }
diff --git a/src/apdu_setup.c b/src/apdu_setup.c
index f1703eef..ace2555b 100644
--- a/src/apdu_setup.c
+++ b/src/apdu_setup.c
@@ -49,12 +49,10 @@ static bool ok(void) {
         ram->hwm.main.highest_round = 0;
         ram->hwm.main.had_attestation = false;
         ram->hwm.main.had_preattestation = false;
-        ram->hwm.main.migrated_to_tenderbake = false;
         ram->hwm.test.highest_level = G.hwm.test;
         ram->hwm.test.highest_round = 0;
         ram->hwm.test.had_attestation = false;
         ram->hwm.test.had_preattestation = false;
-        ram->hwm.test.migrated_to_tenderbake = false;
     });
 
     provide_pubkey(&global.path_with_curve);
diff --git a/src/baking_auth.c b/src/baking_auth.c
index 9c077848..25a34e12 100644
--- a/src/baking_auth.c
+++ b/src/baking_auth.c
@@ -57,7 +57,6 @@ tz_exc write_high_water_mark(parsed_baking_data_t const *const in) {
         dest->highest_round = in->round;
         dest->had_attestation |= in->type == BAKING_TYPE_ATTESTATION;
         dest->had_preattestation |= in->type == BAKING_TYPE_PREATTESTATION;
-        dest->migrated_to_tenderbake |= in->is_tenderbake;
     });
 
 end:
diff --git a/src/to_string.c b/src/to_string.c
index def03372..914a9797 100644
--- a/src/to_string.c
+++ b/src/to_string.c
@@ -305,25 +305,21 @@ int hwm_to_string(char *dest, size_t dest_size, high_watermark_t const *const hw
     if (dest == NULL) {
         return -1;
     }
-    if (hwm->migrated_to_tenderbake) {
-        int result = number_to_string(dest, dest_size, hwm->highest_level);
-        if (result < 0) {
-            return result;
-        }
-        size_t offset = (size_t) result;
-
-        dest[offset] = ' ';
-        offset++;
+    int result = number_to_string(dest, dest_size, hwm->highest_level);
+    if (result < 0) {
+        return result;
+    }
+    size_t offset = (size_t) result;
 
-        result = number_to_string(dest + offset, dest_size - offset, hwm->highest_round);
-        if (result < 0) {
-            return result;
-        }
+    dest[offset] = ' ';
+    offset++;
 
-        return offset + (size_t) result;
-    } else {
-        return number_to_string(dest, dest_size, hwm->highest_level);
+    result = number_to_string(dest + offset, dest_size - offset, hwm->highest_round);
+    if (result < 0) {
+        return result;
     }
+
+    return offset + (size_t) result;
 }
 
 int hwm_status_to_string(char *dest, size_t dest_size, bool const *hwm_disabled) {
diff --git a/src/types.h b/src/types.h
index 11f50388..ed7bbf8e 100644
--- a/src/types.h
+++ b/src/types.h
@@ -179,11 +179,10 @@ static inline bool bip32_path_with_curve_eq(bip32_path_with_curve_t volatile con
  *
  */
 typedef struct {
-    level_t highest_level;        ///< highest level seen
-    round_t highest_round;        ///< highest round seen
-    bool had_attestation;         ///< if an attestation has been seen at current level/round
-    bool had_preattestation;      ///< if a pre-attestation has been seen at current level/round
-    bool migrated_to_tenderbake;  ///< if chain has migrated to tenderbake
+    level_t highest_level;    ///< highest level seen
+    round_t highest_round;    ///< highest round seen
+    bool had_attestation;     ///< if an attestation has been seen at current level/round
+    bool had_preattestation;  ///< if a pre-attestation has been seen at current level/round
 } high_watermark_t;
 
 /**
diff --git a/test/snapshots/nanos/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/test/snapshots/nanos/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png and b/test/snapshots/nanos/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/test/snapshots/nanos/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png and b/test/snapshots/nanos/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/test/snapshots/nanos/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png and b/test/snapshots/nanos/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/test/snapshots/nanos/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png and b/test/snapshots/nanos/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/test/snapshots/nanos/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png and b/test/snapshots/nanos/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_deauthorize/app_context/high_watermark.png b/test/snapshots/nanos/test_deauthorize/app_context/high_watermark.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_deauthorize/app_context/high_watermark.png and b/test/snapshots/nanos/test_deauthorize/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_reset_app_context/app_context/high_watermark.png b/test/snapshots/nanos/test_reset_app_context/app_context/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_reset_app_context/app_context/high_watermark.png and b/test/snapshots/nanos/test_reset_app_context/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png b/test/snapshots/nanos/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png and b/test/snapshots/nanos/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png b/test/snapshots/nanos/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png and b/test/snapshots/nanos/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png b/test/snapshots/nanos/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png and b/test/snapshots/nanos/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png b/test/snapshots/nanos/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png and b/test/snapshots/nanos/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png b/test/snapshots/nanos/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png and b/test/snapshots/nanos/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_review_home/high_watermark.png b/test/snapshots/nanos/test_review_home/high_watermark.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_review_home/high_watermark.png and b/test/snapshots/nanos/test_review_home/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/test/snapshots/nanos/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png and b/test/snapshots/nanos/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/test/snapshots/nanos/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png and b/test/snapshots/nanos/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/test/snapshots/nanos/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png and b/test/snapshots/nanos/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/test/snapshots/nanos/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png and b/test/snapshots/nanos/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/test/snapshots/nanos/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
index ebb4b637..0cccb5b4 100644
Binary files a/test/snapshots/nanos/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png and b/test/snapshots/nanos/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanos/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanos/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanos/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanos/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanos/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanos/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanos/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanos/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanos/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanos/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanos/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanos/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanos/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanos/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanos/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanos/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanos/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanos/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanos/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanos/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanos/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanos/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index a3b562f2..fc8adc33 100644
Binary files a/test/snapshots/nanos/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanos/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/test/snapshots/nanosp/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png and b/test/snapshots/nanosp/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/test/snapshots/nanosp/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png and b/test/snapshots/nanosp/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/test/snapshots/nanosp/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png and b/test/snapshots/nanosp/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/test/snapshots/nanosp/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png and b/test/snapshots/nanosp/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/test/snapshots/nanosp/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png and b/test/snapshots/nanosp/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_deauthorize/app_context/high_watermark.png b/test/snapshots/nanosp/test_deauthorize/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_deauthorize/app_context/high_watermark.png and b/test/snapshots/nanosp/test_deauthorize/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_reset_app_context/app_context/high_watermark.png b/test/snapshots/nanosp/test_reset_app_context/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_reset_app_context/app_context/high_watermark.png and b/test/snapshots/nanosp/test_reset_app_context/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png b/test/snapshots/nanosp/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png and b/test/snapshots/nanosp/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png b/test/snapshots/nanosp/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png and b/test/snapshots/nanosp/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png b/test/snapshots/nanosp/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png and b/test/snapshots/nanosp/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png b/test/snapshots/nanosp/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png and b/test/snapshots/nanosp/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png b/test/snapshots/nanosp/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png and b/test/snapshots/nanosp/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_review_home/high_watermark.png b/test/snapshots/nanosp/test_review_home/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_review_home/high_watermark.png and b/test/snapshots/nanosp/test_review_home/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/test/snapshots/nanosp/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png and b/test/snapshots/nanosp/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/test/snapshots/nanosp/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png and b/test/snapshots/nanosp/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/test/snapshots/nanosp/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png and b/test/snapshots/nanosp/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/test/snapshots/nanosp/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png and b/test/snapshots/nanosp/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/test/snapshots/nanosp/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanosp/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png and b/test/snapshots/nanosp/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanosp/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanosp/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanosp/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanosp/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanosp/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/test/snapshots/nanox/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png and b/test/snapshots/nanox/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/test/snapshots/nanox/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png and b/test/snapshots/nanox/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/test/snapshots/nanox/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png and b/test/snapshots/nanox/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/test/snapshots/nanox/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png and b/test/snapshots/nanox/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/test/snapshots/nanox/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png and b/test/snapshots/nanox/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_deauthorize/app_context/high_watermark.png b/test/snapshots/nanox/test_deauthorize/app_context/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_deauthorize/app_context/high_watermark.png and b/test/snapshots/nanox/test_deauthorize/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_reset_app_context/app_context/high_watermark.png b/test/snapshots/nanox/test_reset_app_context/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_reset_app_context/app_context/high_watermark.png and b/test/snapshots/nanox/test_reset_app_context/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png b/test/snapshots/nanox/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png and b/test/snapshots/nanox/test_review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png b/test/snapshots/nanox/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png and b/test/snapshots/nanox/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png b/test/snapshots/nanox/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png and b/test/snapshots/nanox/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png b/test/snapshots/nanox/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png and b/test/snapshots/nanox/test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png b/test/snapshots/nanox/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png and b/test/snapshots/nanox/test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_review_home/high_watermark.png b/test/snapshots/nanox/test_review_home/high_watermark.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_review_home/high_watermark.png and b/test/snapshots/nanox/test_review_home/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/test/snapshots/nanox/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png and b/test/snapshots/nanox/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/test/snapshots/nanox/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png and b/test/snapshots/nanox/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/test/snapshots/nanox/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png and b/test/snapshots/nanox/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/test/snapshots/nanox/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png and b/test/snapshots/nanox/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/test/snapshots/nanox/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
index 90633d62..a970fc01 100644
Binary files a/test/snapshots/nanox/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png and b/test/snapshots/nanox/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png differ
diff --git a/test/snapshots/nanox/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanox/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_attestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanox/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanox/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanox/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanox/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanox/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_attestation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanox/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanox/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanox/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_attestation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanox/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_attestation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanox/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanox/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanox/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanox/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanox/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/test/snapshots/nanox/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_preattestation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/test/snapshots/nanox/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/test/snapshots/nanox/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/test/snapshots/nanox/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_preattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png differ
diff --git a/test/snapshots/nanox/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/test/snapshots/nanox/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
index 3d322dbd..690ad81a 100644
Binary files a/test/snapshots/nanox/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png and b/test/snapshots/nanox/test_sign_preattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png differ
diff --git a/test/snapshots/stax/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png b/test/snapshots/stax/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png
index 9bf1d03b..020e318a 100644
Binary files a/test/snapshots/stax/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png and b/test/snapshots/stax/test_authorize_baking/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png differ
diff --git a/test/snapshots/stax/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png b/test/snapshots/stax/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png
index d2b97db8..d206dcdf 100644
Binary files a/test/snapshots/stax/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png and b/test/snapshots/stax/test_authorize_baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png differ
diff --git a/test/snapshots/stax/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png b/test/snapshots/stax/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png
index 36c75fcc..33127bf5 100644
Binary files a/test/snapshots/stax/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png and b/test/snapshots/stax/test_authorize_baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png differ
diff --git a/test/snapshots/stax/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png b/test/snapshots/stax/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png
index 0141dd80..c858a221 100644
Binary files a/test/snapshots/stax/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png and b/test/snapshots/stax/test_authorize_baking/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png differ
diff --git a/test/snapshots/stax/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png b/test/snapshots/stax/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png
index 27aa6a3d..d519ef41 100644
Binary files a/test/snapshots/stax/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png and b/test/snapshots/stax/test_authorize_baking/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png differ
diff --git a/test/snapshots/stax/test_deauthorize/app_context/app_context.png b/test/snapshots/stax/test_deauthorize/app_context/app_context.png
index 62423ac8..65d0193e 100644
Binary files a/test/snapshots/stax/test_deauthorize/app_context/app_context.png and b/test/snapshots/stax/test_deauthorize/app_context/app_context.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 d2b97db8..d206dcdf 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 d2b97db8..d206dcdf 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_reset_app_context/app_context/app_context.png b/test/snapshots/stax/test_reset_app_context/app_context/app_context.png
index 8282bde7..79a158d8 100644
Binary files a/test/snapshots/stax/test_reset_app_context/app_context/app_context.png and b/test/snapshots/stax/test_reset_app_context/app_context/app_context.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 e0b9863b..5c0b7b1b 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 cc14f080..e62b53df 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 024fe0cc..6f7bcae3 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 b4ec7155..d34230f2 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 5be2298f..fc46e2e9 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 62423ac8..65d0193e 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_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png b/test/snapshots/stax/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png
index e0b9863b..5c0b7b1b 100644
Binary files a/test/snapshots/stax/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png and b/test/snapshots/stax/test_setup_app_context/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png differ
diff --git a/test/snapshots/stax/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png b/test/snapshots/stax/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png
index cc14f080..e62b53df 100644
Binary files a/test/snapshots/stax/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png and b/test/snapshots/stax/test_setup_app_context/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png differ
diff --git a/test/snapshots/stax/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png b/test/snapshots/stax/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png
index 024fe0cc..6f7bcae3 100644
Binary files a/test/snapshots/stax/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png and b/test/snapshots/stax/test_setup_app_context/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png differ
diff --git a/test/snapshots/stax/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png b/test/snapshots/stax/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png
index b4ec7155..d34230f2 100644
Binary files a/test/snapshots/stax/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png and b/test/snapshots/stax/test_setup_app_context/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png differ
diff --git a/test/snapshots/stax/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png b/test/snapshots/stax/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png
index 5be2298f..fc46e2e9 100644
Binary files a/test/snapshots/stax/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png and b/test/snapshots/stax/test_setup_app_context/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/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 9bf1d03b..020e318a 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 9bf1d03b..020e318a 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 d2b97db8..d206dcdf 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 d2b97db8..d206dcdf 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 36c75fcc..33127bf5 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 36c75fcc..33127bf5 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 0141dd80..c858a221 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 0141dd80..c858a221 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 27aa6a3d..d519ef41 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 27aa6a3d..d519ef41 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 9bf1d03b..020e318a 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 9bf1d03b..020e318a 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 d2b97db8..d206dcdf 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 d2b97db8..d206dcdf 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 36c75fcc..33127bf5 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 36c75fcc..33127bf5 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 0141dd80..c858a221 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 0141dd80..c858a221 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 27aa6a3d..d519ef41 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 27aa6a3d..d519ef41 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 9bf1d03b..020e318a 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 9bf1d03b..020e318a 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 d2b97db8..d206dcdf 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 d2b97db8..d206dcdf 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 36c75fcc..33127bf5 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 36c75fcc..33127bf5 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 0141dd80..c858a221 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 0141dd80..c858a221 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 27aa6a3d..d519ef41 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 27aa6a3d..d519ef41 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 9bf1d03b..020e318a 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 9bf1d03b..020e318a 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 d2b97db8..d206dcdf 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 d2b97db8..d206dcdf 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 36c75fcc..33127bf5 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 36c75fcc..33127bf5 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 0141dd80..c858a221 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 0141dd80..c858a221 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 27aa6a3d..d519ef41 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 27aa6a3d..d519ef41 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/utils/client.py b/test/utils/client.py
index 377833b6..613e23be 100644
--- a/test/utils/client.py
+++ b/test/utils/client.py
@@ -80,11 +80,11 @@ class Hwm:
     """Class representing app high water mark."""
 
     highest_level: int
-    highest_round: Optional[int]
+    highest_round: int
 
     def __init__(self,
                  highest_level: int,
-                 highest_round: Optional[int] = None,
+                 highest_round: int = 0,
             ):
         self.highest_level = highest_level
         self.highest_round = highest_round
@@ -113,9 +113,7 @@ def from_bytes(cls, raw_hwm: bytes) -> 'Hwm':
 
         reader = BytesReader(raw_hwm)
         highest_level = reader.read_int(4)
-        highest_round = \
-            None if reader.has_finished() else \
-            reader.read_int(4)
+        highest_round = reader.read_int(4)
         reader.assert_finished()
 
         return Hwm(highest_level, highest_round)
diff --git a/test/utils/navigator.py b/test/utils/navigator.py
index b77dd65d..3fe4a612 100644
--- a/test/utils/navigator.py
+++ b/test/utils/navigator.py
@@ -242,10 +242,8 @@ def check_app_context(self,
             self.sub_settings.next()
             self.backend.wait_for_screen_change()
             self.assert_screen("hwm_status", snap_path=snap_path)
-            self.settings.multi_page_exit()
-            self.backend.wait_for_screen_change()
-            self.assert_screen("home_screen", snap_path=snap_path)
-
+            self.sub_settings.exit()
+            self.backend.wait_for_home_screen()
     @contextmanager
     def goto_home_public_key(self, snap_path: Path = Path("")) -> Generator[None, None, None]:
         snap_path = snap_path / APP_CONTEXT