diff --git a/.github/workflows/codeql_checks.yml b/.github/workflows/codeql_checks.yml
index dc62a54..b6d4877 100644
--- a/.github/workflows/codeql_checks.yml
+++ b/.github/workflows/codeql_checks.yml
@@ -10,35 +10,11 @@ on:
   pull_request:
     # Excluded path: add the paths you want to ignore instead of deleting the workflow
     paths-ignore:
-      - ".github/workflows/*.yml"
-      - "tests/*"
+      - '.github/workflows/*.yml'
+      - 'tests/*'
 
 jobs:
   analyse:
-    name: Analyse
-    strategy:
-      matrix:
-        sdk: ["$NANOX_SDK", "$NANOSP_SDK", "$STAX_SDK", "$FLEX_SDK"]
-        #'cpp' covers C and C++
-        language: ["cpp"]
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-legacy:latest
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v3
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-          queries: security-and-quality
-
-      # CodeQL will create the database during the compilation
-      - name: Build
-        run: |
-          make BOLOS_SDK=${{ matrix.sdk }}
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+    name: Call Ledger CodeQL analysis
+    uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_codeql_checks.yml@v1
+    secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/python_client_checks.yml b/.github/workflows/python_client_checks.yml
index 98da256..0608443 100644
--- a/.github/workflows/python_client_checks.yml
+++ b/.github/workflows/python_client_checks.yml
@@ -1,6 +1,8 @@
 name: Checks on the Python client
 
-# This workflow performs some checks on the Python client used by the Aptos tests
+# This workflow performs some checks on the Python client used by the ragger tests
+# It is there to help us maintain a level of quality in our codebase and does not have to be kept on forked
+# applications.
 
 on:
   workflow_dispatch:
@@ -12,31 +14,12 @@ on:
   pull_request:
 
 jobs:
-
   lint:
-    name: Aptos client linting
-    runs-on: ubuntu-latest
-    steps:
-    - name: Clone
-      uses: actions/checkout@v3
-    - name: Installing PIP dependencies
-      run: |
-        pip install pylint
-        pip install --extra-index-url https://test.pypi.org/simple/ -r tests/requirements.txt
-    - name: Lint Python code
-      run: |
-        pylint --rc tests/setup.cfg tests/application_client/
-
-  mypy:
-    name: Type checking
-    runs-on: ubuntu-latest
-    steps:
-    - name: Clone
-      uses: actions/checkout@v3
-    - name: Installing PIP dependencies
-      run: |
-        pip install mypy
-        pip install --extra-index-url https://test.pypi.org/simple/ -r tests/requirements.txt
-    - name: Mypy type checking
-      run: |
-        mypy tests/application_client/
+    name: Call Ledger Python linters
+    uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_python_checks.yml@v1
+    with:
+      run_linter: pylint
+      run_type_check: true
+      src_directory: application_client
+      setup_directory: tests
+      req_directory: tests
\ No newline at end of file
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index aa96995..97e056a 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -11,50 +11,8 @@ on:
 
 jobs:
   job_unit_test:
-    name: Unit test
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v3
-
-      - name: Clone SDK
-        uses: actions/checkout@v3
-        with:
-          repository: ledgerHQ/ledger-secure-sdk
-          path: sdk
-
-      - name: Build unit tests
-        run: |
-          cd unit-tests/
-          export BOLOS_SDK=../sdk
-          cmake -Bbuild -H. && make -C build && make -C build test
-
-      - name: Generate code coverage
-        run: |
-          cd unit-tests/
-          lcov --directory . -b "$(realpath build/)" --capture --initial -o coverage.base && \
-          lcov --rc lcov_branch_coverage=1 --directory . -b "$(realpath build/)" --capture -o coverage.capture && \
-          lcov --directory . -b "$(realpath build/)" --add-tracefile coverage.base --add-tracefile coverage.capture -o coverage.info && \
-          lcov --directory . -b "$(realpath build/)" --remove coverage.info '*/unit-tests/*' -o coverage.info && \
-          genhtml coverage.info -o coverage
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: code-coverage
-          path: unit-tests/coverage
-
-      - name: Install codecov dependencies
-        run: apt-get update && apt-get install -y gnupg gnupg-agent
-
-      - name: Upload to codecov.io
-        uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./unit-tests/coverage.info
-          flags: unittests
-          name: codecov-app-aptos
-          fail_ci_if_error: true
-          verbose: true
+    name: Call Ledger unit_test
+    uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_unit_tests.yml@v1
+    secrets: inherit
+    with:
+      test_directory: unit-tests
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bbc729..39f8d92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.10.0]
+
+### Added
+
+- Support for apex p device.
+
 ## [0.9.14]
 
 ### Added
diff --git a/Makefile b/Makefile
index cea0863..5a38ad2 100644
--- a/Makefile
+++ b/Makefile
@@ -31,11 +31,8 @@ endif
 ifeq ($(TARGET_NAME),TARGET_NANOX)
     DEFINES += MAX_TRANSACTION_PACKETS=90
 endif
-ifeq ($(TARGET_NAME),TARGET_STAX)
-    # still need to find the right value
-    DEFINES += MAX_TRANSACTION_PACKETS=70
-endif
-ifeq ($(TARGET_NAME),TARGET_FLEX)
+
+ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_STAX TARGET_FLEX TARGET_APEX_P))
     # still need to find the right value
     DEFINES += MAX_TRANSACTION_PACKETS=70
 endif
@@ -48,8 +45,8 @@ APPNAME = "Aptos"
 
 # Application version
 APPVERSION_M = 0
-APPVERSION_N = 9
-APPVERSION_P = 14
+APPVERSION_N = 10
+APPVERSION_P = 0
 APPVERSION   = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
 
 # Application source files
@@ -60,6 +57,7 @@ ICON_NANOX = icons/app_aptos_14px.gif
 ICON_NANOSP = icons/app_aptos_14px.gif
 ICON_STAX = icons/app_aptos_32px.gif
 ICON_FLEX = icons/app_aptos_40px.gif
+ICON_APEX_P = icons/app_aptos_32px_apex.png
 
 # Application allowed derivation curves
 CURVE_APP_LOAD_PARAMS = ed25519
diff --git a/README.md b/README.md
index 1155401..12c7f85 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,6 @@
 # Ledger Aptos Application
 
-Aptos wallet application supporting the following Ledger devices:
-
-- Nano S Plus
-- Nano X
-- Stax
-- Flex
+Aptos wallet application supporting all the Ledger devices
 
 ## Prerequisite
 
diff --git a/glyphs/aptos_logo_48px.png b/glyphs/aptos_logo_48px.png
new file mode 100644
index 0000000..a12c41f
Binary files /dev/null and b/glyphs/aptos_logo_48px.png differ
diff --git a/icons/app_aptos_32px_apex.png b/icons/app_aptos_32px_apex.png
new file mode 100644
index 0000000..0ff29ae
Binary files /dev/null and b/icons/app_aptos_32px_apex.png differ
diff --git a/ledger_app.toml b/ledger_app.toml
index 3ca01d3..36d3f5e 100644
--- a/ledger_app.toml
+++ b/ledger_app.toml
@@ -1,7 +1,7 @@
 [app]
 build_directory = "./"
 sdk = "C"
-devices = ["nanox", "nanos+", "stax", "flex"]
+devices = ["nanox", "nanos+", "stax", "flex", "apex_p"]
 
 [tests]
 unit_directory = "./unit-tests/"
diff --git a/src/app_main.c b/src/app_main.c
index 7f0c724..70f7df4 100644
--- a/src/app_main.c
+++ b/src/app_main.c
@@ -28,6 +28,10 @@
 #include "ui/menu.h"
 #include "apdu/dispatcher.h"
 
+#ifdef HAVE_SWAP
+#include "swap.h"
+#endif
+
 global_ctx_t G_context;
 const app_storage_t N_app_storage;
 
@@ -52,7 +56,12 @@ void app_main() {
 
     io_init();
     nvm_app_storage_init();
-    ui_menu_main();
+
+#ifdef HAVE_SWAP
+    if (!G_called_from_swap) {
+        ui_menu_main();
+    }
+#endif  // HAVE_SWAP
 
     // Reset context
     explicit_bzero(&G_context, sizeof(G_context));
diff --git a/src/ui/display.h b/src/ui/display.h
index 42ebb78..cf349b9 100644
--- a/src/ui/display.h
+++ b/src/ui/display.h
@@ -48,3 +48,9 @@ int ui_prepare_tx_fungible_asset_transfer(void);
 
 int ui_display_delegation_pool_transfer(entry_function_known_type_t function_type);
 int ui_prepare_delegation_pool_transfer(void);
+
+#if defined(TARGET_STAX) || defined(TARGET_FLEX)
+#define ICON_APP_HOME C_aptos_logo_64px
+#elif defined(TARGET_APEX_P)
+#define ICON_APP_HOME C_aptos_logo_48px
+#endif
\ No newline at end of file
diff --git a/src/ui/nbgl_display.c b/src/ui/nbgl_display.c
index 33a4e62..c5f87a6 100644
--- a/src/ui/nbgl_display.c
+++ b/src/ui/nbgl_display.c
@@ -76,7 +76,7 @@ void nbgl_useCaseReviewVerify(nbgl_operationType_t operation_type,
     if (N_storage.settings.allow_blind_signing) {
         blind_sign_info();
     } else {
-        nbgl_useCaseChoice(&C_Warning_64px,
+        nbgl_useCaseChoice(&LARGE_WARNING_ICON,
                            "Enable blind signing to authorize this operation?",
                            NULL,
                            "Enable blind signing",
diff --git a/src/ui/nbgl_display_address.c b/src/ui/nbgl_display_address.c
index d68f1f2..a365361 100644
--- a/src/ui/nbgl_display_address.c
+++ b/src/ui/nbgl_display_address.c
@@ -51,7 +51,7 @@ int ui_display_address() {
 
         nbgl_useCaseAddressReview(g_address,
                                   &pair_list,
-                                  &C_aptos_logo_64px,
+                                  &ICON_APP_HOME,
                                   "Verify Aptos address",
                                   NULL,
                                   confirm_address);
diff --git a/src/ui/nbgl_display_message.c b/src/ui/nbgl_display_message.c
index 4ea9662..9184d66 100755
--- a/src/ui/nbgl_display_message.c
+++ b/src/ui/nbgl_display_message.c
@@ -55,7 +55,7 @@ int ui_display_message() {
     if (is_str_interrupted((const char *) G_context.tx_info.raw_tx, G_context.tx_info.raw_tx_len)) {
         nbgl_useCaseReviewVerify(TYPE_MESSAGE,
                                  &pair_list,
-                                 &C_Review_64px,
+                                 &LARGE_REVIEW_ICON,
                                  "Review message",
                                  NULL,
                                  "Sign message?",
@@ -64,7 +64,7 @@ int ui_display_message() {
     } else {
         nbgl_useCaseReview(TYPE_MESSAGE,
                            &pair_list,
-                           &C_Review_64px,
+                           &LARGE_REVIEW_ICON,
                            "Review message",
                            NULL,
                            "Sign message?",
@@ -98,7 +98,7 @@ int ui_display_raw_message() {
     if (!short_enough) {
         nbgl_useCaseReviewVerify(TYPE_MESSAGE,
                                  &pair_list,
-                                 &C_Review_64px,
+                                 &LARGE_REVIEW_ICON,
                                  "Review message",
                                  NULL,
                                  "Sign message?",
@@ -107,7 +107,7 @@ int ui_display_raw_message() {
     } else {
         nbgl_useCaseReview(TYPE_MESSAGE,
                            &pair_list,
-                           &C_Review_64px,
+                           &LARGE_REVIEW_ICON,
                            "Review message",
                            NULL,
                            "Sign message?",
diff --git a/src/ui/nbgl_display_transaction.c b/src/ui/nbgl_display_transaction.c
index 7ec273b..3cb2164 100755
--- a/src/ui/nbgl_display_transaction.c
+++ b/src/ui/nbgl_display_transaction.c
@@ -55,7 +55,7 @@ int ui_display_transaction() {
 
         nbgl_useCaseReviewVerify(TYPE_TRANSACTION,
                                  &pair_list,
-                                 &C_aptos_logo_64px,
+                                 &ICON_APP_HOME,
                                  "Review transaction",
                                  NULL,
                                  "Sign transaction?",
@@ -83,7 +83,7 @@ int ui_display_entry_function() {
 
         nbgl_useCaseReviewVerify(TYPE_TRANSACTION,
                                  &pair_list,
-                                 &C_aptos_logo_64px,
+                                 &ICON_APP_HOME,
                                  "Review transaction",
                                  NULL,
                                  "Sign transaction?",
@@ -115,7 +115,7 @@ int ui_display_tx_aptos_account_transfer() {
 
         nbgl_useCaseReview(TYPE_TRANSACTION,
                            &pair_list,
-                           &C_aptos_logo_64px,
+                           &ICON_APP_HOME,
                            "Review transaction to send Aptos",
                            NULL,
                            "Sign transaction?",
@@ -144,7 +144,7 @@ void ui_listed_coin_transfer_flow_display() {
 
     nbgl_useCaseReview(TYPE_TRANSACTION,
                        &pair_list,
-                       &C_aptos_logo_64px,
+                       &ICON_APP_HOME,
                        "Review transaction to transfer coins",
                        NULL,
                        "Sign transaction to transfer coins?",
@@ -171,7 +171,7 @@ void ui_unlisted_coin_transfer_flow_display() {
 
     nbgl_useCaseReview(TYPE_TRANSACTION,
                        &pair_list,
-                       &C_aptos_logo_64px,
+                       &ICON_APP_HOME,
                        "Review transaction to transfer coins",
                        NULL,
                        "Sign transaction to transfer coins?",
@@ -267,7 +267,7 @@ void ui_delegation_pool_flow_display(entry_function_known_type_t function_type)
 
     nbgl_useCaseReview(TYPE_TRANSACTION,
                        &pair_list,
-                       &C_aptos_logo_64px,
+                       &ICON_APP_HOME,
                        get_delegation_title(function_type),
                        NULL,
                        get_delegation_sign_review(function_type),
diff --git a/src/ui/nbgl_menu.c b/src/ui/nbgl_menu.c
index 9114f71..5222bf4 100644
--- a/src/ui/nbgl_menu.c
+++ b/src/ui/nbgl_menu.c
@@ -26,6 +26,7 @@
 #include "../globals.h"
 #include "menu.h"
 #include "settings.h"
+#include "display.h"
 
 #define SETTINGS_PAGE_NUMBER 2
 
@@ -94,7 +95,7 @@ void ui_menu_main(void) {
         N_storage.settings.allow_blind_signing == 0 ? OFF_STATE : ON_STATE;
 
     nbgl_useCaseHomeAndSettings(APPNAME,
-                                &C_aptos_logo_64px,
+                                &ICON_APP_HOME,
                                 NULL,
                                 INIT_HOME_PAGE,
                                 &g_setting_contents,
diff --git a/tests/README.md b/tests/README.md
index 3f0d6a7..d8687ab 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -20,7 +20,7 @@ You can use for this the container `ghcr.io/ledgerhq/ledger-app-builder/ledger-a
 docker pull ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
 cd <your app repository>                        # replace <appname> with the name of your app, (eg boilerplate)
 docker run --user "$(id -u)":"$(id -g)" --rm -ti -v "$(realpath .):/app" --privileged -v "/dev/bus/usb:/dev/bus/usb" ledger-app-builder-lite:latest
-make clean && make BOLOS_SDK=$<device>_SDK      # replace <device> with one of [NANOX, NANOSP, STAX, FLEX]
+make clean && make BOLOS_SDK=$<device>_SDK      # replace <device> with one of [NANOX, NANOSP, STAX, FLEX, APEX_P]
 exit
 ```
 
@@ -43,7 +43,7 @@ You can use for this the container `ghcr.io/ledgerhq/ledger-app-builder/ledger-a
 docker pull ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
 cd app-<appname>/                                   # replace <appname> with the name of your app, (eg boilerplate)
 docker run --user "$(id -u)":"$(id -g)" --rm -ti -v "$(realpath .):/app" --privileged -v "/dev/bus/usb:/dev/bus/usb" ledger-app-builder-lite:latest
-make clean && make BOLOS_SDK=$<device>_SDK load     # replace <device> with one of [NANOX, NANOSP, STAX, FLEX]
+make clean && make BOLOS_SDK=$<device>_SDK load     # replace <device> with one of [NANOX, NANOSP, STAX, FLEX, APEX_P]
 exit
 ```
 
@@ -70,7 +70,7 @@ Standard useful pytest options
 Custom pytest options
 
 ```
-    --device <device>           run the test on the specified device [nanos,nanox,nanosp,stax,all]. This parameter is mandatory
+    --device <device>           run the test on the specified device [nanos,nanox,nanosp,stax,flex,apex_p,all]. This parameter is mandatory
     --backend <backend>         run the tests against the backend [speculos, ledgercomm, ledgerwallet]. Speculos is the default
     --display                   on Speculos, enables the display of the app screen using QT
     --golden_run                on Speculos, screen comparison functions will save the current screen instead of comparing
diff --git a/tests/application_client/setup.cfg b/tests/application_client/setup.cfg
new file mode 100644
index 0000000..81c396a
--- /dev/null
+++ b/tests/application_client/setup.cfg
@@ -0,0 +1,26 @@
+[tool:pytest]
+addopts = --strict-markers
+
+[pylint]
+disable = C0114,  # missing-module-docstring
+          C0115,  # missing-class-docstring
+          C0116,  # missing-function-docstring
+          C0103,  # invalid-name
+          R0801,  # duplicate-code
+          R0913,  # too-many-arguments
+          R0917   # too-many-positional-arguments
+
+max-line-length=120
+extension-pkg-whitelist=hid
+
+[pycodestyle]
+max-line-length = 100
+
+[mypy-hid.*]
+ignore_missing_imports = True
+
+[mypy-pytest.*]
+ignore_missing_imports = True
+
+[mypy-ledgered.*]
+ignore_missing_imports = True
\ No newline at end of file
diff --git a/tests/snapshots/apex_p/test_app_mainmenu/00000.png b/tests/snapshots/apex_p/test_app_mainmenu/00000.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_app_mainmenu/00000.png differ
diff --git a/tests/snapshots/apex_p/test_app_mainmenu/00001.png b/tests/snapshots/apex_p/test_app_mainmenu/00001.png
new file mode 100644
index 0000000..e17c11f
Binary files /dev/null and b/tests/snapshots/apex_p/test_app_mainmenu/00001.png differ
diff --git a/tests/snapshots/apex_p/test_app_mainmenu/00002.png b/tests/snapshots/apex_p/test_app_mainmenu/00002.png
new file mode 100644
index 0000000..b47312a
Binary files /dev/null and b/tests/snapshots/apex_p/test_app_mainmenu/00002.png differ
diff --git a/tests/snapshots/apex_p/test_app_mainmenu/00003.png b/tests/snapshots/apex_p/test_app_mainmenu/00003.png
new file mode 100644
index 0000000..e17c11f
Binary files /dev/null and b/tests/snapshots/apex_p/test_app_mainmenu/00003.png differ
diff --git a/tests/snapshots/apex_p/test_app_mainmenu/00004.png b/tests/snapshots/apex_p/test_app_mainmenu/00004.png
new file mode 100644
index 0000000..df76188
Binary files /dev/null and b/tests/snapshots/apex_p/test_app_mainmenu/00004.png differ
diff --git a/tests/snapshots/apex_p/test_app_mainmenu/00005.png b/tests/snapshots/apex_p/test_app_mainmenu/00005.png
new file mode 100644
index 0000000..e17c11f
Binary files /dev/null and b/tests/snapshots/apex_p/test_app_mainmenu/00005.png differ
diff --git a/tests/snapshots/apex_p/test_app_mainmenu/00006.png b/tests/snapshots/apex_p/test_app_mainmenu/00006.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_app_mainmenu/00006.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00000.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00000.png
new file mode 100644
index 0000000..a1fc1af
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00000.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00001.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00001.png
new file mode 100644
index 0000000..acc5408
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00001.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00002.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00002.png
new file mode 100644
index 0000000..eb1e09f
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00002.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00003.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00003.png
new file mode 100644
index 0000000..1e63540
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00003.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00004.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00004.png
new file mode 100644
index 0000000..b513aee
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part0/00004.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00000.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00000.png
new file mode 100644
index 0000000..1e63540
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00000.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00001.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00001.png
new file mode 100644
index 0000000..77657b4
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00001.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00002.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00002.png
new file mode 100644
index 0000000..599d8a7
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00002.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00003.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00003.png
new file mode 100644
index 0000000..b513aee
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00003.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00004.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00004.png
new file mode 100644
index 0000000..ded406f
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00004.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00005.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00005.png
new file mode 100644
index 0000000..4aba0a2
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00005.png differ
diff --git a/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00006.png b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00006.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_blind_sign_tx_long_tx/part1/00006.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00000.png b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00000.png
new file mode 100644
index 0000000..8bd963b
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00000.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00001.png b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00001.png
new file mode 100644
index 0000000..8301892
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00001.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00002.png b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00002.png
new file mode 100644
index 0000000..26bcdc8
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00002.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00003.png b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00003.png
new file mode 100644
index 0000000..8301892
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00003.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00004.png b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00004.png
new file mode 100644
index 0000000..6ce358d
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00004.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00005.png b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00005.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_accepted/00005.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part0/00000.png b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part0/00000.png
new file mode 100644
index 0000000..8bd963b
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part0/00000.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part0/00001.png b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part0/00001.png
new file mode 100644
index 0000000..2722e1a
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part0/00001.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part0/00002.png b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part0/00002.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part0/00002.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00000.png b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00000.png
new file mode 100644
index 0000000..8bd963b
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00000.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00001.png b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00001.png
new file mode 100644
index 0000000..8301892
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00001.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00002.png b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00002.png
new file mode 100644
index 0000000..2722e1a
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00002.png differ
diff --git a/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00003.png b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00003.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_get_public_key_confirm_refused/part1/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_fa_tx/00000.png b/tests/snapshots/apex_p/test_sign_fa_tx/00000.png
new file mode 100644
index 0000000..7aab162
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_fa_tx/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_fa_tx/00001.png b/tests/snapshots/apex_p/test_sign_fa_tx/00001.png
new file mode 100644
index 0000000..a94b7be
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_fa_tx/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_fa_tx/00002.png b/tests/snapshots/apex_p/test_sign_fa_tx/00002.png
new file mode 100644
index 0000000..b402a00
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_fa_tx/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_fa_tx/00003.png b/tests/snapshots/apex_p/test_sign_fa_tx/00003.png
new file mode 100644
index 0000000..de178bb
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_fa_tx/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_fa_tx/00004.png b/tests/snapshots/apex_p/test_sign_fa_tx/00004.png
new file mode 100644
index 0000000..4aba0a2
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_fa_tx/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_fa_tx/00005.png b/tests/snapshots/apex_p/test_sign_fa_tx/00005.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_fa_tx/00005.png differ
diff --git a/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00000.png b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00000.png
new file mode 100644
index 0000000..7aab162
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00001.png b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00001.png
new file mode 100644
index 0000000..e2fdd7b
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00002.png b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00002.png
new file mode 100644
index 0000000..b15ef70
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00003.png b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00003.png
new file mode 100644
index 0000000..de178bb
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00004.png b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00004.png
new file mode 100644
index 0000000..4aba0a2
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00005.png b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00005.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_listed_legacy_tokens/00005.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00000.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00000.png
new file mode 100644
index 0000000..a1fc1af
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00001.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00001.png
new file mode 100644
index 0000000..acc5408
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00002.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00002.png
new file mode 100644
index 0000000..eb1e09f
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00003.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00003.png
new file mode 100644
index 0000000..e757d7d
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00004.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00004.png
new file mode 100644
index 0000000..b513aee
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part0/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00000.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00000.png
new file mode 100644
index 0000000..e757d7d
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00001.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00001.png
new file mode 100644
index 0000000..1e9129a
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00002.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00002.png
new file mode 100644
index 0000000..5106b2f
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00003.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00003.png
new file mode 100644
index 0000000..b513aee
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00004.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00004.png
new file mode 100644
index 0000000..f14d68d
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00005.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00005.png
new file mode 100644
index 0000000..d0ceff0
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00005.png differ
diff --git a/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00006.png b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00006.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_long_raw_msg/part1/00006.png differ
diff --git a/tests/snapshots/apex_p/test_sign_reactivate_aptos/00000.png b/tests/snapshots/apex_p/test_sign_reactivate_aptos/00000.png
new file mode 100644
index 0000000..f5d13e6
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_reactivate_aptos/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_reactivate_aptos/00001.png b/tests/snapshots/apex_p/test_sign_reactivate_aptos/00001.png
new file mode 100644
index 0000000..5fe7add
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_reactivate_aptos/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_reactivate_aptos/00002.png b/tests/snapshots/apex_p/test_sign_reactivate_aptos/00002.png
new file mode 100644
index 0000000..37f71ea
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_reactivate_aptos/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_reactivate_aptos/00003.png b/tests/snapshots/apex_p/test_sign_reactivate_aptos/00003.png
new file mode 100644
index 0000000..4aba0a2
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_reactivate_aptos/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_reactivate_aptos/00004.png b/tests/snapshots/apex_p/test_sign_reactivate_aptos/00004.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_reactivate_aptos/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_short_raw_msg/00000.png b/tests/snapshots/apex_p/test_sign_short_raw_msg/00000.png
new file mode 100644
index 0000000..427cb17
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_short_raw_msg/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_short_raw_msg/00001.png b/tests/snapshots/apex_p/test_sign_short_raw_msg/00001.png
new file mode 100644
index 0000000..ae3c9de
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_short_raw_msg/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_short_raw_msg/00002.png b/tests/snapshots/apex_p/test_sign_short_raw_msg/00002.png
new file mode 100644
index 0000000..9bd92c0
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_short_raw_msg/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_short_raw_msg/00003.png b/tests/snapshots/apex_p/test_sign_short_raw_msg/00003.png
new file mode 100644
index 0000000..d0ceff0
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_short_raw_msg/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_short_raw_msg/00004.png b/tests/snapshots/apex_p/test_sign_short_raw_msg/00004.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_short_raw_msg/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_staking_aptos/00000.png b/tests/snapshots/apex_p/test_sign_staking_aptos/00000.png
new file mode 100644
index 0000000..bb8ef6b
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_staking_aptos/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_staking_aptos/00001.png b/tests/snapshots/apex_p/test_sign_staking_aptos/00001.png
new file mode 100644
index 0000000..d9a456b
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_staking_aptos/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_staking_aptos/00002.png b/tests/snapshots/apex_p/test_sign_staking_aptos/00002.png
new file mode 100644
index 0000000..16ff2ac
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_staking_aptos/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_staking_aptos/00003.png b/tests/snapshots/apex_p/test_sign_staking_aptos/00003.png
new file mode 100644
index 0000000..4aba0a2
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_staking_aptos/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_staking_aptos/00004.png b/tests/snapshots/apex_p/test_sign_staking_aptos/00004.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_staking_aptos/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part0/00000.png b/tests/snapshots/apex_p/test_sign_tx_refused/part0/00000.png
new file mode 100644
index 0000000..14f08c0
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part0/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part0/00001.png b/tests/snapshots/apex_p/test_sign_tx_refused/part0/00001.png
new file mode 100644
index 0000000..cf10939
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part0/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part0/00002.png b/tests/snapshots/apex_p/test_sign_tx_refused/part0/00002.png
new file mode 100644
index 0000000..1d65a53
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part0/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part0/00003.png b/tests/snapshots/apex_p/test_sign_tx_refused/part0/00003.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part0/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part1/00000.png b/tests/snapshots/apex_p/test_sign_tx_refused/part1/00000.png
new file mode 100644
index 0000000..14f08c0
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part1/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part1/00001.png b/tests/snapshots/apex_p/test_sign_tx_refused/part1/00001.png
new file mode 100644
index 0000000..73048ba
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part1/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part1/00002.png b/tests/snapshots/apex_p/test_sign_tx_refused/part1/00002.png
new file mode 100644
index 0000000..cf10939
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part1/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part1/00003.png b/tests/snapshots/apex_p/test_sign_tx_refused/part1/00003.png
new file mode 100644
index 0000000..1d65a53
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part1/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part1/00004.png b/tests/snapshots/apex_p/test_sign_tx_refused/part1/00004.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part1/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part2/00000.png b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00000.png
new file mode 100644
index 0000000..14f08c0
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part2/00001.png b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00001.png
new file mode 100644
index 0000000..73048ba
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part2/00002.png b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00002.png
new file mode 100644
index 0000000..a366182
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part2/00003.png b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00003.png
new file mode 100644
index 0000000..cf10939
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part2/00004.png b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00004.png
new file mode 100644
index 0000000..1d65a53
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part2/00005.png b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00005.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part2/00005.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part3/00000.png b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00000.png
new file mode 100644
index 0000000..14f08c0
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part3/00001.png b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00001.png
new file mode 100644
index 0000000..73048ba
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part3/00002.png b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00002.png
new file mode 100644
index 0000000..a366182
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part3/00003.png b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00003.png
new file mode 100644
index 0000000..6c3ef2e
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part3/00004.png b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00004.png
new file mode 100644
index 0000000..cf10939
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part3/00005.png b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00005.png
new file mode 100644
index 0000000..1d65a53
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00005.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_refused/part3/00006.png b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00006.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_refused/part3/00006.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_msg/00000.png b/tests/snapshots/apex_p/test_sign_tx_short_msg/00000.png
new file mode 100644
index 0000000..427cb17
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_msg/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_msg/00001.png b/tests/snapshots/apex_p/test_sign_tx_short_msg/00001.png
new file mode 100644
index 0000000..15e7b68
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_msg/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_msg/00002.png b/tests/snapshots/apex_p/test_sign_tx_short_msg/00002.png
new file mode 100644
index 0000000..9bd92c0
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_msg/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_msg/00003.png b/tests/snapshots/apex_p/test_sign_tx_short_msg/00003.png
new file mode 100644
index 0000000..d0ceff0
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_msg/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_msg/00004.png b/tests/snapshots/apex_p/test_sign_tx_short_msg/00004.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_msg/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_tx/00000.png b/tests/snapshots/apex_p/test_sign_tx_short_tx/00000.png
new file mode 100644
index 0000000..7aab162
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_tx/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_tx/00001.png b/tests/snapshots/apex_p/test_sign_tx_short_tx/00001.png
new file mode 100644
index 0000000..497e126
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_tx/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_tx/00002.png b/tests/snapshots/apex_p/test_sign_tx_short_tx/00002.png
new file mode 100644
index 0000000..08e7736
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_tx/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_tx/00003.png b/tests/snapshots/apex_p/test_sign_tx_short_tx/00003.png
new file mode 100644
index 0000000..de178bb
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_tx/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_tx/00004.png b/tests/snapshots/apex_p/test_sign_tx_short_tx/00004.png
new file mode 100644
index 0000000..4aba0a2
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_tx/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_tx_short_tx/00005.png b/tests/snapshots/apex_p/test_sign_tx_short_tx/00005.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_tx_short_tx/00005.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00000.png b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00000.png
new file mode 100644
index 0000000..e00161c
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00001.png b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00001.png
new file mode 100644
index 0000000..346ca76
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00002.png b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00002.png
new file mode 100644
index 0000000..2cf9f0d
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00003.png b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00003.png
new file mode 100644
index 0000000..e848866
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00004.png b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00004.png
new file mode 100644
index 0000000..90e3aa8
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00005.png b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00005.png
new file mode 100644
index 0000000..4aba0a2
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00005.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00006.png b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00006.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlisted_legacy_tokens/00006.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlocking_aptos/00000.png b/tests/snapshots/apex_p/test_sign_unlocking_aptos/00000.png
new file mode 100644
index 0000000..e5bd6ab
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlocking_aptos/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlocking_aptos/00001.png b/tests/snapshots/apex_p/test_sign_unlocking_aptos/00001.png
new file mode 100644
index 0000000..820a52c
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlocking_aptos/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlocking_aptos/00002.png b/tests/snapshots/apex_p/test_sign_unlocking_aptos/00002.png
new file mode 100644
index 0000000..c867559
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlocking_aptos/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlocking_aptos/00003.png b/tests/snapshots/apex_p/test_sign_unlocking_aptos/00003.png
new file mode 100644
index 0000000..4aba0a2
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlocking_aptos/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_unlocking_aptos/00004.png b/tests/snapshots/apex_p/test_sign_unlocking_aptos/00004.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_unlocking_aptos/00004.png differ
diff --git a/tests/snapshots/apex_p/test_sign_withdraw_aptos/00000.png b/tests/snapshots/apex_p/test_sign_withdraw_aptos/00000.png
new file mode 100644
index 0000000..5f5d3df
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_withdraw_aptos/00000.png differ
diff --git a/tests/snapshots/apex_p/test_sign_withdraw_aptos/00001.png b/tests/snapshots/apex_p/test_sign_withdraw_aptos/00001.png
new file mode 100644
index 0000000..7726740
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_withdraw_aptos/00001.png differ
diff --git a/tests/snapshots/apex_p/test_sign_withdraw_aptos/00002.png b/tests/snapshots/apex_p/test_sign_withdraw_aptos/00002.png
new file mode 100644
index 0000000..7153f7b
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_withdraw_aptos/00002.png differ
diff --git a/tests/snapshots/apex_p/test_sign_withdraw_aptos/00003.png b/tests/snapshots/apex_p/test_sign_withdraw_aptos/00003.png
new file mode 100644
index 0000000..4aba0a2
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_withdraw_aptos/00003.png differ
diff --git a/tests/snapshots/apex_p/test_sign_withdraw_aptos/00004.png b/tests/snapshots/apex_p/test_sign_withdraw_aptos/00004.png
new file mode 100644
index 0000000..329f133
Binary files /dev/null and b/tests/snapshots/apex_p/test_sign_withdraw_aptos/00004.png differ
diff --git a/tests/snapshots/flex/test_app_mainmenu/00004.png b/tests/snapshots/flex/test_app_mainmenu/00004.png
index c8720d8..f78dffd 100644
Binary files a/tests/snapshots/flex/test_app_mainmenu/00004.png and b/tests/snapshots/flex/test_app_mainmenu/00004.png differ
diff --git a/tests/snapshots/flex/test_app_mainmenu/00006.png b/tests/snapshots/flex/test_app_mainmenu/00006.png
index c8720d8..f78dffd 100644
Binary files a/tests/snapshots/flex/test_app_mainmenu/00006.png and b/tests/snapshots/flex/test_app_mainmenu/00006.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00000.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00000.png
index f60801f..fc46abd 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00000.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00000.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00001.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00001.png
index faf3699..ce09630 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00001.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00001.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00003.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00003.png
index faf3699..ce09630 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00003.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00003.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00004.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00004.png
index 36b1aa1..4321e60 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00004.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00004.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00005.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00005.png
index 4321e60..71c1b97 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00005.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00005.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00006.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00006.png
deleted file mode 100644
index 71c1b97..0000000
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00006.png and /dev/null differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00000.png b/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00000.png
index f60801f..fc46abd 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00000.png and b/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00000.png b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00000.png
index f60801f..fc46abd 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00000.png and b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00001.png b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00001.png
index faf3699..ce09630 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00001.png and b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_listed_legacy_tokens/00006.png b/tests/snapshots/flex/test_sign_listed_legacy_tokens/00006.png
deleted file mode 100644
index 71c1b97..0000000
Binary files a/tests/snapshots/flex/test_sign_listed_legacy_tokens/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_app_mainmenu/00000.png b/tests/snapshots/nanos/test_app_mainmenu/00000.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_app_mainmenu/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_app_mainmenu/00001.png b/tests/snapshots/nanos/test_app_mainmenu/00001.png
deleted file mode 100644
index 34cf547..0000000
Binary files a/tests/snapshots/nanos/test_app_mainmenu/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_app_mainmenu/00002.png b/tests/snapshots/nanos/test_app_mainmenu/00002.png
deleted file mode 100644
index 3476b97..0000000
Binary files a/tests/snapshots/nanos/test_app_mainmenu/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_app_mainmenu/00003.png b/tests/snapshots/nanos/test_app_mainmenu/00003.png
deleted file mode 100644
index e227980..0000000
Binary files a/tests/snapshots/nanos/test_app_mainmenu/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part0/00000.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part0/00000.png
deleted file mode 100644
index c2420af..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part0/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part0/00001.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part0/00001.png
deleted file mode 100644
index 71fb65e..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part0/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part0/00002.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part0/00002.png
deleted file mode 100644
index 2d1b940..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00000.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00000.png
deleted file mode 100644
index 58b87c3..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00001.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00001.png
deleted file mode 100644
index 7df01d2..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00002.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00002.png
deleted file mode 100644
index 168128d..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00003.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00003.png
deleted file mode 100644
index 20702e1..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00004.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00004.png
deleted file mode 100644
index 9efc0ae..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00005.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00005.png
deleted file mode 100644
index 5662228..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00006.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00006.png
deleted file mode 100644
index 2001bf6..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00007.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00007.png
deleted file mode 100644
index c2143b6..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00008.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00008.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00009.png b/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00009.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_blind_sign_tx_long_tx/part1/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00000.png b/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00000.png
deleted file mode 100644
index 0e64723..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00001.png b/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00001.png
deleted file mode 100644
index 5ddc2dd..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00002.png b/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00002.png
deleted file mode 100644
index 3d84e93..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00003.png b/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00003.png
deleted file mode 100644
index be3ff7d..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00004.png b/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00004.png
deleted file mode 100644
index c3ca14e..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00005.png b/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00005.png
deleted file mode 100644
index cbe4902..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00006.png b/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00006.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00007.png b/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00007.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_accepted/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00000.png b/tests/snapshots/nanos/test_get_public_key_confirm_refused/00000.png
deleted file mode 100644
index 0e64723..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00001.png b/tests/snapshots/nanos/test_get_public_key_confirm_refused/00001.png
deleted file mode 100644
index 5ddc2dd..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00002.png b/tests/snapshots/nanos/test_get_public_key_confirm_refused/00002.png
deleted file mode 100644
index 3d84e93..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00003.png b/tests/snapshots/nanos/test_get_public_key_confirm_refused/00003.png
deleted file mode 100644
index be3ff7d..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00004.png b/tests/snapshots/nanos/test_get_public_key_confirm_refused/00004.png
deleted file mode 100644
index c3ca14e..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00005.png b/tests/snapshots/nanos/test_get_public_key_confirm_refused/00005.png
deleted file mode 100644
index cbe4902..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00006.png b/tests/snapshots/nanos/test_get_public_key_confirm_refused/00006.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00007.png b/tests/snapshots/nanos/test_get_public_key_confirm_refused/00007.png
deleted file mode 100644
index 9c7e704..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00008.png b/tests/snapshots/nanos/test_get_public_key_confirm_refused/00008.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_get_public_key_confirm_refused/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00000.png b/tests/snapshots/nanos/test_sign_fa_tx/00000.png
deleted file mode 100644
index 8842989..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00001.png b/tests/snapshots/nanos/test_sign_fa_tx/00001.png
deleted file mode 100644
index 2d988ac..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00002.png b/tests/snapshots/nanos/test_sign_fa_tx/00002.png
deleted file mode 100644
index 3cb10f2..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00003.png b/tests/snapshots/nanos/test_sign_fa_tx/00003.png
deleted file mode 100644
index dd6f2bb..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00004.png b/tests/snapshots/nanos/test_sign_fa_tx/00004.png
deleted file mode 100644
index 6cd2fff..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00005.png b/tests/snapshots/nanos/test_sign_fa_tx/00005.png
deleted file mode 100644
index 32aa22a..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00006.png b/tests/snapshots/nanos/test_sign_fa_tx/00006.png
deleted file mode 100644
index 01b5db3..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00007.png b/tests/snapshots/nanos/test_sign_fa_tx/00007.png
deleted file mode 100644
index 8e7541d..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00008.png b/tests/snapshots/nanos/test_sign_fa_tx/00008.png
deleted file mode 100644
index 0c337f5..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00009.png b/tests/snapshots/nanos/test_sign_fa_tx/00009.png
deleted file mode 100644
index 210e201..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00010.png b/tests/snapshots/nanos/test_sign_fa_tx/00010.png
deleted file mode 100644
index 15ba4d9..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00010.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00011.png b/tests/snapshots/nanos/test_sign_fa_tx/00011.png
deleted file mode 100644
index d92d800..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00011.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00012.png b/tests/snapshots/nanos/test_sign_fa_tx/00012.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00012.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_fa_tx/00013.png b/tests/snapshots/nanos/test_sign_fa_tx/00013.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_sign_fa_tx/00013.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00000.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00000.png
deleted file mode 100644
index 8842989..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00001.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00001.png
deleted file mode 100644
index c636b10..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00002.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00002.png
deleted file mode 100644
index 2534c27..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00003.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00003.png
deleted file mode 100644
index a272ea7..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00004.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00004.png
deleted file mode 100644
index f6243e4..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00005.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00005.png
deleted file mode 100644
index f1cc6d3..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00006.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00006.png
deleted file mode 100644
index 148491a..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00007.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00007.png
deleted file mode 100644
index 681bc74..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00008.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00008.png
deleted file mode 100644
index a66780e..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00009.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00009.png
deleted file mode 100644
index 11dee68..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00010.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00010.png
deleted file mode 100644
index 94c27c8..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00010.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00011.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00011.png
deleted file mode 100644
index 10fd766..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00011.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00012.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00012.png
deleted file mode 100644
index d6fee75..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00012.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00013.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00013.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00013.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00014.png b/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00014.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_sign_listed_legacy_tokens/00014.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part0/00000.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part0/00000.png
deleted file mode 100644
index c2420af..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part0/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part0/00001.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part0/00001.png
deleted file mode 100644
index 71fb65e..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part0/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part0/00002.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part0/00002.png
deleted file mode 100644
index 2d1b940..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00000.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00000.png
deleted file mode 100644
index f06b65f..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00001.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00001.png
deleted file mode 100644
index c68716a..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00002.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00002.png
deleted file mode 100644
index 03ca92b..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00003.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00003.png
deleted file mode 100644
index ba6782f..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00004.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00004.png
deleted file mode 100644
index 88c45cd..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00005.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00005.png
deleted file mode 100644
index c859023..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00006.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00006.png
deleted file mode 100644
index 6dc8ceb..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00007.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00007.png
deleted file mode 100644
index 0cdb498..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00008.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00008.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00009.png b/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00009.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_sign_long_raw_msg/part1/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_short_raw_msg/00000.png b/tests/snapshots/nanos/test_sign_short_raw_msg/00000.png
deleted file mode 100644
index 5caa4c0..0000000
Binary files a/tests/snapshots/nanos/test_sign_short_raw_msg/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_short_raw_msg/00001.png b/tests/snapshots/nanos/test_sign_short_raw_msg/00001.png
deleted file mode 100644
index 3efc0f6..0000000
Binary files a/tests/snapshots/nanos/test_sign_short_raw_msg/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_short_raw_msg/00002.png b/tests/snapshots/nanos/test_sign_short_raw_msg/00002.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_sign_short_raw_msg/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_short_raw_msg/00003.png b/tests/snapshots/nanos/test_sign_short_raw_msg/00003.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_sign_short_raw_msg/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00000.png b/tests/snapshots/nanos/test_sign_tx_refused/00000.png
deleted file mode 100644
index 8842989..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00001.png b/tests/snapshots/nanos/test_sign_tx_refused/00001.png
deleted file mode 100644
index 2438bf2..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00002.png b/tests/snapshots/nanos/test_sign_tx_refused/00002.png
deleted file mode 100644
index a2c3f8a..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00003.png b/tests/snapshots/nanos/test_sign_tx_refused/00003.png
deleted file mode 100644
index 9d538c5..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00004.png b/tests/snapshots/nanos/test_sign_tx_refused/00004.png
deleted file mode 100644
index ed2891a..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00005.png b/tests/snapshots/nanos/test_sign_tx_refused/00005.png
deleted file mode 100644
index 542f88a..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00006.png b/tests/snapshots/nanos/test_sign_tx_refused/00006.png
deleted file mode 100644
index 8f8cbbe..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00007.png b/tests/snapshots/nanos/test_sign_tx_refused/00007.png
deleted file mode 100644
index bd05ec5..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00008.png b/tests/snapshots/nanos/test_sign_tx_refused/00008.png
deleted file mode 100644
index ac72eab..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00009.png b/tests/snapshots/nanos/test_sign_tx_refused/00009.png
deleted file mode 100644
index 282f54f..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00010.png b/tests/snapshots/nanos/test_sign_tx_refused/00010.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00010.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00011.png b/tests/snapshots/nanos/test_sign_tx_refused/00011.png
deleted file mode 100644
index 9c7e704..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00011.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_refused/00012.png b/tests/snapshots/nanos/test_sign_tx_refused/00012.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_refused/00012.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_msg/00000.png b/tests/snapshots/nanos/test_sign_tx_short_msg/00000.png
deleted file mode 100644
index 5caa4c0..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_msg/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_msg/00001.png b/tests/snapshots/nanos/test_sign_tx_short_msg/00001.png
deleted file mode 100644
index a5bad38..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_msg/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_msg/00002.png b/tests/snapshots/nanos/test_sign_tx_short_msg/00002.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_msg/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_msg/00003.png b/tests/snapshots/nanos/test_sign_tx_short_msg/00003.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_msg/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00000.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00000.png
deleted file mode 100644
index 8842989..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00001.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00001.png
deleted file mode 100644
index c636b10..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00002.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00002.png
deleted file mode 100644
index 9895698..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00003.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00003.png
deleted file mode 100644
index 23fe1f6..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00004.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00004.png
deleted file mode 100644
index 19790b1..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00005.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00005.png
deleted file mode 100644
index 5d8645f..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00006.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00006.png
deleted file mode 100644
index 51afe40..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00007.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00007.png
deleted file mode 100644
index 17f318c..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00008.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00008.png
deleted file mode 100644
index cd5f607..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00009.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00009.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00010.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00010.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00010.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00011.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00011.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00011.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_tx_short_tx/00012.png b/tests/snapshots/nanos/test_sign_tx_short_tx/00012.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_sign_tx_short_tx/00012.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00000.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00000.png
deleted file mode 100644
index 8842989..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00001.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00001.png
deleted file mode 100644
index c636b10..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00002.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00002.png
deleted file mode 100644
index 2534c27..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00003.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00003.png
deleted file mode 100644
index a272ea7..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00004.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00004.png
deleted file mode 100644
index f6243e4..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00005.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00005.png
deleted file mode 100644
index 7449082..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00006.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00006.png
deleted file mode 100644
index 9f73c97..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00007.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00007.png
deleted file mode 100644
index 373b382..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00008.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00008.png
deleted file mode 100644
index 20790aa..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00009.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00009.png
deleted file mode 100644
index 352abcd..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00010.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00010.png
deleted file mode 100644
index c8493da..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00010.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00011.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00011.png
deleted file mode 100644
index 148491a..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00011.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00012.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00012.png
deleted file mode 100644
index 681bc74..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00012.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00013.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00013.png
deleted file mode 100644
index a66780e..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00013.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00014.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00014.png
deleted file mode 100644
index 11dee68..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00014.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00015.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00015.png
deleted file mode 100644
index 94c27c8..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00015.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00016.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00016.png
deleted file mode 100644
index 10fd766..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00016.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00017.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00017.png
deleted file mode 100644
index d6fee75..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00017.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00018.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00018.png
deleted file mode 100644
index 66c411c..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00018.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00019.png b/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00019.png
deleted file mode 100644
index 02d922b..0000000
Binary files a/tests/snapshots/nanos/test_sign_unlisted_legacy_tokens/00019.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_tx_short_tx/00009.png b/tests/snapshots/nanosp/test_sign_tx_short_tx/00009.png
deleted file mode 100644
index 51264fc..0000000
Binary files a/tests/snapshots/nanosp/test_sign_tx_short_tx/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_tx_short_tx/00009.png b/tests/snapshots/nanox/test_sign_tx_short_tx/00009.png
deleted file mode 100644
index 51264fc..0000000
Binary files a/tests/snapshots/nanox/test_sign_tx_short_tx/00009.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_app_mainmenu/00004.png b/tests/snapshots/stax/test_app_mainmenu/00004.png
index 1a2317d..51c1586 100644
Binary files a/tests/snapshots/stax/test_app_mainmenu/00004.png and b/tests/snapshots/stax/test_app_mainmenu/00004.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00000.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00000.png
index 315377b..ac8fbe0 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00000.png and b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00000.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00001.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00001.png
index fdfda9b..b186d9a 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00001.png and b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00001.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00003.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00003.png
index fdfda9b..b186d9a 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00003.png and b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00003.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00004.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00004.png
index 24e9700..7a49478 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00004.png and b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00004.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00005.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00005.png
index 7a49478..aa419bd 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00005.png and b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00005.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00006.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00006.png
deleted file mode 100644
index aa419bd..0000000
Binary files a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00006.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_refused/part0/00000.png b/tests/snapshots/stax/test_get_public_key_confirm_refused/part0/00000.png
index 315377b..ac8fbe0 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm_refused/part0/00000.png and b/tests/snapshots/stax/test_get_public_key_confirm_refused/part0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_refused/part1/00000.png b/tests/snapshots/stax/test_get_public_key_confirm_refused/part1/00000.png
index 315377b..ac8fbe0 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm_refused/part1/00000.png and b/tests/snapshots/stax/test_get_public_key_confirm_refused/part1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_refused/part1/00001.png b/tests/snapshots/stax/test_get_public_key_confirm_refused/part1/00001.png
index fdfda9b..b186d9a 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm_refused/part1/00001.png and b/tests/snapshots/stax/test_get_public_key_confirm_refused/part1/00001.png differ
diff --git a/tests/test_name_version.py b/tests/test_name_version.py
index a3383ef..8fcc321 100644
--- a/tests/test_name_version.py
+++ b/tests/test_name_version.py
@@ -1,9 +1,10 @@
 from application_client.aptos_command_sender import AptosCommandSender
 from application_client.aptos_response_unpacker import unpack_get_app_and_version_response
+from utils import verify_version
 
 
 # Test a specific APDU asking BOLOS (and not the app) the name and version of the current app
-def test_get_app_and_version(backend, backend_name):
+def test_get_app_and_version(backend):
     # Use the app interface instead of raw interface
     client = AptosCommandSender(backend)
     # Send the special instruction to BOLOS
@@ -12,4 +13,4 @@ def test_get_app_and_version(backend, backend_name):
     app_name, version = unpack_get_app_and_version_response(response.data)
 
     assert app_name == "Aptos"
-    assert version == "0.9.14"
+    verify_version(version)
diff --git a/tests/test_pubkey_cmd.py b/tests/test_pubkey_cmd.py
index b908c63..3cece9f 100644
--- a/tests/test_pubkey_cmd.py
+++ b/tests/test_pubkey_cmd.py
@@ -35,11 +35,16 @@ def test_get_public_key_confirm_accepted(firmware, backend, navigator, test_name
                                                       ROOT_SCREENSHOT_PATH,
                                                       test_name)
         else:
+            if firmware.device == "flex":
+                qr_coordinates = (80, 430)
+            elif firmware.device == "stax":
+                qr_coordinates = (70, 530)
+            elif firmware.device == "apex_p":
+                qr_coordinates = (43, 299)
             instructions = [
                 NavInsID.USE_CASE_VIEW_DETAILS_NEXT,
-                NavIns(NavInsID.TOUCH, (200, 300)),
+                NavIns(NavInsID.TOUCH, qr_coordinates),
                 NavInsID.USE_CASE_ADDRESS_CONFIRMATION_EXIT_QR,
-                NavInsID.USE_CASE_VIEW_DETAILS_NEXT,
                 NavInsID.USE_CASE_ADDRESS_CONFIRMATION_CONFIRM,
                 NavInsID.USE_CASE_STATUS_DISMISS
             ]
diff --git a/tests/test_version_cmd.py b/tests/test_version_cmd.py
index 59e9cd7..5b8ccd6 100644
--- a/tests/test_version_cmd.py
+++ b/tests/test_version_cmd.py
@@ -1,11 +1,6 @@
 from application_client.aptos_command_sender import AptosCommandSender
 from application_client.aptos_response_unpacker import unpack_get_version_response
-
-# Taken from the Makefile, to update every time the Makefile version is bumped
-MAJOR = 0
-MINOR = 9
-PATCH = 14
-
+from utils import verify_version
 
 # In this test we check the behavior of the device when asked to provide the app version
 def test_version(backend):
@@ -13,5 +8,6 @@ def test_version(backend):
     client = AptosCommandSender(backend)
     # Send the GET_VERSION instruction
     rapdu = client.get_version()
-    # Use an helper to parse the response, assert the values
-    assert unpack_get_version_response(rapdu.data) == (MAJOR, MINOR, PATCH)
+    # Use an helper to parse the response
+    parsed_major, parsed_minor, parsed_patch = unpack_get_version_response(rapdu.data)
+    verify_version(f"{parsed_major}.{parsed_minor}.{parsed_patch}")
diff --git a/tests/utils.py b/tests/utils.py
index b75a6ba..e5b4d2b 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,8 +1,8 @@
+import re
 from pathlib import Path
-from hashlib import sha256
 
 from nacl.signing import VerifyKey
-from nacl.exceptions import BadSignatureError
+from typing import List
 
 
 ROOT_SCREENSHOT_PATH = Path(__file__).parent.resolve()
@@ -14,3 +14,33 @@ def check_signature_validity(public_key: bytes, signature: bytes, message: bytes
 
     return pk.verify(signature=signature, smessage=message)
 
+def verify_version(version: str) -> None:
+    """Verify the app version, based on defines in Makefile
+    Args:
+        Version (str): Version to be checked
+    """
+
+    vers_dict = {}
+    vers_str = ""
+    lines = _read_makefile()
+    version_re = re.compile(r"^APPVERSION_(?P<part>\w)\s?=\s?(?P<val>\d*)", re.I)
+    for line in lines:
+        info = version_re.match(line)
+        if info:
+            dinfo = info.groupdict()
+            vers_dict[dinfo["part"]] = dinfo["val"]
+    try:
+        vers_str = f"{vers_dict['M']}.{vers_dict['N']}.{vers_dict['P']}"
+    except KeyError:
+        pass
+    assert version == vers_str
+
+
+def _read_makefile() -> List[str]:
+    """Read lines from the parent Makefile """
+
+    parent = Path(__file__).parent.parent.resolve()
+    makefile = f"{parent}/Makefile"
+    with open(makefile, "r", encoding="utf-8") as f_p:
+        lines = f_p.readlines()
+    return lines