diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..13ac32fb
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,20 @@
+---
+BasedOnStyle: Google
+IndentWidth: 4
+---
+Language: Cpp
+ColumnLimit: 100
+PointerAlignment: Right
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: true
+AllowAllParametersOfDeclarationOnNextLine: false
+SortIncludes: false
+SpaceAfterCStyleCast: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Never
+AllowShortFunctionsOnASingleLine: None
+BinPackArguments: false
+BinPackParameters: false
+---
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..ad0e6307
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
+# Checklist
+<!-- Put an `x` in each box when you have completed the items. -->
+- [ ] App update process has been followed <!-- See comment below -->
+- [ ] Target branch is `develop` <!-- unless you have a very good reason -->
+- [ ] Application version has been bumped <!-- required if your changes are to be deployed -->
+
+<!-- Make sure you followed the process described in https://developers.ledger.com/docs/embedded-app/maintenance/ before opening your Pull Request.
+Don't hesitate to contact us directly on Discord if you have any questions ! https://developers.ledger.com/discord -->
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b45a519..9da34799 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@
 #*  limitations under the License.
 #********************************************************************************
 cmake_minimum_required(VERSION 3.0)
-project(ledger-cosmos VERSION 0.0.0)
+project(ledger-thorchain VERSION 0.0.0)
 enable_testing()
 
 cmake_policy(SET CMP0025 NEW)
diff --git a/app/Makefile b/app/Makefile
index 247db685..2d34dcf5 100755
--- a/app/Makefile
+++ b/app/Makefile
@@ -32,15 +32,15 @@ $(info ************ TARGET_NAME  = [$(TARGET_NAME)])
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.app_testing
 
 ifndef COIN
-COIN=ATOM
+COIN=RUNE
 endif
 
 $(info COIN  = [$(COIN)])
 
-ifeq ($(COIN),ATOM)
+ifeq ($(COIN),RUNE)
 # Main app configuration
-APPNAME = "Cosmos"
-APPPATH = "44'/118'" --path "44'/60'"
+APPNAME = "THORChain"
+APPPATH = "44'/931'"
 else
 define error_message
 
@@ -52,6 +52,8 @@ endif
 
 APP_LOAD_PARAMS = --curve secp256k1 $(COMMON_LOAD_PARAMS) --path $(APPPATH)
 
+ENABLE_PENDING_REVIEW_SCREEN ?= 1
+
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.devices
 
 $(info TARGET_NAME  = [$(TARGET_NAME)])
@@ -64,6 +66,7 @@ endif
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.platform
 DEFINES += HAVE_HASH HAVE_BLAKE2 HAVE_SHA256 HAVE_SHA512
 CFLAGS += -I$(MY_DIR)/../deps/tinycbor/src
+CFLAGS += -g3 -ggdb3 -O1
 APP_SOURCE_PATH += $(MY_DIR)/../deps/tinycbor-ledger
 APP_SOURCE_PATH += $(MY_DIR)/../deps/jsmn/src
 
diff --git a/app/Makefile.version b/app/Makefile.version
index 140ebb66..42b9d951 100644
--- a/app/Makefile.version
+++ b/app/Makefile.version
@@ -1,6 +1,6 @@
 # This is the `transaction_version` field of `Runtime`
 APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
-APPVERSION_N=35
+APPVERSION_N=3
 # This is the patch version of this release
-APPVERSION_P=18
+APPVERSION_P=0
diff --git a/app/glyphs/icon_app.gif b/app/glyphs/icon_app.gif
index 4f7d7164..5f5c1e7c 100644
Binary files a/app/glyphs/icon_app.gif and b/app/glyphs/icon_app.gif differ
diff --git a/app/src/apdu_handler.c b/app/src/apdu_handler.c
index 18ca7d10..b1dd7e88 100644
--- a/app/src/apdu_handler.c
+++ b/app/src/apdu_handler.c
@@ -95,7 +95,7 @@ __Z_INLINE void extractHDPath(uint32_t rx, uint32_t offset) {
 
     // Check values
     if (hdPath[0] != HDPATH_0_DEFAULT ||
-        ((hdPath[1] != HDPATH_1_DEFAULT) && (hdPath[1] != HDPATH_ETH_1_DEFAULT)) ||
+        (hdPath[1] != HDPATH_1_DEFAULT) ||
         hdPath[3] != HDPATH_3_DEFAULT) {
         THROW(APDU_CODE_DATA_INVALID);
     }
@@ -122,8 +122,6 @@ static void extractHDPath_HRP(uint32_t rx, uint32_t offset) {
             ZEMU_LOGF(50, "Chain config not supported for: %s\n", bech32_hrp)
             THROW(APDU_CODE_COMMAND_NOT_ALLOWED);
         }
-    } else if (hdPath[1] == HDPATH_ETH_1_DEFAULT) {
-        THROW(APDU_CODE_COMMAND_NOT_ALLOWED);
     }
 }
 
@@ -197,12 +195,6 @@ __Z_INLINE void handleSign(volatile uint32_t *flags, volatile uint32_t *tx, uint
     // Let grab P2 value and if it's not valid, the parser should reject it
     const tx_type_e sign_type = (tx_type_e) G_io_apdu_buffer[OFFSET_P2];
 
-    if ((hdPath[1] == HDPATH_ETH_1_DEFAULT) && !app_mode_expert()) {
-        *flags |= IO_ASYNCH_REPLY;
-        view_custom_error_show(PIC(msg_error1),PIC(msg_error2));
-        THROW(APDU_CODE_DATA_INVALID);
-    }
-
     parser_tx_obj.tx_json.own_addr = (const char *) (G_io_apdu_buffer + VIEW_ADDRESS_OFFSET_SECP256K1);
     const char *error_msg = tx_parse(sign_type);
     if (error_msg != NULL) {
diff --git a/app/src/coin.h b/app/src/coin.h
index 2c5a7fae..d07e6c54 100644
--- a/app/src/coin.h
+++ b/app/src/coin.h
@@ -24,8 +24,7 @@ extern "C" {
 #define HDPATH_LEN_DEFAULT   5
 
 #define HDPATH_0_DEFAULT     (0x80000000u | 0x2cu)
-#define HDPATH_1_DEFAULT     (0x80000000u | 0x76u)
-#define HDPATH_ETH_1_DEFAULT (0x80000000u | 0x3cu)
+#define HDPATH_1_DEFAULT     (0x80000000u | 0x3a3u)
 #define HDPATH_2_DEFAULT     (0x80000000u | 0u)
 #define HDPATH_3_DEFAULT     (0u)
 
@@ -50,18 +49,18 @@ typedef enum {
 #define VIEW_ADDRESS_OFFSET_SECP256K1       PK_LEN_SECP256K1
 #define VIEW_ADDRESS_LAST_PAGE_DEFAULT      0
 
-#define MENU_MAIN_APP_LINE1                "Cosmos"
+#define MENU_MAIN_APP_LINE1                "THORChain"
 #define MENU_MAIN_APP_LINE2                "Ready"
 #define APPVERSION_LINE1                   "Version:"
 #define APPVERSION_LINE2                   ("v" APPVERSION)
 
-#define COIN_DEFAULT_CHAINID                "cosmoshub-4"
+#define COIN_DEFAULT_CHAINID                "thorchain"
 
 // In non-expert mode, the app will convert from uatom to ATOM
-#define COIN_DEFAULT_DENOM_BASE             "uatom"
-#define COIN_DEFAULT_DENOM_REPR             "ATOM"
-#define COIN_DEFAULT_DENOM_FACTOR           6u
-#define COIN_DEFAULT_DENOM_TRIMMING         6u
+#define COIN_DEFAULT_DENOM_BASE             "rune"
+#define COIN_DEFAULT_DENOM_REPR             "RUNE"
+#define COIN_DEFAULT_DENOM_FACTOR           8u
+#define COIN_DEFAULT_DENOM_TRIMMING         0u
 
 // Coin denoms may be up to 128 characters long
 // https://github.com/cosmos/cosmos-sdk/blob/master/types/coin.go#L780
diff --git a/app/src/parser.c b/app/src/parser.c
index c590eeb7..9f8613e9 100644
--- a/app/src/parser.c
+++ b/app/src/parser.c
@@ -115,33 +115,9 @@ __Z_INLINE bool parser_areEqual(uint16_t tokenIdx, const char *expected) {
 }
 
 __Z_INLINE bool parser_isAmount(char *key) {
-    if (strcmp(key, "fee/amount") == 0) {
-        return true;
-    }
-
-    if (strcmp(key, "msgs/inputs/coins") == 0) {
-        return true;
-    }
-
-    if (strcmp(key, "msgs/outputs/coins") == 0) {
-        return true;
-    }
-
-    if (strcmp(key, "msgs/value/inputs/coins") == 0) {
-        return true;
-    }
-
-    if (strcmp(key, "msgs/value/outputs/coins") == 0) {
-        return true;
-    }
+    if (strcmp(key, "msgs/value/coins") == 0) return true;
 
-    if (strcmp(key, "msgs/value/amount") == 0) {
-        return true;
-    }
-
-    if (strcmp(key, "tip/amount") == 0) {
-        return true;
-    }
+    if (strcmp(key, "msgs/value/amount") == 0) return true;
 
     return false;
 }
diff --git a/app/src/tx_display.c b/app/src/tx_display.c
index 2b414332..87dc5fd4 100644
--- a/app/src/tx_display.c
+++ b/app/src/tx_display.c
@@ -384,7 +384,7 @@ __Z_INLINE parser_error_t get_subitem_count(root_item_e root_item, uint8_t *num_
         case root_item_fee:
             CHECK_PARSER_ERR(tx_is_expert_mode_or_not_default_chainid(&is_expert_or_default))
             if (!is_expert_or_default) {
-                tmp_num_items = 1;     // Only Amount
+                tmp_num_items = 0;
             }
             break;
         case root_item_tip:
@@ -508,42 +508,17 @@ static const key_subst_t key_substitutions[] = {
         {"memo",                              "Memo"},
         {"fee/amount",                        "Fee"},
         {"fee/gas",                           "Gas"},
-        {"fee/gas_limit",                     "Gas Limit"},
-        {"fee/granter",                       "Granter"},
-        {"fee/payer",                         "Payer"},
         {"msgs/type",                         "Type"},
 
-        {"tip/amount",                        "Tip"},
-        {"tip/tipper",                        "Tipper"},
-
-        {"msgs/inputs/address",               "Source Address"},
-        {"msgs/inputs/coins",                 "Source Coins"},
-        {"msgs/outputs/address",              "Dest Address"},
-        {"msgs/outputs/coins",                "Dest Coins"},
-
-        {"msgs/value/inputs/address",         "Source Address"},
-        {"msgs/value/inputs/coins",           "Source Coins"},
-        {"msgs/value/outputs/address",        "Dest Address"},
-        {"msgs/value/outputs/coins",          "Dest Coins"},
-
+        // MsgSend
         {"msgs/value/from_address",           "From"},
         {"msgs/value/to_address",             "To"},
         {"msgs/value/amount",                 "Amount"},
-        {"msgs/value/delegator_address",      "Delegator"},
-        {"msgs/value/validator_address",      "Validator"},
-        {"msgs/value/withdraw_address",       "Withdraw Address"},
-        {"msgs/value/validator_src_address",  "Validator Source"},
-        {"msgs/value/validator_dst_address",  "Validator Dest"},
-        {"msgs/value/description",            "Description"},
-        {"msgs/value/initial_deposit/amount", "Deposit Amount"},
-        {"msgs/value/initial_deposit/denom",  "Deposit Denom"},
-        {"msgs/value/proposal_type",          "Proposal"},
-        {"msgs/value/proposer",               "Proposer"},
-        {"msgs/value/title",                  "Title"},
-        {"msgs/value/depositor",              "Sender"},
-        {"msgs/value/proposal_id",            "Proposal ID"},
-        {"msgs/value/voter",                  "Description"},
-        {"msgs/value/option",                 "Option"},
+
+        // MsgDeposit
+        {"msgs/value/signer", "Sender"},
+        {"msgs/value/memo", "Memo"},
+        {"msgs/value/coins", "Amount"},
 };
 
 parser_error_t tx_display_make_friendly() {
diff --git a/app/src/tx_parser.c b/app/src/tx_parser.c
index 43296511..24a0f6e7 100644
--- a/app/src/tx_parser.c
+++ b/app/src/tx_parser.c
@@ -55,17 +55,9 @@ __Z_INLINE void strcat_chunk_s(char *dst, uint16_t dst_max, const char *src_chun
 ///////////////////////////
 
 static const key_subst_t value_substitutions[] = {
-        {"cosmos-sdk/MsgSend",                        "Send"},
-        {"cosmos-sdk/MsgDelegate",                    "Delegate"},
-        {"cosmos-sdk/MsgUndelegate",                  "Undelegate"},
-        {"cosmos-sdk/MsgBeginRedelegate",             "Redelegate"},
-        {"cosmos-sdk/MsgSubmitProposal",              "Propose"},
-        {"cosmos-sdk/MsgDeposit",                     "Deposit"},
-        {"cosmos-sdk/MsgVote",                        "Vote"},
-        {"cosmos-sdk/MsgWithdrawDelegationReward",    "Withdraw Reward"},
-        {"cosmos-sdk/MsgWithdrawValidatorCommission", "Withdraw Val. Commission"},
-        {"cosmos-sdk/MsgSetWithdrawAddress",          "Withdraw Set Address"},
-        {"cosmos-sdk/MsgMultiSend",                   "Multi Send"},
+        {"thorchain/MsgSend", "Send"},
+        {"thorchain/MsgDeposit", "Deposit"},
+        {"[]", "Empty"},
 
 };
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 00000000..319fe4c6
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,17 @@
+version: "3.7"
+
+services:
+  nanosp:
+    # platform: linux/arm64/v8
+    image: ghcr.io/blooo-io/speculos:latest
+    volumes:
+      - ./app/build/nanos2/bin:/speculos/apps
+      - ./app/src:/app/app/src
+      - ./deps:/app/deps
+    ports:
+      - "5000:5000" # api
+      - "40000:40000" # apdu
+    environment:
+      - GDB_DIRECTORY_LIST="/app/app/src:/app/deps"
+    command: "-d --model nanosp apps/app.elf --display headless --apdu-port 40000 "
+    # Add `--vnc-password "<password>"` for macos users to use built-in vnc client.
\ No newline at end of file
diff --git a/gdb.sh b/gdb.sh
new file mode 100755
index 00000000..5d003285
--- /dev/null
+++ b/gdb.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+docker compose up -d
+
+# Wait for the container to start
+until docker inspect -f '{{.State.Status}}' app-thorchain-nanosp-1 | grep -q "running"; do
+    sleep 1
+done
+
+docker exec -it app-thorchain-nanosp-1 ./tools/debug.sh apps/app.elf
+
+docker compose down
\ No newline at end of file
diff --git a/tests_zemu/snapshots/s-govDeposit/00000.png b/tests_zemu/snapshots/s-govDeposit/00000.png
deleted file mode 100644
index ff615887..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00001.png b/tests_zemu/snapshots/s-govDeposit/00001.png
deleted file mode 100644
index 74c74ba3..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00002.png b/tests_zemu/snapshots/s-govDeposit/00002.png
deleted file mode 100644
index 99ba8e04..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00003.png b/tests_zemu/snapshots/s-govDeposit/00003.png
deleted file mode 100644
index 5fcf6cec..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00004.png b/tests_zemu/snapshots/s-govDeposit/00004.png
deleted file mode 100644
index da09bb9b..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00005.png b/tests_zemu/snapshots/s-govDeposit/00005.png
deleted file mode 100644
index 217f452c..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00006.png b/tests_zemu/snapshots/s-govDeposit/00006.png
deleted file mode 100644
index 29e56bcd..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00007.png b/tests_zemu/snapshots/s-govDeposit/00007.png
deleted file mode 100644
index db7eee0a..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00008.png b/tests_zemu/snapshots/s-govDeposit/00008.png
deleted file mode 100644
index 56ebb532..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00009.png b/tests_zemu/snapshots/s-govDeposit/00009.png
deleted file mode 100644
index aeed27a4..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00010.png b/tests_zemu/snapshots/s-govDeposit/00010.png
deleted file mode 100644
index 1162e20a..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00011.png b/tests_zemu/snapshots/s-govDeposit/00011.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-govDeposit/00012.png b/tests_zemu/snapshots/s-govDeposit/00012.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-govDeposit/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00000.png b/tests_zemu/snapshots/s-ibc_denoms/00000.png
deleted file mode 100644
index a3f6466f..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00001.png b/tests_zemu/snapshots/s-ibc_denoms/00001.png
deleted file mode 100644
index 04f0c145..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00002.png b/tests_zemu/snapshots/s-ibc_denoms/00002.png
deleted file mode 100644
index a1f2ec1d..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00003.png b/tests_zemu/snapshots/s-ibc_denoms/00003.png
deleted file mode 100644
index b0b0090a..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00004.png b/tests_zemu/snapshots/s-ibc_denoms/00004.png
deleted file mode 100644
index 75e3e0c0..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00005.png b/tests_zemu/snapshots/s-ibc_denoms/00005.png
deleted file mode 100644
index 0759e66d..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00006.png b/tests_zemu/snapshots/s-ibc_denoms/00006.png
deleted file mode 100644
index 893bf19a..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00007.png b/tests_zemu/snapshots/s-ibc_denoms/00007.png
deleted file mode 100644
index 89a6d2f5..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00008.png b/tests_zemu/snapshots/s-ibc_denoms/00008.png
deleted file mode 100644
index c3bc9c05..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00009.png b/tests_zemu/snapshots/s-ibc_denoms/00009.png
deleted file mode 100644
index 8af7ed67..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00010.png b/tests_zemu/snapshots/s-ibc_denoms/00010.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-ibc_denoms/00011.png b/tests_zemu/snapshots/s-ibc_denoms/00011.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-ibc_denoms/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00000.png b/tests_zemu/snapshots/s-mainmenu/00000.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00001.png b/tests_zemu/snapshots/s-mainmenu/00001.png
deleted file mode 100644
index b6adc7f9..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00002.png b/tests_zemu/snapshots/s-mainmenu/00002.png
deleted file mode 100644
index 9c0b9e23..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00003.png b/tests_zemu/snapshots/s-mainmenu/00003.png
deleted file mode 100644
index b6adc7f9..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
deleted file mode 100644
index 8de0d02d..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00005.png b/tests_zemu/snapshots/s-mainmenu/00005.png
deleted file mode 100644
index 6ebf27a6..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00006.png b/tests_zemu/snapshots/s-mainmenu/00006.png
deleted file mode 100644
index ba5be199..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00007.png b/tests_zemu/snapshots/s-mainmenu/00007.png
deleted file mode 100644
index 3ad12346..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00008.png b/tests_zemu/snapshots/s-mainmenu/00008.png
deleted file mode 100644
index ba5be199..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00009.png b/tests_zemu/snapshots/s-mainmenu/00009.png
deleted file mode 100644
index 6ebf27a6..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
deleted file mode 100644
index 8de0d02d..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00011.png b/tests_zemu/snapshots/s-mainmenu/00011.png
deleted file mode 100644
index b6adc7f9..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00012.png b/tests_zemu/snapshots/s-mainmenu/00012.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-mainmenu/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00000.png b/tests_zemu/snapshots/s-msgMultiSend/00000.png
deleted file mode 100644
index b5413296..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00001.png b/tests_zemu/snapshots/s-msgMultiSend/00001.png
deleted file mode 100644
index 769d6cb3..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00002.png b/tests_zemu/snapshots/s-msgMultiSend/00002.png
deleted file mode 100644
index 0bfffd75..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00003.png b/tests_zemu/snapshots/s-msgMultiSend/00003.png
deleted file mode 100644
index bd280af4..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00004.png b/tests_zemu/snapshots/s-msgMultiSend/00004.png
deleted file mode 100644
index 26459590..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00005.png b/tests_zemu/snapshots/s-msgMultiSend/00005.png
deleted file mode 100644
index 576c78bc..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00006.png b/tests_zemu/snapshots/s-msgMultiSend/00006.png
deleted file mode 100644
index f0050f2c..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00007.png b/tests_zemu/snapshots/s-msgMultiSend/00007.png
deleted file mode 100644
index 512c636e..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00008.png b/tests_zemu/snapshots/s-msgMultiSend/00008.png
deleted file mode 100644
index 50b13bc5..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00009.png b/tests_zemu/snapshots/s-msgMultiSend/00009.png
deleted file mode 100644
index c39ddfe9..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00010.png b/tests_zemu/snapshots/s-msgMultiSend/00010.png
deleted file mode 100644
index 4c1d4f20..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00011.png b/tests_zemu/snapshots/s-msgMultiSend/00011.png
deleted file mode 100644
index 8b9aaf55..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00012.png b/tests_zemu/snapshots/s-msgMultiSend/00012.png
deleted file mode 100644
index c39ddfe9..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00013.png b/tests_zemu/snapshots/s-msgMultiSend/00013.png
deleted file mode 100644
index c2437187..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00014.png b/tests_zemu/snapshots/s-msgMultiSend/00014.png
deleted file mode 100644
index e529d924..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00015.png b/tests_zemu/snapshots/s-msgMultiSend/00015.png
deleted file mode 100644
index c39ddfe9..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00016.png b/tests_zemu/snapshots/s-msgMultiSend/00016.png
deleted file mode 100644
index aeed27a4..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00017.png b/tests_zemu/snapshots/s-msgMultiSend/00017.png
deleted file mode 100644
index 1162e20a..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00018.png b/tests_zemu/snapshots/s-msgMultiSend/00018.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-msgMultiSend/00019.png b/tests_zemu/snapshots/s-msgMultiSend/00019.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-msgMultiSend/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00000.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00000.png
deleted file mode 100644
index 9708f9ac..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00001.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00001.png
deleted file mode 100644
index 74c74ba3..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00002.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00002.png
deleted file mode 100644
index 24d43572..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00003.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00003.png
deleted file mode 100644
index d5fd7c5c..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00004.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00004.png
deleted file mode 100644
index cbcd3e91..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00005.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00005.png
deleted file mode 100644
index 4daa424c..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00006.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00006.png
deleted file mode 100644
index e8125389..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00007.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00007.png
deleted file mode 100644
index 4505dd80..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00008.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00008.png
deleted file mode 100644
index 6355910e..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00009.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00009.png
deleted file mode 100644
index cbcd3e91..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00010.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00010.png
deleted file mode 100644
index 4daa424c..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00011.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00011.png
deleted file mode 100644
index d0b78b88..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00012.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00012.png
deleted file mode 100644
index 0ca7eb7d..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00013.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00013.png
deleted file mode 100644
index 27b467d0..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00014.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00014.png
deleted file mode 100644
index 1162e20a..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00015.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00015.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00016.png b/tests_zemu/snapshots/s-setWithdrawAddress-eth/00016.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress-eth/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00000.png b/tests_zemu/snapshots/s-setWithdrawAddress/00000.png
deleted file mode 100644
index 9708f9ac..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00001.png b/tests_zemu/snapshots/s-setWithdrawAddress/00001.png
deleted file mode 100644
index 74c74ba3..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00002.png b/tests_zemu/snapshots/s-setWithdrawAddress/00002.png
deleted file mode 100644
index 24d43572..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00003.png b/tests_zemu/snapshots/s-setWithdrawAddress/00003.png
deleted file mode 100644
index d5fd7c5c..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00004.png b/tests_zemu/snapshots/s-setWithdrawAddress/00004.png
deleted file mode 100644
index cbcd3e91..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00005.png b/tests_zemu/snapshots/s-setWithdrawAddress/00005.png
deleted file mode 100644
index 4daa424c..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00006.png b/tests_zemu/snapshots/s-setWithdrawAddress/00006.png
deleted file mode 100644
index e8125389..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00007.png b/tests_zemu/snapshots/s-setWithdrawAddress/00007.png
deleted file mode 100644
index 4505dd80..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00008.png b/tests_zemu/snapshots/s-setWithdrawAddress/00008.png
deleted file mode 100644
index 6355910e..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00009.png b/tests_zemu/snapshots/s-setWithdrawAddress/00009.png
deleted file mode 100644
index cbcd3e91..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00010.png b/tests_zemu/snapshots/s-setWithdrawAddress/00010.png
deleted file mode 100644
index 4daa424c..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00011.png b/tests_zemu/snapshots/s-setWithdrawAddress/00011.png
deleted file mode 100644
index d0b78b88..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00012.png b/tests_zemu/snapshots/s-setWithdrawAddress/00012.png
deleted file mode 100644
index 0ca7eb7d..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00013.png b/tests_zemu/snapshots/s-setWithdrawAddress/00013.png
deleted file mode 100644
index 27b467d0..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00014.png b/tests_zemu/snapshots/s-setWithdrawAddress/00014.png
deleted file mode 100644
index 1162e20a..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00015.png b/tests_zemu/snapshots/s-setWithdrawAddress/00015.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-setWithdrawAddress/00016.png b/tests_zemu/snapshots/s-setWithdrawAddress/00016.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-setWithdrawAddress/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address/00000.png b/tests_zemu/snapshots/s-show_address/00000.png
deleted file mode 100644
index acdde29b..00000000
Binary files a/tests_zemu/snapshots/s-show_address/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address/00001.png b/tests_zemu/snapshots/s-show_address/00001.png
deleted file mode 100644
index febbb082..00000000
Binary files a/tests_zemu/snapshots/s-show_address/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address/00002.png b/tests_zemu/snapshots/s-show_address/00002.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-show_address/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address/00003.png b/tests_zemu/snapshots/s-show_address/00003.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-show_address/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_huge/00000.png b/tests_zemu/snapshots/s-show_address_huge/00000.png
deleted file mode 100644
index 3c3dee6a..00000000
Binary files a/tests_zemu/snapshots/s-show_address_huge/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_huge/00001.png b/tests_zemu/snapshots/s-show_address_huge/00001.png
deleted file mode 100644
index 8f81acdd..00000000
Binary files a/tests_zemu/snapshots/s-show_address_huge/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_huge/00002.png b/tests_zemu/snapshots/s-show_address_huge/00002.png
deleted file mode 100644
index 0cfe59e0..00000000
Binary files a/tests_zemu/snapshots/s-show_address_huge/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_huge/00003.png b/tests_zemu/snapshots/s-show_address_huge/00003.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-show_address_huge/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_address_huge/00004.png b/tests_zemu/snapshots/s-show_address_huge/00004.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-show_address_huge/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_eth_address/00000.png b/tests_zemu/snapshots/s-show_eth_address/00000.png
deleted file mode 100644
index 7e3a8f23..00000000
Binary files a/tests_zemu/snapshots/s-show_eth_address/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_eth_address/00001.png b/tests_zemu/snapshots/s-show_eth_address/00001.png
deleted file mode 100644
index 05d02753..00000000
Binary files a/tests_zemu/snapshots/s-show_eth_address/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_eth_address/00002.png b/tests_zemu/snapshots/s-show_eth_address/00002.png
deleted file mode 100644
index e4fd77c0..00000000
Binary files a/tests_zemu/snapshots/s-show_eth_address/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_eth_address/00003.png b/tests_zemu/snapshots/s-show_eth_address/00003.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-show_eth_address/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-show_eth_address/00004.png b/tests_zemu/snapshots/s-show_eth_address/00004.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-show_eth_address/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00000.png b/tests_zemu/snapshots/s-sign_basic/00000.png
deleted file mode 100644
index 49639ec9..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00001.png b/tests_zemu/snapshots/s-sign_basic/00001.png
deleted file mode 100644
index 5be09342..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00002.png b/tests_zemu/snapshots/s-sign_basic/00002.png
deleted file mode 100644
index 0041b258..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00003.png b/tests_zemu/snapshots/s-sign_basic/00003.png
deleted file mode 100644
index 368d6198..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00004.png b/tests_zemu/snapshots/s-sign_basic/00004.png
deleted file mode 100644
index 56fe9ab2..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00005.png b/tests_zemu/snapshots/s-sign_basic/00005.png
deleted file mode 100644
index 9dae9154..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00006.png b/tests_zemu/snapshots/s-sign_basic/00006.png
deleted file mode 100644
index 08fc31e0..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00007.png b/tests_zemu/snapshots/s-sign_basic/00007.png
deleted file mode 100644
index 7ee7a7ba..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00008.png b/tests_zemu/snapshots/s-sign_basic/00008.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic/00009.png b/tests_zemu/snapshots/s-sign_basic/00009.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic2/00000.png b/tests_zemu/snapshots/s-sign_basic2/00000.png
deleted file mode 100644
index 46f96f65..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic2/00001.png b/tests_zemu/snapshots/s-sign_basic2/00001.png
deleted file mode 100644
index c28f2c88..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic2/00002.png b/tests_zemu/snapshots/s-sign_basic2/00002.png
deleted file mode 100644
index cea9f194..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic2/00003.png b/tests_zemu/snapshots/s-sign_basic2/00003.png
deleted file mode 100644
index 5a0273aa..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic2/00004.png b/tests_zemu/snapshots/s-sign_basic2/00004.png
deleted file mode 100644
index c9d452db..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic2/00005.png b/tests_zemu/snapshots/s-sign_basic2/00005.png
deleted file mode 100644
index 688a4d94..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic2/00006.png b/tests_zemu/snapshots/s-sign_basic2/00006.png
deleted file mode 100644
index aeed27a4..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic2/00008.png b/tests_zemu/snapshots/s-sign_basic2/00008.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00000.png b/tests_zemu/snapshots/s-sign_basic_eth/00000.png
deleted file mode 100644
index f2cb467e..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00001.png b/tests_zemu/snapshots/s-sign_basic_eth/00001.png
deleted file mode 100644
index 3f4788dd..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00002.png b/tests_zemu/snapshots/s-sign_basic_eth/00002.png
deleted file mode 100644
index 43305911..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00003.png b/tests_zemu/snapshots/s-sign_basic_eth/00003.png
deleted file mode 100644
index 6355910e..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00004.png b/tests_zemu/snapshots/s-sign_basic_eth/00004.png
deleted file mode 100644
index 5be09342..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00005.png b/tests_zemu/snapshots/s-sign_basic_eth/00005.png
deleted file mode 100644
index 0041b258..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00006.png b/tests_zemu/snapshots/s-sign_basic_eth/00006.png
deleted file mode 100644
index 368d6198..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00007.png b/tests_zemu/snapshots/s-sign_basic_eth/00007.png
deleted file mode 100644
index 56fe9ab2..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00008.png b/tests_zemu/snapshots/s-sign_basic_eth/00008.png
deleted file mode 100644
index 5be09342..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00009.png b/tests_zemu/snapshots/s-sign_basic_eth/00009.png
deleted file mode 100644
index 0041b258..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00010.png b/tests_zemu/snapshots/s-sign_basic_eth/00010.png
deleted file mode 100644
index 9dae9154..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00011.png b/tests_zemu/snapshots/s-sign_basic_eth/00011.png
deleted file mode 100644
index 08fc31e0..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00012.png b/tests_zemu/snapshots/s-sign_basic_eth/00012.png
deleted file mode 100644
index 4f7507c0..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00013.png b/tests_zemu/snapshots/s-sign_basic_eth/00013.png
deleted file mode 100644
index 1162e20a..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00014.png b/tests_zemu/snapshots/s-sign_basic_eth/00014.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth/00015.png b/tests_zemu/snapshots/s-sign_basic_eth/00015.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth_warning/00000.png b/tests_zemu/snapshots/s-sign_basic_eth_warning/00000.png
deleted file mode 100644
index 90ebb922..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth_warning/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth_warning/00001.png b/tests_zemu/snapshots/s-sign_basic_eth_warning/00001.png
deleted file mode 100644
index 5b102cb2..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth_warning/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_eth_warning/00002.png b/tests_zemu/snapshots/s-sign_basic_eth_warning/00002.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_eth_warning/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00000.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00000.png
deleted file mode 100644
index 49639ec9..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00001.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00001.png
deleted file mode 100644
index 5be09342..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00002.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00002.png
deleted file mode 100644
index 0041b258..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00003.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00003.png
deleted file mode 100644
index 368d6198..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00004.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00004.png
deleted file mode 100644
index 56fe9ab2..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00005.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00005.png
deleted file mode 100644
index 9dae9154..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00006.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00006.png
deleted file mode 100644
index 08fc31e0..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00007.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00007.png
deleted file mode 100644
index 7ee7a7ba..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00008.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00008.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_basic_extra_fields/00009.png b/tests_zemu/snapshots/s-sign_basic_extra_fields/00009.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-sign_basic_extra_fields/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_msgSend/00000.png b/tests_zemu/snapshots/s-sign_msgSend/00000.png
new file mode 100644
index 00000000..9267a374
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_msgSend/00000.png differ
diff --git a/tests_zemu/snapshots/s-sign_msgSend/00001.png b/tests_zemu/snapshots/s-sign_msgSend/00001.png
new file mode 100644
index 00000000..75062e32
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_msgSend/00001.png differ
diff --git a/tests_zemu/snapshots/s-sign_msgSend/00002.png b/tests_zemu/snapshots/s-sign_msgSend/00002.png
new file mode 100644
index 00000000..30eee797
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_msgSend/00002.png differ
diff --git a/tests_zemu/snapshots/s-sign_msgSend/00003.png b/tests_zemu/snapshots/s-sign_msgSend/00003.png
new file mode 100644
index 00000000..b03f628e
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_msgSend/00003.png differ
diff --git a/tests_zemu/snapshots/s-sign_msgSend/00004.png b/tests_zemu/snapshots/s-sign_msgSend/00004.png
new file mode 100644
index 00000000..cd8deb4e
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_msgSend/00004.png differ
diff --git a/tests_zemu/snapshots/s-sign_msgSend/00005.png b/tests_zemu/snapshots/s-sign_msgSend/00005.png
new file mode 100644
index 00000000..afefc58e
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_msgSend/00005.png differ
diff --git a/tests_zemu/snapshots/s-sign_msgSend/00006.png b/tests_zemu/snapshots/s-sign_msgSend/00006.png
new file mode 100644
index 00000000..65e5ed80
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_msgSend/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic2/00007.png b/tests_zemu/snapshots/s-sign_msgSend/00007.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_basic2/00007.png
rename to tests_zemu/snapshots/s-sign_msgSend/00007.png
diff --git a/tests_zemu/snapshots/s-sign_msgSend/00008.png b/tests_zemu/snapshots/s-sign_msgSend/00008.png
new file mode 100644
index 00000000..f1867e44
Binary files /dev/null and b/tests_zemu/snapshots/s-sign_msgSend/00008.png differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00000.png b/tests_zemu/snapshots/s-textual-sign_basic/00000.png
deleted file mode 100644
index 535fe502..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00001.png b/tests_zemu/snapshots/s-textual-sign_basic/00001.png
deleted file mode 100644
index 628b6d73..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00002.png b/tests_zemu/snapshots/s-textual-sign_basic/00002.png
deleted file mode 100644
index 99ba8e04..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00003.png b/tests_zemu/snapshots/s-textual-sign_basic/00003.png
deleted file mode 100644
index a17144ad..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00004.png b/tests_zemu/snapshots/s-textual-sign_basic/00004.png
deleted file mode 100644
index 43e76c54..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00005.png b/tests_zemu/snapshots/s-textual-sign_basic/00005.png
deleted file mode 100644
index 5b529988..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00006.png b/tests_zemu/snapshots/s-textual-sign_basic/00006.png
deleted file mode 100644
index d1273580..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00007.png b/tests_zemu/snapshots/s-textual-sign_basic/00007.png
deleted file mode 100644
index f6f50f67..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00008.png b/tests_zemu/snapshots/s-textual-sign_basic/00008.png
deleted file mode 100644
index cc0815ba..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00009.png b/tests_zemu/snapshots/s-textual-sign_basic/00009.png
deleted file mode 100644
index 4b2a89ad..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00010.png b/tests_zemu/snapshots/s-textual-sign_basic/00010.png
deleted file mode 100644
index d88e549f..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00011.png b/tests_zemu/snapshots/s-textual-sign_basic/00011.png
deleted file mode 100644
index 10ff9c8c..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00012.png b/tests_zemu/snapshots/s-textual-sign_basic/00012.png
deleted file mode 100644
index 60383553..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00013.png b/tests_zemu/snapshots/s-textual-sign_basic/00013.png
deleted file mode 100644
index 9fa5fab9..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00014.png b/tests_zemu/snapshots/s-textual-sign_basic/00014.png
deleted file mode 100644
index c23b6c41..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00015.png b/tests_zemu/snapshots/s-textual-sign_basic/00015.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic/00016.png b/tests_zemu/snapshots/s-textual-sign_basic/00016.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00000.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00000.png
deleted file mode 100644
index 535fe502..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00001.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00001.png
deleted file mode 100644
index 628b6d73..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00002.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00002.png
deleted file mode 100644
index 99ba8e04..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00003.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00003.png
deleted file mode 100644
index 55031c74..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00004.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00004.png
deleted file mode 100644
index 2673a3a8..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00005.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00005.png
deleted file mode 100644
index 982e1d3f..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00006.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00006.png
deleted file mode 100644
index 1444d170..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00007.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00007.png
deleted file mode 100644
index 05baa700..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00008.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00008.png
deleted file mode 100644
index 3f8a8d52..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00009.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00009.png
deleted file mode 100644
index f55c9e97..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00010.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00010.png
deleted file mode 100644
index a17144ad..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00011.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00011.png
deleted file mode 100644
index 43e76c54..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00012.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00012.png
deleted file mode 100644
index 5b529988..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00013.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00013.png
deleted file mode 100644
index d1273580..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00014.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00014.png
deleted file mode 100644
index f6f50f67..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00015.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00015.png
deleted file mode 100644
index cc0815ba..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00016.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00016.png
deleted file mode 100644
index 4b2a89ad..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00017.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00017.png
deleted file mode 100644
index d88e549f..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00018.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00018.png
deleted file mode 100644
index 10ff9c8c..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00019.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00019.png
deleted file mode 100644
index 60383553..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00020.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00020.png
deleted file mode 100644
index 9fa5fab9..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00020.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00021.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00021.png
deleted file mode 100644
index c23b6c41..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00021.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00022.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00022.png
deleted file mode 100644
index a88fbb82..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00022.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00023.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00023.png
deleted file mode 100644
index 28cd767b..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00023.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00024.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00024.png
deleted file mode 100644
index a8dbed4b..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00024.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00025.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00025.png
deleted file mode 100644
index 644199ab..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00025.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00026.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00026.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00026.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth/00027.png b/tests_zemu/snapshots/s-textual-sign_basic_eth/00027.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth/00027.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth_warning/00000.png b/tests_zemu/snapshots/s-textual-sign_basic_eth_warning/00000.png
deleted file mode 100644
index 90ebb922..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth_warning/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth_warning/00001.png b/tests_zemu/snapshots/s-textual-sign_basic_eth_warning/00001.png
deleted file mode 100644
index 5b102cb2..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth_warning/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_eth_warning/00002.png b/tests_zemu/snapshots/s-textual-sign_basic_eth_warning/00002.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_eth_warning/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00000.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00000.png
deleted file mode 100644
index 535fe502..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00001.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00001.png
deleted file mode 100644
index 628b6d73..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00002.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00002.png
deleted file mode 100644
index 99ba8e04..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00003.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00003.png
deleted file mode 100644
index 55031c74..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00004.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00004.png
deleted file mode 100644
index 2673a3a8..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00005.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00005.png
deleted file mode 100644
index 982e1d3f..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00006.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00006.png
deleted file mode 100644
index 1444d170..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00007.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00007.png
deleted file mode 100644
index 05baa700..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00008.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00008.png
deleted file mode 100644
index 3f8a8d52..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00009.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00009.png
deleted file mode 100644
index f55c9e97..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00010.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00010.png
deleted file mode 100644
index a17144ad..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00011.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00011.png
deleted file mode 100644
index 43e76c54..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00012.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00012.png
deleted file mode 100644
index 5b529988..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00013.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00013.png
deleted file mode 100644
index d1273580..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00014.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00014.png
deleted file mode 100644
index f6f50f67..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00015.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00015.png
deleted file mode 100644
index cc0815ba..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00016.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00016.png
deleted file mode 100644
index 4b2a89ad..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00017.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00017.png
deleted file mode 100644
index d88e549f..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00018.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00018.png
deleted file mode 100644
index 10ff9c8c..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00019.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00019.png
deleted file mode 100644
index 60383553..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00020.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00020.png
deleted file mode 100644
index 9fa5fab9..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00020.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00021.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00021.png
deleted file mode 100644
index c23b6c41..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00021.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00022.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00022.png
deleted file mode 100644
index a88fbb82..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00022.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00023.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00023.png
deleted file mode 100644
index 28cd767b..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00023.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00024.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00024.png
deleted file mode 100644
index a8dbed4b..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00024.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00025.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00025.png
deleted file mode 100644
index 644199ab..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00025.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00026.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00026.png
deleted file mode 100644
index 006c26ab..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00026.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-textual-sign_basic_expert/00027.png b/tests_zemu/snapshots/s-textual-sign_basic_expert/00027.png
deleted file mode 100644
index 131855e2..00000000
Binary files a/tests_zemu/snapshots/s-textual-sign_basic_expert/00027.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00000.png b/tests_zemu/snapshots/sp-govDeposit/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00001.png b/tests_zemu/snapshots/sp-govDeposit/00001.png
deleted file mode 100644
index 54b3e630..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00002.png b/tests_zemu/snapshots/sp-govDeposit/00002.png
deleted file mode 100644
index 5e8c47b6..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00003.png b/tests_zemu/snapshots/sp-govDeposit/00003.png
deleted file mode 100644
index 84bc70f9..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00004.png b/tests_zemu/snapshots/sp-govDeposit/00004.png
deleted file mode 100644
index 6b223738..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00005.png b/tests_zemu/snapshots/sp-govDeposit/00005.png
deleted file mode 100644
index eaecc407..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00006.png b/tests_zemu/snapshots/sp-govDeposit/00006.png
deleted file mode 100644
index b3a92e31..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00007.png b/tests_zemu/snapshots/sp-govDeposit/00007.png
deleted file mode 100644
index 5ecf01cc..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00008.png b/tests_zemu/snapshots/sp-govDeposit/00008.png
deleted file mode 100644
index 9d32864f..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00009.png b/tests_zemu/snapshots/sp-govDeposit/00009.png
deleted file mode 100644
index 480a738d..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00010.png b/tests_zemu/snapshots/sp-govDeposit/00010.png
deleted file mode 100644
index 62eac008..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00011.png b/tests_zemu/snapshots/sp-govDeposit/00011.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-govDeposit/00012.png b/tests_zemu/snapshots/sp-govDeposit/00012.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-govDeposit/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00000.png b/tests_zemu/snapshots/sp-ibc_denoms/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00001.png b/tests_zemu/snapshots/sp-ibc_denoms/00001.png
deleted file mode 100644
index 70772708..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00002.png b/tests_zemu/snapshots/sp-ibc_denoms/00002.png
deleted file mode 100644
index 46ba8198..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00003.png b/tests_zemu/snapshots/sp-ibc_denoms/00003.png
deleted file mode 100644
index e42e6ee7..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00004.png b/tests_zemu/snapshots/sp-ibc_denoms/00004.png
deleted file mode 100644
index 19374588..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00005.png b/tests_zemu/snapshots/sp-ibc_denoms/00005.png
deleted file mode 100644
index e234dbb0..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00006.png b/tests_zemu/snapshots/sp-ibc_denoms/00006.png
deleted file mode 100644
index a1980245..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00007.png b/tests_zemu/snapshots/sp-ibc_denoms/00007.png
deleted file mode 100644
index 1c1128d5..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00008.png b/tests_zemu/snapshots/sp-ibc_denoms/00008.png
deleted file mode 100644
index 709fbea8..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00009.png b/tests_zemu/snapshots/sp-ibc_denoms/00009.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-ibc_denoms/00010.png b/tests_zemu/snapshots/sp-ibc_denoms/00010.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-ibc_denoms/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00000.png b/tests_zemu/snapshots/sp-mainmenu/00000.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00001.png b/tests_zemu/snapshots/sp-mainmenu/00001.png
deleted file mode 100644
index e10e0049..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00002.png b/tests_zemu/snapshots/sp-mainmenu/00002.png
deleted file mode 100644
index 7e236da6..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00003.png b/tests_zemu/snapshots/sp-mainmenu/00003.png
deleted file mode 100644
index e10e0049..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
deleted file mode 100644
index 57e29fc4..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00005.png b/tests_zemu/snapshots/sp-mainmenu/00005.png
deleted file mode 100644
index 1adff7ee..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00006.png b/tests_zemu/snapshots/sp-mainmenu/00006.png
deleted file mode 100644
index 86e715d1..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00007.png b/tests_zemu/snapshots/sp-mainmenu/00007.png
deleted file mode 100644
index c7703726..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00008.png b/tests_zemu/snapshots/sp-mainmenu/00008.png
deleted file mode 100644
index 86e715d1..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00009.png b/tests_zemu/snapshots/sp-mainmenu/00009.png
deleted file mode 100644
index 1adff7ee..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
deleted file mode 100644
index 57e29fc4..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00011.png b/tests_zemu/snapshots/sp-mainmenu/00011.png
deleted file mode 100644
index e10e0049..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00012.png b/tests_zemu/snapshots/sp-mainmenu/00012.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-mainmenu/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00000.png b/tests_zemu/snapshots/sp-msgMultiSend/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00001.png b/tests_zemu/snapshots/sp-msgMultiSend/00001.png
deleted file mode 100644
index 5713013d..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00002.png b/tests_zemu/snapshots/sp-msgMultiSend/00002.png
deleted file mode 100644
index 1b9311c7..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00003.png b/tests_zemu/snapshots/sp-msgMultiSend/00003.png
deleted file mode 100644
index c572861c..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00004.png b/tests_zemu/snapshots/sp-msgMultiSend/00004.png
deleted file mode 100644
index 0f7c39b4..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00005.png b/tests_zemu/snapshots/sp-msgMultiSend/00005.png
deleted file mode 100644
index b84ba3b4..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00006.png b/tests_zemu/snapshots/sp-msgMultiSend/00006.png
deleted file mode 100644
index c498f6b2..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00007.png b/tests_zemu/snapshots/sp-msgMultiSend/00007.png
deleted file mode 100644
index f1418b66..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00008.png b/tests_zemu/snapshots/sp-msgMultiSend/00008.png
deleted file mode 100644
index e4149aaf..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00009.png b/tests_zemu/snapshots/sp-msgMultiSend/00009.png
deleted file mode 100644
index 6425843f..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00010.png b/tests_zemu/snapshots/sp-msgMultiSend/00010.png
deleted file mode 100644
index e4149aaf..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00011.png b/tests_zemu/snapshots/sp-msgMultiSend/00011.png
deleted file mode 100644
index 7279040d..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00012.png b/tests_zemu/snapshots/sp-msgMultiSend/00012.png
deleted file mode 100644
index e4149aaf..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00013.png b/tests_zemu/snapshots/sp-msgMultiSend/00013.png
deleted file mode 100644
index 480a738d..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00014.png b/tests_zemu/snapshots/sp-msgMultiSend/00014.png
deleted file mode 100644
index 62eac008..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00015.png b/tests_zemu/snapshots/sp-msgMultiSend/00015.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-msgMultiSend/00016.png b/tests_zemu/snapshots/sp-msgMultiSend/00016.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-msgMultiSend/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00000.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00001.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00001.png
deleted file mode 100644
index 797d0277..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00002.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00002.png
deleted file mode 100644
index 5e8c47b6..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00003.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00003.png
deleted file mode 100644
index 350ef295..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00004.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00004.png
deleted file mode 100644
index 65b749f5..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00005.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00005.png
deleted file mode 100644
index 8c729777..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00006.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00006.png
deleted file mode 100644
index 4dc44ae4..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00007.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00007.png
deleted file mode 100644
index 0f9cfb13..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00008.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00008.png
deleted file mode 100644
index 8c729777..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00009.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00009.png
deleted file mode 100644
index 21583d12..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00010.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00010.png
deleted file mode 100644
index d666b4d0..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00011.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00011.png
deleted file mode 100644
index 62eac008..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00012.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00012.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00013.png b/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00013.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress-eth/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00000.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00001.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00001.png
deleted file mode 100644
index 797d0277..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00002.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00002.png
deleted file mode 100644
index 5e8c47b6..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00003.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00003.png
deleted file mode 100644
index 350ef295..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00004.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00004.png
deleted file mode 100644
index 65b749f5..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00005.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00005.png
deleted file mode 100644
index 8c729777..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00006.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00006.png
deleted file mode 100644
index 4dc44ae4..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00007.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00007.png
deleted file mode 100644
index 0f9cfb13..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00008.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00008.png
deleted file mode 100644
index 8c729777..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00009.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00009.png
deleted file mode 100644
index 21583d12..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00010.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00010.png
deleted file mode 100644
index d666b4d0..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00011.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00011.png
deleted file mode 100644
index 62eac008..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00012.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00012.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-setWithdrawAddress/00013.png b/tests_zemu/snapshots/sp-setWithdrawAddress/00013.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-setWithdrawAddress/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address/00000.png b/tests_zemu/snapshots/sp-show_address/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-show_address/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address/00001.png b/tests_zemu/snapshots/sp-show_address/00001.png
deleted file mode 100644
index 4a1aa7e1..00000000
Binary files a/tests_zemu/snapshots/sp-show_address/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address/00002.png b/tests_zemu/snapshots/sp-show_address/00002.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-show_address/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address/00003.png b/tests_zemu/snapshots/sp-show_address/00003.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-show_address/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_huge/00000.png b/tests_zemu/snapshots/sp-show_address_huge/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-show_address_huge/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_huge/00001.png b/tests_zemu/snapshots/sp-show_address_huge/00001.png
deleted file mode 100644
index 280b6933..00000000
Binary files a/tests_zemu/snapshots/sp-show_address_huge/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_huge/00002.png b/tests_zemu/snapshots/sp-show_address_huge/00002.png
deleted file mode 100644
index 85877f0f..00000000
Binary files a/tests_zemu/snapshots/sp-show_address_huge/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_huge/00003.png b/tests_zemu/snapshots/sp-show_address_huge/00003.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-show_address_huge/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_address_huge/00004.png b/tests_zemu/snapshots/sp-show_address_huge/00004.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-show_address_huge/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_eth_address/00000.png b/tests_zemu/snapshots/sp-show_eth_address/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-show_eth_address/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_eth_address/00001.png b/tests_zemu/snapshots/sp-show_eth_address/00001.png
deleted file mode 100644
index 84ed31e4..00000000
Binary files a/tests_zemu/snapshots/sp-show_eth_address/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_eth_address/00002.png b/tests_zemu/snapshots/sp-show_eth_address/00002.png
deleted file mode 100644
index be6a7d82..00000000
Binary files a/tests_zemu/snapshots/sp-show_eth_address/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_eth_address/00003.png b/tests_zemu/snapshots/sp-show_eth_address/00003.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-show_eth_address/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-show_eth_address/00004.png b/tests_zemu/snapshots/sp-show_eth_address/00004.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-show_eth_address/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00000.png b/tests_zemu/snapshots/sp-sign_basic/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00001.png b/tests_zemu/snapshots/sp-sign_basic/00001.png
deleted file mode 100644
index 0f9cfb13..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00002.png b/tests_zemu/snapshots/sp-sign_basic/00002.png
deleted file mode 100644
index d5c15863..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00003.png b/tests_zemu/snapshots/sp-sign_basic/00003.png
deleted file mode 100644
index b47dabb4..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00004.png b/tests_zemu/snapshots/sp-sign_basic/00004.png
deleted file mode 100644
index 4e0f2906..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00005.png b/tests_zemu/snapshots/sp-sign_basic/00005.png
deleted file mode 100644
index a51f4624..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00007.png b/tests_zemu/snapshots/sp-sign_basic/00007.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic2/00000.png b/tests_zemu/snapshots/sp-sign_basic2/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic2/00001.png b/tests_zemu/snapshots/sp-sign_basic2/00001.png
deleted file mode 100644
index ee857c17..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic2/00002.png b/tests_zemu/snapshots/sp-sign_basic2/00002.png
deleted file mode 100644
index e7c45dc8..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic2/00003.png b/tests_zemu/snapshots/sp-sign_basic2/00003.png
deleted file mode 100644
index 17f84d47..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic2/00004.png b/tests_zemu/snapshots/sp-sign_basic2/00004.png
deleted file mode 100644
index 0e82ee25..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic2/00005.png b/tests_zemu/snapshots/sp-sign_basic2/00005.png
deleted file mode 100644
index 480a738d..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic2/00007.png b/tests_zemu/snapshots/sp-sign_basic2/00007.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00000.png b/tests_zemu/snapshots/sp-sign_basic_eth/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00001.png b/tests_zemu/snapshots/sp-sign_basic_eth/00001.png
deleted file mode 100644
index a2bcacba..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00002.png b/tests_zemu/snapshots/sp-sign_basic_eth/00002.png
deleted file mode 100644
index 45403abc..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00003.png b/tests_zemu/snapshots/sp-sign_basic_eth/00003.png
deleted file mode 100644
index 7da06771..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00004.png b/tests_zemu/snapshots/sp-sign_basic_eth/00004.png
deleted file mode 100644
index 0f9cfb13..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00005.png b/tests_zemu/snapshots/sp-sign_basic_eth/00005.png
deleted file mode 100644
index d5c15863..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00006.png b/tests_zemu/snapshots/sp-sign_basic_eth/00006.png
deleted file mode 100644
index b47dabb4..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00007.png b/tests_zemu/snapshots/sp-sign_basic_eth/00007.png
deleted file mode 100644
index d5c15863..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00008.png b/tests_zemu/snapshots/sp-sign_basic_eth/00008.png
deleted file mode 100644
index 4e0f2906..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00009.png b/tests_zemu/snapshots/sp-sign_basic_eth/00009.png
deleted file mode 100644
index be5df525..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00010.png b/tests_zemu/snapshots/sp-sign_basic_eth/00010.png
deleted file mode 100644
index 62eac008..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00011.png b/tests_zemu/snapshots/sp-sign_basic_eth/00011.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth/00012.png b/tests_zemu/snapshots/sp-sign_basic_eth/00012.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth_warning/00000.png b/tests_zemu/snapshots/sp-sign_basic_eth_warning/00000.png
deleted file mode 100644
index 53e74dc2..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth_warning/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth_warning/00001.png b/tests_zemu/snapshots/sp-sign_basic_eth_warning/00001.png
deleted file mode 100644
index 1a4653e1..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth_warning/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_eth_warning/00002.png b/tests_zemu/snapshots/sp-sign_basic_eth_warning/00002.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_eth_warning/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00000.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00001.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00001.png
deleted file mode 100644
index 0f9cfb13..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00002.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00002.png
deleted file mode 100644
index d5c15863..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00003.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00003.png
deleted file mode 100644
index b47dabb4..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00004.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00004.png
deleted file mode 100644
index 4e0f2906..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00005.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00005.png
deleted file mode 100644
index a51f4624..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00006.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00006.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00007.png b/tests_zemu/snapshots/sp-sign_basic_extra_fields/00007.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-sign_basic_extra_fields/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_msgSend/00000.png b/tests_zemu/snapshots/sp-sign_msgSend/00000.png
new file mode 100644
index 00000000..07b7c037
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_msgSend/00000.png differ
diff --git a/tests_zemu/snapshots/sp-sign_msgSend/00001.png b/tests_zemu/snapshots/sp-sign_msgSend/00001.png
new file mode 100644
index 00000000..5e79e908
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_msgSend/00001.png differ
diff --git a/tests_zemu/snapshots/sp-sign_msgSend/00002.png b/tests_zemu/snapshots/sp-sign_msgSend/00002.png
new file mode 100644
index 00000000..145d0f0a
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_msgSend/00002.png differ
diff --git a/tests_zemu/snapshots/sp-sign_msgSend/00003.png b/tests_zemu/snapshots/sp-sign_msgSend/00003.png
new file mode 100644
index 00000000..dbca8c33
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_msgSend/00003.png differ
diff --git a/tests_zemu/snapshots/sp-sign_msgSend/00004.png b/tests_zemu/snapshots/sp-sign_msgSend/00004.png
new file mode 100644
index 00000000..291df6b0
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_msgSend/00004.png differ
diff --git a/tests_zemu/snapshots/sp-sign_msgSend/00005.png b/tests_zemu/snapshots/sp-sign_msgSend/00005.png
new file mode 100644
index 00000000..223eca6c
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_msgSend/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic/00006.png b/tests_zemu/snapshots/sp-sign_msgSend/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_basic/00006.png
rename to tests_zemu/snapshots/sp-sign_msgSend/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_msgSend/00007.png b/tests_zemu/snapshots/sp-sign_msgSend/00007.png
new file mode 100644
index 00000000..1d4449e7
Binary files /dev/null and b/tests_zemu/snapshots/sp-sign_msgSend/00007.png differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00000.png b/tests_zemu/snapshots/sp-textual-sign_basic/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00001.png b/tests_zemu/snapshots/sp-textual-sign_basic/00001.png
deleted file mode 100644
index 34c29484..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00002.png b/tests_zemu/snapshots/sp-textual-sign_basic/00002.png
deleted file mode 100644
index 4b37d348..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00003.png b/tests_zemu/snapshots/sp-textual-sign_basic/00003.png
deleted file mode 100644
index 84bc70f9..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00004.png b/tests_zemu/snapshots/sp-textual-sign_basic/00004.png
deleted file mode 100644
index 966622a8..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00005.png b/tests_zemu/snapshots/sp-textual-sign_basic/00005.png
deleted file mode 100644
index ea6458ea..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00006.png b/tests_zemu/snapshots/sp-textual-sign_basic/00006.png
deleted file mode 100644
index 9236c111..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00007.png b/tests_zemu/snapshots/sp-textual-sign_basic/00007.png
deleted file mode 100644
index 4922d8db..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00008.png b/tests_zemu/snapshots/sp-textual-sign_basic/00008.png
deleted file mode 100644
index b7dffacb..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00009.png b/tests_zemu/snapshots/sp-textual-sign_basic/00009.png
deleted file mode 100644
index bb32e1a1..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00010.png b/tests_zemu/snapshots/sp-textual-sign_basic/00010.png
deleted file mode 100644
index 0d60b42f..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00011.png b/tests_zemu/snapshots/sp-textual-sign_basic/00011.png
deleted file mode 100644
index 66bca893..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00012.png b/tests_zemu/snapshots/sp-textual-sign_basic/00012.png
deleted file mode 100644
index ece93bda..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00013.png b/tests_zemu/snapshots/sp-textual-sign_basic/00013.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic/00014.png b/tests_zemu/snapshots/sp-textual-sign_basic/00014.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00000.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00001.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00001.png
deleted file mode 100644
index 34c29484..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00002.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00002.png
deleted file mode 100644
index 4b37d348..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00003.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00003.png
deleted file mode 100644
index 84bc70f9..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00004.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00004.png
deleted file mode 100644
index 9eb885b4..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00005.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00005.png
deleted file mode 100644
index bdfcf1a0..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00006.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00006.png
deleted file mode 100644
index 41277be7..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00007.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00007.png
deleted file mode 100644
index 58e46d54..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00008.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00008.png
deleted file mode 100644
index 2e818453..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00009.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00009.png
deleted file mode 100644
index 966622a8..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00010.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00010.png
deleted file mode 100644
index ea6458ea..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00011.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00011.png
deleted file mode 100644
index 9236c111..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00012.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00012.png
deleted file mode 100644
index 4922d8db..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00013.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00013.png
deleted file mode 100644
index b7dffacb..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00014.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00014.png
deleted file mode 100644
index bb32e1a1..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00015.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00015.png
deleted file mode 100644
index 0d60b42f..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00016.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00016.png
deleted file mode 100644
index 66bca893..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00017.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00017.png
deleted file mode 100644
index ece93bda..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00018.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00018.png
deleted file mode 100644
index 46f31cef..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00019.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00019.png
deleted file mode 100644
index dacd2afc..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00020.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00020.png
deleted file mode 100644
index a8292f84..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00020.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00021.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00021.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00021.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00022.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth/00022.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth/00022.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth_warning/00000.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth_warning/00000.png
deleted file mode 100644
index 53e74dc2..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth_warning/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth_warning/00001.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth_warning/00001.png
deleted file mode 100644
index 1a4653e1..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth_warning/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_eth_warning/00002.png b/tests_zemu/snapshots/sp-textual-sign_basic_eth_warning/00002.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_eth_warning/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00000.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00001.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00001.png
deleted file mode 100644
index 34c29484..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00002.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00002.png
deleted file mode 100644
index 4b37d348..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00003.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00003.png
deleted file mode 100644
index 84bc70f9..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00004.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00004.png
deleted file mode 100644
index 9eb885b4..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00005.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00005.png
deleted file mode 100644
index bdfcf1a0..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00006.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00006.png
deleted file mode 100644
index 41277be7..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00007.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00007.png
deleted file mode 100644
index 58e46d54..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00008.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00008.png
deleted file mode 100644
index 2e818453..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00009.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00009.png
deleted file mode 100644
index 966622a8..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00010.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00010.png
deleted file mode 100644
index ea6458ea..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00011.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00011.png
deleted file mode 100644
index 9236c111..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00012.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00012.png
deleted file mode 100644
index 4922d8db..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00013.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00013.png
deleted file mode 100644
index b7dffacb..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00014.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00014.png
deleted file mode 100644
index bb32e1a1..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00015.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00015.png
deleted file mode 100644
index 0d60b42f..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00016.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00016.png
deleted file mode 100644
index 66bca893..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00017.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00017.png
deleted file mode 100644
index ece93bda..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00018.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00018.png
deleted file mode 100644
index 46f31cef..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00019.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00019.png
deleted file mode 100644
index dacd2afc..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00020.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00020.png
deleted file mode 100644
index a8292f84..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00020.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00021.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00021.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00021.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00022.png b/tests_zemu/snapshots/sp-textual-sign_basic_expert/00022.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/sp-textual-sign_basic_expert/00022.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-govDeposit/00001.png b/tests_zemu/snapshots/st-govDeposit/00001.png
deleted file mode 100644
index 2a5ad8a8..00000000
Binary files a/tests_zemu/snapshots/st-govDeposit/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-govDeposit/00002.png b/tests_zemu/snapshots/st-govDeposit/00002.png
deleted file mode 100644
index 524b0425..00000000
Binary files a/tests_zemu/snapshots/st-govDeposit/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-govDeposit/00003.png b/tests_zemu/snapshots/st-govDeposit/00003.png
deleted file mode 100644
index 9bfecf27..00000000
Binary files a/tests_zemu/snapshots/st-govDeposit/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-govDeposit/00004.png b/tests_zemu/snapshots/st-govDeposit/00004.png
deleted file mode 100644
index 7da083e4..00000000
Binary files a/tests_zemu/snapshots/st-govDeposit/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-govDeposit/00005.png b/tests_zemu/snapshots/st-govDeposit/00005.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-govDeposit/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00000.png b/tests_zemu/snapshots/st-ibc_denoms/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-ibc_denoms/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00001.png b/tests_zemu/snapshots/st-ibc_denoms/00001.png
deleted file mode 100644
index ff5a113d..00000000
Binary files a/tests_zemu/snapshots/st-ibc_denoms/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00002.png b/tests_zemu/snapshots/st-ibc_denoms/00002.png
deleted file mode 100644
index 493649b3..00000000
Binary files a/tests_zemu/snapshots/st-ibc_denoms/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00003.png b/tests_zemu/snapshots/st-ibc_denoms/00003.png
deleted file mode 100644
index 49d196c0..00000000
Binary files a/tests_zemu/snapshots/st-ibc_denoms/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00004.png b/tests_zemu/snapshots/st-ibc_denoms/00004.png
deleted file mode 100644
index 7da083e4..00000000
Binary files a/tests_zemu/snapshots/st-ibc_denoms/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-ibc_denoms/00005.png b/tests_zemu/snapshots/st-ibc_denoms/00005.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-ibc_denoms/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00000.png b/tests_zemu/snapshots/st-mainmenu/00000.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-mainmenu/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.png
deleted file mode 100644
index 47b645c3..00000000
Binary files a/tests_zemu/snapshots/st-mainmenu/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00002.png b/tests_zemu/snapshots/st-mainmenu/00002.png
deleted file mode 100644
index 8dd2cdc2..00000000
Binary files a/tests_zemu/snapshots/st-mainmenu/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00003.png b/tests_zemu/snapshots/st-mainmenu/00003.png
deleted file mode 100644
index f1012e76..00000000
Binary files a/tests_zemu/snapshots/st-mainmenu/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
deleted file mode 100644
index 8dd2cdc2..00000000
Binary files a/tests_zemu/snapshots/st-mainmenu/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00005.png b/tests_zemu/snapshots/st-mainmenu/00005.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-mainmenu/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-msgMultiSend/00000.png b/tests_zemu/snapshots/st-msgMultiSend/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-msgMultiSend/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-msgMultiSend/00001.png b/tests_zemu/snapshots/st-msgMultiSend/00001.png
deleted file mode 100644
index ea564414..00000000
Binary files a/tests_zemu/snapshots/st-msgMultiSend/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-msgMultiSend/00002.png b/tests_zemu/snapshots/st-msgMultiSend/00002.png
deleted file mode 100644
index 5f7e2fdd..00000000
Binary files a/tests_zemu/snapshots/st-msgMultiSend/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-msgMultiSend/00003.png b/tests_zemu/snapshots/st-msgMultiSend/00003.png
deleted file mode 100644
index 4e7f82c1..00000000
Binary files a/tests_zemu/snapshots/st-msgMultiSend/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-msgMultiSend/00004.png b/tests_zemu/snapshots/st-msgMultiSend/00004.png
deleted file mode 100644
index 5b392f6e..00000000
Binary files a/tests_zemu/snapshots/st-msgMultiSend/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-msgMultiSend/00005.png b/tests_zemu/snapshots/st-msgMultiSend/00005.png
deleted file mode 100644
index ec8695b4..00000000
Binary files a/tests_zemu/snapshots/st-msgMultiSend/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-msgMultiSend/00006.png b/tests_zemu/snapshots/st-msgMultiSend/00006.png
deleted file mode 100644
index 5cc4bafc..00000000
Binary files a/tests_zemu/snapshots/st-msgMultiSend/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-msgMultiSend/00007.png b/tests_zemu/snapshots/st-msgMultiSend/00007.png
deleted file mode 100644
index f618d705..00000000
Binary files a/tests_zemu/snapshots/st-msgMultiSend/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-msgMultiSend/00008.png b/tests_zemu/snapshots/st-msgMultiSend/00008.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-msgMultiSend/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00000.png b/tests_zemu/snapshots/st-setWithdrawAddress-eth/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00001.png b/tests_zemu/snapshots/st-setWithdrawAddress-eth/00001.png
deleted file mode 100644
index 66ffedaf..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00002.png b/tests_zemu/snapshots/st-setWithdrawAddress-eth/00002.png
deleted file mode 100644
index 3d7f5c46..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00003.png b/tests_zemu/snapshots/st-setWithdrawAddress-eth/00003.png
deleted file mode 100644
index 265f2286..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00004.png b/tests_zemu/snapshots/st-setWithdrawAddress-eth/00004.png
deleted file mode 100644
index 80170bf5..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00005.png b/tests_zemu/snapshots/st-setWithdrawAddress-eth/00005.png
deleted file mode 100644
index fe642927..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00006.png b/tests_zemu/snapshots/st-setWithdrawAddress-eth/00006.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress-eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress/00000.png b/tests_zemu/snapshots/st-setWithdrawAddress/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress/00001.png b/tests_zemu/snapshots/st-setWithdrawAddress/00001.png
deleted file mode 100644
index 66ffedaf..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress/00002.png b/tests_zemu/snapshots/st-setWithdrawAddress/00002.png
deleted file mode 100644
index 3d7f5c46..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress/00003.png b/tests_zemu/snapshots/st-setWithdrawAddress/00003.png
deleted file mode 100644
index 265f2286..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress/00004.png b/tests_zemu/snapshots/st-setWithdrawAddress/00004.png
deleted file mode 100644
index 80170bf5..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress/00005.png b/tests_zemu/snapshots/st-setWithdrawAddress/00005.png
deleted file mode 100644
index fe642927..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-setWithdrawAddress/00006.png b/tests_zemu/snapshots/st-setWithdrawAddress/00006.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-setWithdrawAddress/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_address/00000.png b/tests_zemu/snapshots/st-show_address/00000.png
deleted file mode 100644
index c10c1fb7..00000000
Binary files a/tests_zemu/snapshots/st-show_address/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_address/00001.png b/tests_zemu/snapshots/st-show_address/00001.png
deleted file mode 100644
index 8b119985..00000000
Binary files a/tests_zemu/snapshots/st-show_address/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_address/00002.png b/tests_zemu/snapshots/st-show_address/00002.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-show_address/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_address_huge/00000.png b/tests_zemu/snapshots/st-show_address_huge/00000.png
deleted file mode 100644
index c10c1fb7..00000000
Binary files a/tests_zemu/snapshots/st-show_address_huge/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_address_huge/00001.png b/tests_zemu/snapshots/st-show_address_huge/00001.png
deleted file mode 100644
index 02dfca11..00000000
Binary files a/tests_zemu/snapshots/st-show_address_huge/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_address_huge/00002.png b/tests_zemu/snapshots/st-show_address_huge/00002.png
deleted file mode 100644
index 38861a7f..00000000
Binary files a/tests_zemu/snapshots/st-show_address_huge/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_address_huge/00003.png b/tests_zemu/snapshots/st-show_address_huge/00003.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-show_address_huge/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_eth_address/00000.png b/tests_zemu/snapshots/st-show_eth_address/00000.png
deleted file mode 100644
index c10c1fb7..00000000
Binary files a/tests_zemu/snapshots/st-show_eth_address/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_eth_address/00001.png b/tests_zemu/snapshots/st-show_eth_address/00001.png
deleted file mode 100644
index e0c21f9c..00000000
Binary files a/tests_zemu/snapshots/st-show_eth_address/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_eth_address/00002.png b/tests_zemu/snapshots/st-show_eth_address/00002.png
deleted file mode 100644
index b134010b..00000000
Binary files a/tests_zemu/snapshots/st-show_eth_address/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-show_eth_address/00003.png b/tests_zemu/snapshots/st-show_eth_address/00003.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-show_eth_address/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00000.png b/tests_zemu/snapshots/st-sign_basic/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00001.png b/tests_zemu/snapshots/st-sign_basic/00001.png
deleted file mode 100644
index e3f499c1..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00002.png b/tests_zemu/snapshots/st-sign_basic/00002.png
deleted file mode 100644
index ed9f206f..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00003.png b/tests_zemu/snapshots/st-sign_basic/00003.png
deleted file mode 100644
index c78dbcd7..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00004.png b/tests_zemu/snapshots/st-sign_basic/00004.png
deleted file mode 100644
index 7da083e4..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic/00005.png b/tests_zemu/snapshots/st-sign_basic/00005.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic2/00000.png b/tests_zemu/snapshots/st-sign_basic2/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic2/00001.png b/tests_zemu/snapshots/st-sign_basic2/00001.png
deleted file mode 100644
index 2abb6f8d..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic2/00002.png b/tests_zemu/snapshots/st-sign_basic2/00002.png
deleted file mode 100644
index c229b26d..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic2/00004.png b/tests_zemu/snapshots/st-sign_basic2/00004.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00000.png b/tests_zemu/snapshots/st-sign_basic_eth/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00001.png b/tests_zemu/snapshots/st-sign_basic_eth/00001.png
deleted file mode 100644
index fc500d3a..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00002.png b/tests_zemu/snapshots/st-sign_basic_eth/00002.png
deleted file mode 100644
index 24fbff89..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00003.png b/tests_zemu/snapshots/st-sign_basic_eth/00003.png
deleted file mode 100644
index b57125f1..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00004.png b/tests_zemu/snapshots/st-sign_basic_eth/00004.png
deleted file mode 100644
index a1bda4ee..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00005.png b/tests_zemu/snapshots/st-sign_basic_eth/00005.png
deleted file mode 100644
index fe642927..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_eth/00006.png b/tests_zemu/snapshots/st-sign_basic_eth/00006.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_eth_warning/00000.png b/tests_zemu/snapshots/st-sign_basic_eth_warning/00000.png
deleted file mode 100644
index ec85a9bb..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_eth_warning/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_eth_warning/00001.png b/tests_zemu/snapshots/st-sign_basic_eth_warning/00001.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_eth_warning/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00000.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_extra_fields/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00001.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00001.png
deleted file mode 100644
index e3f499c1..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_extra_fields/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00002.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00002.png
deleted file mode 100644
index ed9f206f..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_extra_fields/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00003.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00003.png
deleted file mode 100644
index c78dbcd7..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_extra_fields/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00004.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00004.png
deleted file mode 100644
index 7da083e4..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_extra_fields/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_basic_extra_fields/00005.png b/tests_zemu/snapshots/st-sign_basic_extra_fields/00005.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-sign_basic_extra_fields/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-govDeposit/00000.png b/tests_zemu/snapshots/st-sign_msgSend/00000.png
similarity index 100%
rename from tests_zemu/snapshots/st-govDeposit/00000.png
rename to tests_zemu/snapshots/st-sign_msgSend/00000.png
diff --git a/tests_zemu/snapshots/st-sign_msgSend/00001.png b/tests_zemu/snapshots/st-sign_msgSend/00001.png
new file mode 100644
index 00000000..a7d15489
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_msgSend/00001.png differ
diff --git a/tests_zemu/snapshots/st-sign_msgSend/00002.png b/tests_zemu/snapshots/st-sign_msgSend/00002.png
new file mode 100644
index 00000000..ae890fc3
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_msgSend/00002.png differ
diff --git a/tests_zemu/snapshots/st-sign_basic2/00003.png b/tests_zemu/snapshots/st-sign_msgSend/00003.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_basic2/00003.png
rename to tests_zemu/snapshots/st-sign_msgSend/00003.png
diff --git a/tests_zemu/snapshots/st-sign_msgSend/00004.png b/tests_zemu/snapshots/st-sign_msgSend/00004.png
new file mode 100644
index 00000000..a4630a5a
Binary files /dev/null and b/tests_zemu/snapshots/st-sign_msgSend/00004.png differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic/00000.png b/tests_zemu/snapshots/st-textual-sign_basic/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic/00001.png b/tests_zemu/snapshots/st-textual-sign_basic/00001.png
deleted file mode 100644
index 60bd1e9b..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic/00002.png b/tests_zemu/snapshots/st-textual-sign_basic/00002.png
deleted file mode 100644
index 7a6a5ac3..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic/00003.png b/tests_zemu/snapshots/st-textual-sign_basic/00003.png
deleted file mode 100644
index a9c25d2b..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic/00004.png b/tests_zemu/snapshots/st-textual-sign_basic/00004.png
deleted file mode 100644
index e54582a5..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic/00005.png b/tests_zemu/snapshots/st-textual-sign_basic/00005.png
deleted file mode 100644
index fe642927..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic/00006.png b/tests_zemu/snapshots/st-textual-sign_basic/00006.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth/00000.png b/tests_zemu/snapshots/st-textual-sign_basic_eth/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth/00001.png b/tests_zemu/snapshots/st-textual-sign_basic_eth/00001.png
deleted file mode 100644
index a68d599f..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth/00002.png b/tests_zemu/snapshots/st-textual-sign_basic_eth/00002.png
deleted file mode 100644
index 9aaa234b..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth/00003.png b/tests_zemu/snapshots/st-textual-sign_basic_eth/00003.png
deleted file mode 100644
index 276bf01b..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth/00004.png b/tests_zemu/snapshots/st-textual-sign_basic_eth/00004.png
deleted file mode 100644
index 62d2fbd5..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth/00005.png b/tests_zemu/snapshots/st-textual-sign_basic_eth/00005.png
deleted file mode 100644
index c62a1df2..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth/00006.png b/tests_zemu/snapshots/st-textual-sign_basic_eth/00006.png
deleted file mode 100644
index 6d397962..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth/00007.png b/tests_zemu/snapshots/st-textual-sign_basic_eth/00007.png
deleted file mode 100644
index 0733415b..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth/00008.png b/tests_zemu/snapshots/st-textual-sign_basic_eth/00008.png
deleted file mode 100644
index bcafe5ca..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth/00009.png b/tests_zemu/snapshots/st-textual-sign_basic_eth/00009.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth_warning/00000.png b/tests_zemu/snapshots/st-textual-sign_basic_eth_warning/00000.png
deleted file mode 100644
index ec85a9bb..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth_warning/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_eth_warning/00001.png b/tests_zemu/snapshots/st-textual-sign_basic_eth_warning/00001.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_eth_warning/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_expert/00000.png b/tests_zemu/snapshots/st-textual-sign_basic_expert/00000.png
deleted file mode 100644
index c1874b1e..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_expert/00001.png b/tests_zemu/snapshots/st-textual-sign_basic_expert/00001.png
deleted file mode 100644
index a68d599f..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_expert/00002.png b/tests_zemu/snapshots/st-textual-sign_basic_expert/00002.png
deleted file mode 100644
index 9aaa234b..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_expert/00003.png b/tests_zemu/snapshots/st-textual-sign_basic_expert/00003.png
deleted file mode 100644
index 276bf01b..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_expert/00004.png b/tests_zemu/snapshots/st-textual-sign_basic_expert/00004.png
deleted file mode 100644
index 62d2fbd5..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_expert/00005.png b/tests_zemu/snapshots/st-textual-sign_basic_expert/00005.png
deleted file mode 100644
index c62a1df2..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_expert/00006.png b/tests_zemu/snapshots/st-textual-sign_basic_expert/00006.png
deleted file mode 100644
index 6d397962..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_expert/00007.png b/tests_zemu/snapshots/st-textual-sign_basic_expert/00007.png
deleted file mode 100644
index 0733415b..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_expert/00008.png b/tests_zemu/snapshots/st-textual-sign_basic_expert/00008.png
deleted file mode 100644
index bcafe5ca..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-textual-sign_basic_expert/00009.png b/tests_zemu/snapshots/st-textual-sign_basic_expert/00009.png
deleted file mode 100644
index ba2e8a92..00000000
Binary files a/tests_zemu/snapshots/st-textual-sign_basic_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00000.png b/tests_zemu/snapshots/x-govDeposit/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00001.png b/tests_zemu/snapshots/x-govDeposit/00001.png
deleted file mode 100644
index 54b3e630..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00002.png b/tests_zemu/snapshots/x-govDeposit/00002.png
deleted file mode 100644
index 5e8c47b6..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00003.png b/tests_zemu/snapshots/x-govDeposit/00003.png
deleted file mode 100644
index 2ced4d49..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00004.png b/tests_zemu/snapshots/x-govDeposit/00004.png
deleted file mode 100644
index 6b223738..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00005.png b/tests_zemu/snapshots/x-govDeposit/00005.png
deleted file mode 100644
index eaecc407..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00006.png b/tests_zemu/snapshots/x-govDeposit/00006.png
deleted file mode 100644
index 70d09100..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00007.png b/tests_zemu/snapshots/x-govDeposit/00007.png
deleted file mode 100644
index 5ecf01cc..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00008.png b/tests_zemu/snapshots/x-govDeposit/00008.png
deleted file mode 100644
index d8fcf1cc..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00009.png b/tests_zemu/snapshots/x-govDeposit/00009.png
deleted file mode 100644
index 480a738d..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00010.png b/tests_zemu/snapshots/x-govDeposit/00010.png
deleted file mode 100644
index 62eac008..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00011.png b/tests_zemu/snapshots/x-govDeposit/00011.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-govDeposit/00012.png b/tests_zemu/snapshots/x-govDeposit/00012.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-govDeposit/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00000.png b/tests_zemu/snapshots/x-ibc_denoms/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00001.png b/tests_zemu/snapshots/x-ibc_denoms/00001.png
deleted file mode 100644
index b8f6cdc1..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00002.png b/tests_zemu/snapshots/x-ibc_denoms/00002.png
deleted file mode 100644
index 1009a3c2..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00003.png b/tests_zemu/snapshots/x-ibc_denoms/00003.png
deleted file mode 100644
index da1b3f2b..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00004.png b/tests_zemu/snapshots/x-ibc_denoms/00004.png
deleted file mode 100644
index 58eed79e..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00005.png b/tests_zemu/snapshots/x-ibc_denoms/00005.png
deleted file mode 100644
index b5ec39f8..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00006.png b/tests_zemu/snapshots/x-ibc_denoms/00006.png
deleted file mode 100644
index 5d38a7e5..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00007.png b/tests_zemu/snapshots/x-ibc_denoms/00007.png
deleted file mode 100644
index 1c1128d5..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00008.png b/tests_zemu/snapshots/x-ibc_denoms/00008.png
deleted file mode 100644
index 709fbea8..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00009.png b/tests_zemu/snapshots/x-ibc_denoms/00009.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-ibc_denoms/00010.png b/tests_zemu/snapshots/x-ibc_denoms/00010.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-ibc_denoms/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00000.png b/tests_zemu/snapshots/x-mainmenu/00000.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00001.png b/tests_zemu/snapshots/x-mainmenu/00001.png
deleted file mode 100644
index 8472e5d9..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00002.png b/tests_zemu/snapshots/x-mainmenu/00002.png
deleted file mode 100644
index f7921677..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00003.png b/tests_zemu/snapshots/x-mainmenu/00003.png
deleted file mode 100644
index 8472e5d9..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
deleted file mode 100644
index 57e29fc4..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00005.png b/tests_zemu/snapshots/x-mainmenu/00005.png
deleted file mode 100644
index 1adff7ee..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00006.png b/tests_zemu/snapshots/x-mainmenu/00006.png
deleted file mode 100644
index 86e715d1..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00007.png b/tests_zemu/snapshots/x-mainmenu/00007.png
deleted file mode 100644
index c7703726..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00008.png b/tests_zemu/snapshots/x-mainmenu/00008.png
deleted file mode 100644
index 86e715d1..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00009.png b/tests_zemu/snapshots/x-mainmenu/00009.png
deleted file mode 100644
index 1adff7ee..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
deleted file mode 100644
index 57e29fc4..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00011.png b/tests_zemu/snapshots/x-mainmenu/00011.png
deleted file mode 100644
index 8472e5d9..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00012.png b/tests_zemu/snapshots/x-mainmenu/00012.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-mainmenu/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00000.png b/tests_zemu/snapshots/x-msgMultiSend/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00001.png b/tests_zemu/snapshots/x-msgMultiSend/00001.png
deleted file mode 100644
index 5713013d..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00002.png b/tests_zemu/snapshots/x-msgMultiSend/00002.png
deleted file mode 100644
index 1b9311c7..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00003.png b/tests_zemu/snapshots/x-msgMultiSend/00003.png
deleted file mode 100644
index f43853dd..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00004.png b/tests_zemu/snapshots/x-msgMultiSend/00004.png
deleted file mode 100644
index 0f7c39b4..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00005.png b/tests_zemu/snapshots/x-msgMultiSend/00005.png
deleted file mode 100644
index 0ab9cc3d..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00006.png b/tests_zemu/snapshots/x-msgMultiSend/00006.png
deleted file mode 100644
index 74e5092c..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00007.png b/tests_zemu/snapshots/x-msgMultiSend/00007.png
deleted file mode 100644
index 50456f70..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00008.png b/tests_zemu/snapshots/x-msgMultiSend/00008.png
deleted file mode 100644
index d4deb7e0..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00009.png b/tests_zemu/snapshots/x-msgMultiSend/00009.png
deleted file mode 100644
index 1271607c..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00010.png b/tests_zemu/snapshots/x-msgMultiSend/00010.png
deleted file mode 100644
index d4deb7e0..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00011.png b/tests_zemu/snapshots/x-msgMultiSend/00011.png
deleted file mode 100644
index 328b356c..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00012.png b/tests_zemu/snapshots/x-msgMultiSend/00012.png
deleted file mode 100644
index d4deb7e0..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00013.png b/tests_zemu/snapshots/x-msgMultiSend/00013.png
deleted file mode 100644
index 480a738d..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00014.png b/tests_zemu/snapshots/x-msgMultiSend/00014.png
deleted file mode 100644
index 62eac008..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00015.png b/tests_zemu/snapshots/x-msgMultiSend/00015.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-msgMultiSend/00016.png b/tests_zemu/snapshots/x-msgMultiSend/00016.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-msgMultiSend/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00000.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00001.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00001.png
deleted file mode 100644
index 797d0277..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00002.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00002.png
deleted file mode 100644
index 5e8c47b6..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00003.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00003.png
deleted file mode 100644
index eb470379..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00004.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00004.png
deleted file mode 100644
index 9ae6d13c..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00005.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00005.png
deleted file mode 100644
index ddde590b..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00006.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00006.png
deleted file mode 100644
index db3ad2c1..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00007.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00007.png
deleted file mode 100644
index 0f9cfb13..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00008.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00008.png
deleted file mode 100644
index ddde590b..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00009.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00009.png
deleted file mode 100644
index 7a814c79..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00010.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00010.png
deleted file mode 100644
index d666b4d0..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00011.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00011.png
deleted file mode 100644
index 62eac008..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00012.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00012.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00013.png b/tests_zemu/snapshots/x-setWithdrawAddress-eth/00013.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress-eth/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00000.png b/tests_zemu/snapshots/x-setWithdrawAddress/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00001.png b/tests_zemu/snapshots/x-setWithdrawAddress/00001.png
deleted file mode 100644
index 797d0277..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00002.png b/tests_zemu/snapshots/x-setWithdrawAddress/00002.png
deleted file mode 100644
index 5e8c47b6..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00003.png b/tests_zemu/snapshots/x-setWithdrawAddress/00003.png
deleted file mode 100644
index eb470379..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00004.png b/tests_zemu/snapshots/x-setWithdrawAddress/00004.png
deleted file mode 100644
index 9ae6d13c..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00005.png b/tests_zemu/snapshots/x-setWithdrawAddress/00005.png
deleted file mode 100644
index ddde590b..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00006.png b/tests_zemu/snapshots/x-setWithdrawAddress/00006.png
deleted file mode 100644
index db3ad2c1..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00007.png b/tests_zemu/snapshots/x-setWithdrawAddress/00007.png
deleted file mode 100644
index 0f9cfb13..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00008.png b/tests_zemu/snapshots/x-setWithdrawAddress/00008.png
deleted file mode 100644
index ddde590b..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00009.png b/tests_zemu/snapshots/x-setWithdrawAddress/00009.png
deleted file mode 100644
index 7a814c79..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00010.png b/tests_zemu/snapshots/x-setWithdrawAddress/00010.png
deleted file mode 100644
index d666b4d0..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00011.png b/tests_zemu/snapshots/x-setWithdrawAddress/00011.png
deleted file mode 100644
index 62eac008..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00012.png b/tests_zemu/snapshots/x-setWithdrawAddress/00012.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-setWithdrawAddress/00013.png b/tests_zemu/snapshots/x-setWithdrawAddress/00013.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-setWithdrawAddress/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address/00000.png b/tests_zemu/snapshots/x-show_address/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-show_address/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address/00001.png b/tests_zemu/snapshots/x-show_address/00001.png
deleted file mode 100644
index 79a82065..00000000
Binary files a/tests_zemu/snapshots/x-show_address/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address/00002.png b/tests_zemu/snapshots/x-show_address/00002.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-show_address/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address/00003.png b/tests_zemu/snapshots/x-show_address/00003.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-show_address/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_huge/00000.png b/tests_zemu/snapshots/x-show_address_huge/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-show_address_huge/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_huge/00001.png b/tests_zemu/snapshots/x-show_address_huge/00001.png
deleted file mode 100644
index 280b6933..00000000
Binary files a/tests_zemu/snapshots/x-show_address_huge/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_huge/00002.png b/tests_zemu/snapshots/x-show_address_huge/00002.png
deleted file mode 100644
index 85877f0f..00000000
Binary files a/tests_zemu/snapshots/x-show_address_huge/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_huge/00003.png b/tests_zemu/snapshots/x-show_address_huge/00003.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-show_address_huge/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_huge/00004.png b/tests_zemu/snapshots/x-show_address_huge/00004.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-show_address_huge/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_eth_address/00000.png b/tests_zemu/snapshots/x-show_eth_address/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-show_eth_address/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_eth_address/00001.png b/tests_zemu/snapshots/x-show_eth_address/00001.png
deleted file mode 100644
index 35024425..00000000
Binary files a/tests_zemu/snapshots/x-show_eth_address/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_eth_address/00002.png b/tests_zemu/snapshots/x-show_eth_address/00002.png
deleted file mode 100644
index be6a7d82..00000000
Binary files a/tests_zemu/snapshots/x-show_eth_address/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_eth_address/00003.png b/tests_zemu/snapshots/x-show_eth_address/00003.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-show_eth_address/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_eth_address/00004.png b/tests_zemu/snapshots/x-show_eth_address/00004.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-show_eth_address/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00000.png b/tests_zemu/snapshots/x-sign_basic/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00001.png b/tests_zemu/snapshots/x-sign_basic/00001.png
deleted file mode 100644
index 0f9cfb13..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00002.png b/tests_zemu/snapshots/x-sign_basic/00002.png
deleted file mode 100644
index 88e2d4c9..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00003.png b/tests_zemu/snapshots/x-sign_basic/00003.png
deleted file mode 100644
index 5a83f183..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00004.png b/tests_zemu/snapshots/x-sign_basic/00004.png
deleted file mode 100644
index 88e82f3d..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00005.png b/tests_zemu/snapshots/x-sign_basic/00005.png
deleted file mode 100644
index a51f4624..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00006.png b/tests_zemu/snapshots/x-sign_basic/00006.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic/00007.png b/tests_zemu/snapshots/x-sign_basic/00007.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic2/00000.png b/tests_zemu/snapshots/x-sign_basic2/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic2/00001.png b/tests_zemu/snapshots/x-sign_basic2/00001.png
deleted file mode 100644
index ee857c17..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic2/00002.png b/tests_zemu/snapshots/x-sign_basic2/00002.png
deleted file mode 100644
index e7c45dc8..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic2/00003.png b/tests_zemu/snapshots/x-sign_basic2/00003.png
deleted file mode 100644
index c9e22f2d..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic2/00004.png b/tests_zemu/snapshots/x-sign_basic2/00004.png
deleted file mode 100644
index 262628b3..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic2/00005.png b/tests_zemu/snapshots/x-sign_basic2/00005.png
deleted file mode 100644
index 480a738d..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic2/00006.png b/tests_zemu/snapshots/x-sign_basic2/00006.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic2/00007.png b/tests_zemu/snapshots/x-sign_basic2/00007.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00000.png b/tests_zemu/snapshots/x-sign_basic_eth/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00001.png b/tests_zemu/snapshots/x-sign_basic_eth/00001.png
deleted file mode 100644
index a2bcacba..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00002.png b/tests_zemu/snapshots/x-sign_basic_eth/00002.png
deleted file mode 100644
index 45403abc..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00003.png b/tests_zemu/snapshots/x-sign_basic_eth/00003.png
deleted file mode 100644
index 8f46e011..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00004.png b/tests_zemu/snapshots/x-sign_basic_eth/00004.png
deleted file mode 100644
index 0f9cfb13..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00005.png b/tests_zemu/snapshots/x-sign_basic_eth/00005.png
deleted file mode 100644
index 88e2d4c9..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00006.png b/tests_zemu/snapshots/x-sign_basic_eth/00006.png
deleted file mode 100644
index 5a83f183..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00007.png b/tests_zemu/snapshots/x-sign_basic_eth/00007.png
deleted file mode 100644
index 88e2d4c9..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00008.png b/tests_zemu/snapshots/x-sign_basic_eth/00008.png
deleted file mode 100644
index 88e82f3d..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00009.png b/tests_zemu/snapshots/x-sign_basic_eth/00009.png
deleted file mode 100644
index be5df525..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00010.png b/tests_zemu/snapshots/x-sign_basic_eth/00010.png
deleted file mode 100644
index 62eac008..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00011.png b/tests_zemu/snapshots/x-sign_basic_eth/00011.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth/00012.png b/tests_zemu/snapshots/x-sign_basic_eth/00012.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth_warning/00000.png b/tests_zemu/snapshots/x-sign_basic_eth_warning/00000.png
deleted file mode 100644
index 50d75f83..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth_warning/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth_warning/00001.png b/tests_zemu/snapshots/x-sign_basic_eth_warning/00001.png
deleted file mode 100644
index 1a4653e1..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth_warning/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_eth_warning/00002.png b/tests_zemu/snapshots/x-sign_basic_eth_warning/00002.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_eth_warning/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00000.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00001.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00001.png
deleted file mode 100644
index 0f9cfb13..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00002.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00002.png
deleted file mode 100644
index 88e2d4c9..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00003.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00003.png
deleted file mode 100644
index 5a83f183..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00004.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00004.png
deleted file mode 100644
index 88e82f3d..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00005.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00005.png
deleted file mode 100644
index a51f4624..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00006.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00006.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_basic_extra_fields/00007.png b/tests_zemu/snapshots/x-sign_basic_extra_fields/00007.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-sign_basic_extra_fields/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_msgSend/00000.png b/tests_zemu/snapshots/x-sign_msgSend/00000.png
new file mode 100644
index 00000000..07b7c037
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_msgSend/00000.png differ
diff --git a/tests_zemu/snapshots/x-sign_msgSend/00001.png b/tests_zemu/snapshots/x-sign_msgSend/00001.png
new file mode 100644
index 00000000..5e79e908
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_msgSend/00001.png differ
diff --git a/tests_zemu/snapshots/x-sign_msgSend/00002.png b/tests_zemu/snapshots/x-sign_msgSend/00002.png
new file mode 100644
index 00000000..145d0f0a
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_msgSend/00002.png differ
diff --git a/tests_zemu/snapshots/x-sign_msgSend/00003.png b/tests_zemu/snapshots/x-sign_msgSend/00003.png
new file mode 100644
index 00000000..dbca8c33
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_msgSend/00003.png differ
diff --git a/tests_zemu/snapshots/x-sign_msgSend/00004.png b/tests_zemu/snapshots/x-sign_msgSend/00004.png
new file mode 100644
index 00000000..291df6b0
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_msgSend/00004.png differ
diff --git a/tests_zemu/snapshots/x-sign_msgSend/00005.png b/tests_zemu/snapshots/x-sign_msgSend/00005.png
new file mode 100644
index 00000000..223eca6c
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_msgSend/00005.png differ
diff --git a/tests_zemu/snapshots/sp-sign_basic2/00006.png b/tests_zemu/snapshots/x-sign_msgSend/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_basic2/00006.png
rename to tests_zemu/snapshots/x-sign_msgSend/00006.png
diff --git a/tests_zemu/snapshots/x-sign_msgSend/00007.png b/tests_zemu/snapshots/x-sign_msgSend/00007.png
new file mode 100644
index 00000000..1d4449e7
Binary files /dev/null and b/tests_zemu/snapshots/x-sign_msgSend/00007.png differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00000.png b/tests_zemu/snapshots/x-textual-sign_basic/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00001.png b/tests_zemu/snapshots/x-textual-sign_basic/00001.png
deleted file mode 100644
index 34c29484..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00002.png b/tests_zemu/snapshots/x-textual-sign_basic/00002.png
deleted file mode 100644
index 3d76db2e..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00003.png b/tests_zemu/snapshots/x-textual-sign_basic/00003.png
deleted file mode 100644
index 2ced4d49..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00004.png b/tests_zemu/snapshots/x-textual-sign_basic/00004.png
deleted file mode 100644
index fcf0fafa..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00005.png b/tests_zemu/snapshots/x-textual-sign_basic/00005.png
deleted file mode 100644
index ea6458ea..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00006.png b/tests_zemu/snapshots/x-textual-sign_basic/00006.png
deleted file mode 100644
index 3da6cc6b..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00007.png b/tests_zemu/snapshots/x-textual-sign_basic/00007.png
deleted file mode 100644
index 4922d8db..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00008.png b/tests_zemu/snapshots/x-textual-sign_basic/00008.png
deleted file mode 100644
index 057e364b..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00009.png b/tests_zemu/snapshots/x-textual-sign_basic/00009.png
deleted file mode 100644
index bb32e1a1..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00010.png b/tests_zemu/snapshots/x-textual-sign_basic/00010.png
deleted file mode 100644
index 0d60b42f..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00011.png b/tests_zemu/snapshots/x-textual-sign_basic/00011.png
deleted file mode 100644
index 66bca893..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00012.png b/tests_zemu/snapshots/x-textual-sign_basic/00012.png
deleted file mode 100644
index ece93bda..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00013.png b/tests_zemu/snapshots/x-textual-sign_basic/00013.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic/00014.png b/tests_zemu/snapshots/x-textual-sign_basic/00014.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00000.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00001.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00001.png
deleted file mode 100644
index 34c29484..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00002.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00002.png
deleted file mode 100644
index 3d76db2e..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00003.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00003.png
deleted file mode 100644
index 2ced4d49..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00004.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00004.png
deleted file mode 100644
index 9eb885b4..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00005.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00005.png
deleted file mode 100644
index b384c6dc..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00006.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00006.png
deleted file mode 100644
index 115b7ce4..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00007.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00007.png
deleted file mode 100644
index ec1db5ad..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00008.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00008.png
deleted file mode 100644
index 8de335a2..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00009.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00009.png
deleted file mode 100644
index fcf0fafa..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00010.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00010.png
deleted file mode 100644
index ea6458ea..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00011.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00011.png
deleted file mode 100644
index 3da6cc6b..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00012.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00012.png
deleted file mode 100644
index 4922d8db..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00013.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00013.png
deleted file mode 100644
index 057e364b..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00014.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00014.png
deleted file mode 100644
index bb32e1a1..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00015.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00015.png
deleted file mode 100644
index 0d60b42f..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00016.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00016.png
deleted file mode 100644
index 66bca893..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00017.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00017.png
deleted file mode 100644
index ece93bda..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00018.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00018.png
deleted file mode 100644
index a73d7695..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00019.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00019.png
deleted file mode 100644
index dd0bbb34..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00020.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00020.png
deleted file mode 100644
index 9da0fe80..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00020.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00021.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00021.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00021.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth/00022.png b/tests_zemu/snapshots/x-textual-sign_basic_eth/00022.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth/00022.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth_warning/00000.png b/tests_zemu/snapshots/x-textual-sign_basic_eth_warning/00000.png
deleted file mode 100644
index 50d75f83..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth_warning/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth_warning/00001.png b/tests_zemu/snapshots/x-textual-sign_basic_eth_warning/00001.png
deleted file mode 100644
index 1a4653e1..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth_warning/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_eth_warning/00002.png b/tests_zemu/snapshots/x-textual-sign_basic_eth_warning/00002.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_eth_warning/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00000.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00000.png
deleted file mode 100644
index 50c23a06..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00001.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00001.png
deleted file mode 100644
index 34c29484..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00002.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00002.png
deleted file mode 100644
index 3d76db2e..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00003.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00003.png
deleted file mode 100644
index 2ced4d49..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00004.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00004.png
deleted file mode 100644
index 9eb885b4..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00005.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00005.png
deleted file mode 100644
index b384c6dc..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00006.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00006.png
deleted file mode 100644
index 115b7ce4..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00007.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00007.png
deleted file mode 100644
index ec1db5ad..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00008.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00008.png
deleted file mode 100644
index 8de335a2..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00009.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00009.png
deleted file mode 100644
index fcf0fafa..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00010.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00010.png
deleted file mode 100644
index ea6458ea..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00011.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00011.png
deleted file mode 100644
index 3da6cc6b..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00012.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00012.png
deleted file mode 100644
index 4922d8db..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00013.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00013.png
deleted file mode 100644
index 057e364b..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00014.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00014.png
deleted file mode 100644
index bb32e1a1..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00015.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00015.png
deleted file mode 100644
index 0d60b42f..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00016.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00016.png
deleted file mode 100644
index 66bca893..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00017.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00017.png
deleted file mode 100644
index ece93bda..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00018.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00018.png
deleted file mode 100644
index a73d7695..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00019.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00019.png
deleted file mode 100644
index dd0bbb34..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00020.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00020.png
deleted file mode 100644
index 9da0fe80..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00020.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00021.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00021.png
deleted file mode 100644
index 1e4be699..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00021.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-textual-sign_basic_expert/00022.png b/tests_zemu/snapshots/x-textual-sign_basic_expert/00022.png
deleted file mode 100644
index 430a37e8..00000000
Binary files a/tests_zemu/snapshots/x-textual-sign_basic_expert/00022.png and /dev/null differ
diff --git a/tests_zemu/tests/amino.test.ts b/tests_zemu/tests/amino.test.ts
deleted file mode 100644
index 9bc28d0f..00000000
--- a/tests_zemu/tests/amino.test.ts
+++ /dev/null
@@ -1,522 +0,0 @@
-/** ******************************************************************************
- *  (c) 2018-2022 Zondax GmbH
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- ******************************************************************************* */
-
-import Zemu, { ClickNavigation, TouchNavigation } from '@zondax/zemu'
-// @ts-ignore
-import { CosmosApp } from '@zondax/ledger-cosmos-js'
-import {
-  defaultOptions,
-  DEVICE_MODELS,
-  example_tx_str_basic,
-  example_tx_str_basic2,
-  ibc_denoms,
-  AMINO_JSON_TX,
-  setWithdrawAddress,
-  cliGovDeposit,
-  example_tx_str_msgMultiSend,
-} from './common'
-
-// @ts-ignore
-import secp256k1 from 'secp256k1/elliptic'
-// @ts-ignore
-import crypto from 'crypto'
-import { ButtonKind, IButton } from '@zondax/zemu/dist/types'
-
-jest.setTimeout(120000)
-
-describe('Amino', function () {
-  // eslint-disable-next-line jest/expect-expect
-  test.concurrent.each(DEVICE_MODELS)('can start and stop container', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('sign basic normal', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      const path = [44, 118, 0, 0, 0]
-      const tx = Buffer.from(JSON.stringify(example_tx_str_basic), "utf-8")
-      const hrp = 'cosmos'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, AMINO_JSON_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-sign_basic`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const hash = crypto.createHash('sha256')
-      const msgHash = Uint8Array.from(hash.update(tx).digest())
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('sign basic normal2', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      const path = [44, 118, 0, 0, 0]
-      const tx = Buffer.from(JSON.stringify(example_tx_str_basic2))
-      const hrp = 'cosmos'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, AMINO_JSON_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-sign_basic2`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-
-      // Now verify the signature
-      const hash = crypto.createHash('sha256')
-      const msgHash = Uint8Array.from(hash.update(tx).digest())
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('sign basic with extra fields', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      const path = [44, 118, 0, 0, 0]
-      const tx = Buffer.from(JSON.stringify(example_tx_str_basic))
-      const hrp = 'cosmos'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, AMINO_JSON_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-sign_basic_extra_fields`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const hash = crypto.createHash('sha256')
-      const msgHash = Uint8Array.from(hash.update(tx).digest())
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('ibc denoms', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      const path = [44, 118, 0, 0, 0]
-      const tx = Buffer.from(JSON.stringify(ibc_denoms))
-      const hrp = 'cosmos'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, AMINO_JSON_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-ibc_denoms`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const hash = crypto.createHash('sha256')
-      const msgHash = Uint8Array.from(hash.update(tx).digest())
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('SetWithdrawAddress', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      const path = [44, 118, 0, 0, 0]
-      const tx = Buffer.from(JSON.stringify(setWithdrawAddress))
-      const hrp = 'cosmos'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, AMINO_JSON_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-setWithdrawAddress`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const hash = crypto.createHash('sha256')
-      const msgHash = Uint8Array.from(hash.update(tx).digest())
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('CLIGovDeposit', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      const path = [44, 118, 0, 0, 0]
-      const tx = Buffer.from(JSON.stringify(cliGovDeposit))
-      const hrp = 'cosmos'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, AMINO_JSON_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-govDeposit`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const hash = crypto.createHash('sha256')
-      const msgHash = Uint8Array.from(hash.update(tx).digest())
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('MsgMultisend', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Activate expert mode
-      await sim.toggleExpertMode();
-
-      const path = [44, 118, 0, 0, 0]
-      const tx = Buffer.from(JSON.stringify(example_tx_str_msgMultiSend))
-      const hrp = 'cosmos'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, AMINO_JSON_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-msgMultiSend`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const hash = crypto.createHash('sha256')
-      const msgHash = Uint8Array.from(hash.update(tx).digest())
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('SetWithdrawAddress-eth', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Change to expert mode so we can skip fields
-      await sim.toggleExpertMode();
-
-      const path = [44, 60, 0, 0, 0]
-      const tx = Buffer.from(JSON.stringify(setWithdrawAddress))
-      const hrp = 'inj'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, AMINO_JSON_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-setWithdrawAddress-eth`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const sha3 = require('js-sha3')
-      const msgHash = Buffer.from(sha3.keccak256(tx), 'hex')
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('sign basic normal Eth', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Enable expert to allow sign with eth path
-      await sim.toggleExpertMode();
-
-      const path = [44, 60, 0, 0, 0]
-      const tx = Buffer.from(JSON.stringify(example_tx_str_basic), "utf-8")
-      const hrp = 'inj'
-
-      // check with invalid HRP
-      const errorRespPk = await app.getAddressAndPubKey(path, 'forbiddenHRP')
-      expect(errorRespPk.return_code).toEqual(0x6986)
-      expect(errorRespPk.error_message).toEqual('Transaction rejected')
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-sign_basic_eth`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // Now verify the signature
-      const sha3 = require('js-sha3')
-      const msgHash = Buffer.from(sha3.keccak256(tx), 'hex')
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('sign basic normal Eth no expert', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      const path = [44, 60, 0, 0, 0]
-      const tx = Buffer.from(JSON.stringify(example_tx_str_basic), "utf-8")
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, 'inj')
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      let nav = undefined;
-      if (m.name === 'stax') {
-        const okButton: IButton = {
-          x: 200,
-          y: 540,
-          delay: 0.25,
-        };
-        nav = new TouchNavigation([
-          ButtonKind.ConfirmYesButton,
-        ]);
-        nav.schedule[0].button = okButton;
-      } else {
-        nav = new ClickNavigation([1, 0]);
-      }
-      await sim.navigate('.', `${m.prefix.toLowerCase()}-sign_basic_eth_warning`, nav.schedule);
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x6984)
-    } finally {
-      await sim.close()
-    }
-  })
-})
diff --git a/tests_zemu/tests/common.ts b/tests_zemu/tests/common.ts
index 722cae2a..3f8381ef 100644
--- a/tests_zemu/tests/common.ts
+++ b/tests_zemu/tests/common.ts
@@ -40,321 +40,54 @@ export const DEVICE_MODELS: IDeviceModel[] = [
   { name: 'stax', prefix: 'ST', path: APP_PATH_ST },
 ]
 
-export const tx_sign_textual = 'a10192a20168436861696e20696402686d792d636861696ea2016e4163636f756e74206e756d626572026131a2016853657175656e6365026132a301674164647265737302782d636f736d6f7331756c6176336873656e7570737771666b77327933737570356b677471776e767161386579687304f5a3016a5075626c6963206b657902781f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657904f5a3026d5075624b6579206f626a656374030104f5a401634b657902785230324542204444374620453446442045423736204443384120323035452046363544203739304320443330452038413337203541354320323532382045423341203932334120463146422034443739203444030204f5a102781e54686973207472616e73616374696f6e206861732031204d657373616765a3016d4d6573736167652028312f312902781c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e640301a2026e4d736753656e64206f626a6563740302a3016c46726f6d206164647265737302782d636f736d6f7331756c6176336873656e7570737771666b77327933737570356b677471776e76716138657968730303a3016a546f206164647265737302782d636f736d6f7331656a726634637572327779366b667572673966326a707070326833616665356836706b6835740303a30166416d6f756e74026731302041544f4d0303a1026e456e64206f66204d657373616765a201644d656d6f0278193e20e29a9befb88f5c7532363942e29a9befb88f2020202020a2016446656573026a302e3030322041544f4da30169476173206c696d697402673130302730303004f5a3017148617368206f66207261772062797465730278403963303433323930313039633237306232666661396633633066613535613039306330313235656265663838316637646135333937386462663933663733383504f5'
-
-export const example_tx_str_msgMultiSend = {
-      "account_number":"10",
-      "chain_id":"chain-WiONzW",
-      "fee":{
-        "amount":[],
-        "gas":"200000"
-        },
-      "memo":"",
-      "msgs":[
-        {
-          "type":"cosmos-sdk/MsgMultiSend",
+export const example_tx_str_MsgSend = {
+  "account_number": "588",
+  "chain_id": "thorchain",
+  "fee": {
+      "amount": [],
+      "gas": "2000000"
+  },
+  "memo": "TestMemo",
+  "msgs": [
+      {
+          "type": "thorchain/MsgSend",
           "value": {
-            "inputs":[
-              {
-                "address":"cosmos1w4efqfklkezgyt6lncjdwxncrzyzpr2efzcqal",
-                "coins":[
-                  {
-                    "amount":"30",
-                    "denom":"stake"
-                  }
-                ]
-              }
-            ],
-            "outputs":[
-              {
-                "address":"cosmos184hgxlzat3qhm7p28563w4jyw4aa3wcgnj6gtv",
-                "coins":[
-                  {
-                    "amount":"10",
-                    "denom":"stake"
-                  }
-                ]
-              },
-              {
-                "address":"cosmos1pfyz36qx8z8dm8ktd75mwx5j5vsmkzfn7wrgp9",
-                "coins":[
-                  {
-                    "amount":"10",
-                    "denom":"stake"
-                  }
-                ]
-              },
-              {
-                "address":"cosmos1xu388ml6krya3ysmlrup2ylxjtzhl4hlaem3ng",
-                "coins":[
+              "amount": [
                   {
-                    "amount":"10",
-                    "denom":"stake"
+                      "amount": "150000000",
+                      "denom": "rune"
                   }
-                ]
-              }
-            ]
+              ],
+              "from_address": "tthor1c648xgpter9xffhmcqvs7lzd7hxh0prgv5t5gp",
+              "to_address": "tthor10xgrknu44d83qr4s4uw56cqxg0hsev5e68lc9z"
           }
-        }
-      ],
-      "sequence":"16",
-}
-
-export const example_tx_str_basic = {
-  account_number: '108',
-  chain_id: 'cosmoshub-4',
-  fee: {
-    amount: [
-      {
-        amount: '600',
-        denom: 'uatom',
-      },
-    ],
-    gas: '200000',
-  },
-  memo: '',
-  msgs: [
-    {
-      type: 'cosmos-sdk/MsgWithdrawDelegationReward',
-      value: {
-        delegator_address: 'cosmos1w34k53py5v5xyluazqpq65agyajavep2rflq6h',
-        validator_address: 'cosmosvaloper1kn3wugetjuy4zetlq6wadchfhvu3x740ae6z6x',
-      },
-    },
-    {
-      type: 'cosmos-sdk/MsgWithdrawDelegationReward',
-      value: {
-        delegator_address: 'cosmos1w34k53py5v5xyluazqpq65agyajavep2rflq6h',
-        validator_address: 'cosmosvaloper1sjllsnramtg3ewxqwwrwjxfgc4n4ef9u2lcnj0',
-      },
-    },
-  ],
-  sequence: '106',
-}
-
-export const example_tx_str_expert = {
-  account_number: '108',
-  chain_id: 'cosmoshub-2',
-  fee: {
-    amount: [
-      {
-        amount: '600',
-        denom: 'uatom',
-      },
-    ],
-    gas: '200000',
-  },
-  memo: '',
-  msgs: [
-    {
-      type: 'cosmos-sdk/MsgWithdrawDelegationReward',
-      value: {
-        delegator_address: 'cosmos1kky4yzth6gdrm8ga5zlfwhav33yr7hl87jycah',
-        validator_address: 'cosmosvaloper1kn3wugetjuy4zetlq6wadchfhvu3x740ae6z6x',
-      },
-    },
-    {
-      type: 'cosmos-sdk/MsgWithdrawDelegationReward',
-      value: {
-        delegator_address: 'cosmos1kky4yzth6gdrm8ga5zlfwhav33yr7hl87jycah',
-        validator_address: 'cosmosvaloper1sjllsnramtg3ewxqwwrwjxfgc4n4ef9u2lcnj0',
-      },
-    },
-  ],
-  sequence: '106',
-}
-
-export const example_tx_str_combined = {
-  account_number: '108',
-  chain_id: 'cosmoshub-4',
-  fee: {
-    amount: [
-      {
-        amount: '600',
-        denom: 'uatom',
-      },
-    ],
-    gas: '200000',
-  },
-  memo: '',
-  msgs: [
-    {
-      type: 'cosmos-sdk/MsgWithdrawDelegationReward',
-      value: {
-        delegator_address: 'cosmos1w34k53py5v5xyluazqpq65agyajavep2rflq6h',
-        validator_address: 'cosmosvaloper1648ynlpdw7fqa2axt0w2yp3fk542junl7rsvq6',
-      },
-    },
-    {
-      type: 'cosmos-sdk/MsgDelegate',
-      value: {
-        amount: {
-          amount: '20139397',
-          denom: 'uatom',
-        },
-        delegator_address: 'cosmos1w34k53py5v5xyluazqpq65agyajavep2rflq6h',
-        validator_address: 'cosmosvaloper1648ynlpdw7fqa2axt0w2yp3fk542junl7rsvq6',
-      },
-    },
+      }
   ],
-  sequence: '106',
-}
+  "sequence": "5"
+};
 
-export const example_tx_str_basic2 = {
-  account_number: '482',
-  chain_id: 'cosmoshub-4',
-  fee: {
-    amount: [],
-    gas: '10000000',
+export const example_tx_str_MsgDeposit = {
+  "account_number": "588",
+  "chain_id": "thorchain",
+  "fee": {
+      "amount": [],
+      "gas": "10000000"
   },
-  memo: '',
-  msgs: [
-    {
-      type: 'somechain/MsgNew',
-      value: {
-        coins: [
-          {
-            amount: '20139397',
-            asset: 'uatom',
-          },
-        ],
-        memo: 'memo_text_goes_here',
-        signer: 'cosmos1w34k53py5v5xyluazqpq65agyajavep2rflq6h',
-      },
-    },
-  ],
-  sequence: '6',
-}
-
-export const example_tx_str_basic_extra_fields = {
-  account_number: '108',
-  chain_id: 'cosmoshub-4',
-  extra_field: 'empty',
-  fee: {
-    amount: [
+  "memo": "",
+  "msgs": [
       {
-        amount: '600',
-        denom: 'uatom',
-      },
-    ],
-    gas: '200000',
-  },
-  foo: 'bar',
-  memo: '',
-  msgs: [
-    {
-      type: 'cosmos-sdk/MsgWithdrawDelegationReward',
-      value: {
-        delegator_address: 'cosmos1w34k53py5v5xyluazqpq65agyajavep2rflq6h',
-        validator_address: 'cosmosvaloper1kn3wugetjuy4zetlq6wadchfhvu3x740ae6z6x',
-      },
-    },
-    {
-      type: 'cosmos-sdk/MsgWithdrawDelegationReward',
-      value: {
-        delegator_address: 'cosmos1w34k53py5v5xyluazqpq65agyajavep2rflq6h',
-        validator_address: 'cosmosvaloper1sjllsnramtg3ewxqwwrwjxfgc4n4ef9u2lcnj0',
-      },
-    },
-  ],
-  sequence: '106',
-  unknown_field: 123456
-}
-
-export const ibc_denoms = {
-  account_number: "0",
-  chain_id: "cosmoshub-4",
-  fee: {
-    amount: [
-      {
-        "amount": '5',
-        "denom": 'uatom',
+          "type": "thorchain/MsgDeposit",
+          "value": {
+              "coins": [
+                  {
+                      "amount": "330000000",
+                      "asset": "THOR.RUNE"
+                  }
+              ],
+              "memo": "SWAP:BNB.BNB:tbnb1qk2m905ypazwfau9cn0qnr4c4yxz63v9u9md20:",
+              "signer": "tthor1c648xgpter9xffhmcqvs7lzd7hxh0prgv5t5gp"
+          }
       }
-    ],
-    gas: '10000',
-  },
-  memo: "testmemo",
-  msgs: [
-    {
-      inputs: [
-        {
-          address: "cosmosaccaddr1d9h8qat5e4ehc5",
-          coins: [
-            {
-              amount: '10',
-              denom: 'ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2'
-            }
-          ]
-        }
-      ],
-      outputs: [
-        {
-          address: 'cosmosaccaddr1da6hgur4wse3jx32',
-          coins: [
-            {
-              amount: '10',
-              denom: 'ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2'
-            }
-          ]
-        }
-      ]
-    }
   ],
-  sequence: '1'
-}
-
-export const setWithdrawAddress = {
-    account_number: '8',
-    chain_id: 'testing',
-    fee: {
-      amount: [
-        {
-          amount: '5000',
-          denom: 'uatom'
-        }
-      ],
-      gas: '200000'
-    },
-    memo: '',
-    msgs: [
-      {
-        type: 'cosmos-sdk/MsgSetWithdrawAddress',
-        value: {
-          delegator_address: 'cosmos1hr9x0sjvel6z3vt9qny8sdd5gnnlgk0p69d6cv',
-          withdraw_address: 'cosmos12d64j98tjjpqkx70r08aspc4nvntqp2w6wr2de'
-        }
-      },
-      {
-        type: 'cosmos-sdk/MsgWithdrawDelegationReward',
-        value: {
-          delegator_address: 'cosmos1hr9x0sjvel6z3vt9qny8sdd5gnnlgk0p69d6cv',
-          validator_address: 'cosmosvaloper13dr26wdygna3s8fdl5tlc45m2le2ydyddxzj49'
-        }
-      }
-    ],
-    sequence: '7'
-  }
-
-  export const cliGovDeposit = {
-    account_number: '8',
-    chain_id: 'my-chain',
-    fee: {
-      amount: [],
-      gas: '200000'
-    },
-    memo: 'A B C',
-    msgs: [
-      {
-        type: 'cosmos-sdk/MsgDeposit',
-        value: {
-          amount: [{
-            amount: '10',
-            denom: 'stake',
-          }],
-          depositor: 'cosmos1xl2256vdh0j68khz9wq88hnyqcq0f5f4za2480',
-          proposal_id: '1'
-        }
-      },
-    ],
-    sequence: '2'
-  }
+  "sequence": "6"
+};
\ No newline at end of file
diff --git a/tests_zemu/tests/standard.test.ts b/tests_zemu/tests/standard.test.ts
deleted file mode 100644
index 9ec51ca4..00000000
--- a/tests_zemu/tests/standard.test.ts
+++ /dev/null
@@ -1,244 +0,0 @@
-/** ******************************************************************************
- *  (c) 2018 - 2023 Zondax AG
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- ******************************************************************************* */
-
-import Zemu, { zondaxMainmenuNavigation, ButtonKind, ClickNavigation, TouchNavigation } from '@zondax/zemu'
-import { CosmosApp } from '@zondax/ledger-cosmos-js'
-import { defaultOptions, DEVICE_MODELS, example_tx_str_basic, example_tx_str_basic2, ibc_denoms } from './common'
-
-// @ts-ignore
-import secp256k1 from 'secp256k1/elliptic'
-// @ts-ignore
-import crypto from 'crypto'
-import { ActionKind, IButton, INavElement } from '@zondax/zemu/dist/types'
-
-jest.setTimeout(90000)
-
-describe('Standard', function () {
-  test.concurrent.each(DEVICE_MODELS)('can start and stop container', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('main menu', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const nav = zondaxMainmenuNavigation(m.name, [1, 0, 0, 4, -5])
-      await sim.navigateAndCompareSnapshots('.', `${m.prefix.toLowerCase()}-mainmenu`, nav.schedule)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('get app version', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-      const resp = await app.getVersion()
-
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('test_mode')
-      expect(resp).toHaveProperty('major')
-      expect(resp).toHaveProperty('minor')
-      expect(resp).toHaveProperty('patch')
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('get address', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Derivation path. First 3 items are automatically hardened!
-      const path = [44, 118, 5, 0, 3]
-      const resp = await app.getAddressAndPubKey(path, 'cosmos')
-
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-
-      expect(resp).toHaveProperty('bech32_address')
-      expect(resp).toHaveProperty('compressed_pk')
-
-      expect(resp.bech32_address).toEqual('cosmos1wkd9tfm5pqvhhaxq77wv9tvjcsazuaykwsld65')
-      expect(resp.compressed_pk.length).toEqual(33)
-      expect(resp.compressed_pk.toString("hex")).toEqual('035c986b9ae5fbfb8e1e9c12c817f5ef8fdb821cdecaa407f1420ec4f8f1d766bf')
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('show address', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Derivation path. First 3 items are automatically hardened!
-      const path = [44, 118, 5, 0, 3]
-      const respRequest = app.showAddressAndPubKey(path, 'cosmos')
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-show_address`)
-
-      const resp = await respRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-
-      expect(resp).toHaveProperty('bech32_address')
-      expect(resp).toHaveProperty('compressed_pk')
-
-      expect(resp.bech32_address).toEqual('cosmos1wkd9tfm5pqvhhaxq77wv9tvjcsazuaykwsld65')
-      expect(resp.compressed_pk.length).toEqual(33)
-      expect(resp.compressed_pk.toString("hex")).toEqual('035c986b9ae5fbfb8e1e9c12c817f5ef8fdb821cdecaa407f1420ec4f8f1d766bf')
-    } finally {
-      await sim.close()
-    }
-  })
-
-    test.concurrent.each(DEVICE_MODELS)('show Eth address', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'Path' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Derivation path. First 3 items are automatically hardened!
-      const path = [44, 60, 0, 0, 1]
-      const hrp = 'inj'
-
-      // check with invalid HRP
-      const errorRespPk = await app.getAddressAndPubKey(path, 'cosmos')
-      expect(errorRespPk.return_code).toEqual(0x6986)
-      expect(errorRespPk.error_message).toEqual('Transaction rejected')
-
-      const respRequest = app.showAddressAndPubKey(path, hrp)
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-show_eth_address`)
-
-      const resp = await respRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-
-      expect(resp).toHaveProperty('bech32_address')
-      expect(resp).toHaveProperty('compressed_pk')
-
-      expect(resp.compressed_pk.length).toEqual(33)
-
-      // Verify address
-      const secp256k1 = require("secp256k1");
-      const keccak = require("keccak256");
-      const { bech32 } = require("bech32");
-
-      // Take the compressed pubkey and verify that the expected address can be computed
-      const uncompressPubKeyUint8Array = secp256k1.publicKeyConvert(resp.compressed_pk, false).subarray(1);
-      const ethereumAddressBuffer = Buffer.from(keccak(Buffer.from(uncompressPubKeyUint8Array))).subarray(-20);
-      const eth_address = bech32.encode(hrp, bech32.toWords(ethereumAddressBuffer)); // "cosmos15n2h0lzvfgc8x4fm6fdya89n78x6ee2fm7fxr3"
-
-      expect(resp.bech32_address).toEqual(eth_address)
-      expect(resp.bech32_address).toEqual('inj15n2h0lzvfgc8x4fm6fdya89n78x6ee2f3h7z3f')
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('show address HUGE', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Derivation path. First 3 items are automatically hardened!
-      const path = [44, 118, 2147483647, 0, 4294967295]
-      const resp = await app.showAddressAndPubKey(path, 'cosmos')
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x6985)
-      expect(resp.error_message).toEqual('Conditions not satisfied')
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('show address HUGE Expert', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'Path' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Activate expert mode
-      await sim.toggleExpertMode();
-
-      // Derivation path. First 3 items are automatically hardened!
-      const path = [44, 118, 2147483647, 0, 4294967295]
-      const respRequest = app.showAddressAndPubKey(path, 'cosmos')
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-show_address_huge`)
-
-      const resp = await respRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-
-      expect(resp).toHaveProperty('bech32_address')
-      expect(resp).toHaveProperty('compressed_pk')
-
-      expect(resp.bech32_address).toEqual('cosmos1ex7gkwwmq4vcgdwcalaq3t20pgwr37u6ntkqzh')
-      expect(resp.compressed_pk.length).toEqual(33)
-    } finally {
-      await sim.close()
-    }
-  })
-})
diff --git a/tests_zemu/tests/textual.test.ts b/tests_zemu/tests/textual.test.ts
deleted file mode 100644
index 96532027..00000000
--- a/tests_zemu/tests/textual.test.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-/** ******************************************************************************
- *  (c) 2018-2022 Zondax GmbH
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- ******************************************************************************* */
-
-import Zemu, { ClickNavigation, TouchNavigation } from '@zondax/zemu'
-// @ts-ignore
-import { CosmosApp } from '@zondax/ledger-cosmos-js'
-import { defaultOptions, DEVICE_MODELS, tx_sign_textual, TEXTUAL_TX } from './common'
-// @ts-ignore
-import secp256k1 from 'secp256k1/elliptic'
-// @ts-ignore
-import crypto from 'crypto'
-import { ButtonKind, IButton } from '@zondax/zemu/dist/types'
-
-jest.setTimeout(90000)
-
-describe('Textual', function () {
-  // eslint-disable-next-line jest/expect-expect
-  test.concurrent.each(DEVICE_MODELS)('can start and stop container', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('sign basic textual', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      const path = [44, 118, 0, 0, 0]
-      const tx = Buffer.from(tx_sign_textual, 'hex')
-      const hrp = 'cosmos'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, TEXTUAL_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-textual-sign_basic`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const hash = crypto.createHash('sha256')
-      const msgHash = Uint8Array.from(hash.update(tx).digest())
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('sign basic textual expert', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Change to expert mode so we can skip fields
-      await sim.toggleExpertMode()
-
-      const path = [44, 118, 0, 0, 0]
-      const tx = Buffer.from(tx_sign_textual, 'hex')
-      const hrp = 'cosmos'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, TEXTUAL_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-textual-sign_basic_expert`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const hash = crypto.createHash('sha256')
-      const msgHash = Uint8Array.from(hash.update(tx).digest())
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('sign basic textual eth ', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Enable expert to allow sign with eth path
-      await sim.toggleExpertMode();
-
-      const path = [44, 60, 0, 0, 0]
-      const tx = Buffer.from(tx_sign_textual, 'hex')
-      const hrp = 'inj'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, TEXTUAL_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-textual-sign_basic_eth`)
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const sha3 = require('js-sha3')
-      const msgHash = Buffer.from(sha3.keccak256(tx), 'hex')
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('sign basic textual eth warning ', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      const path = [44, 60, 0, 0, 0]
-      const tx = Buffer.from(tx_sign_textual, 'hex')
-      const hrp = 'inj'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, TEXTUAL_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      let nav = undefined;
-      if (m.name === 'stax') {
-        const okButton: IButton = {
-          x: 200,
-          y: 540,
-          delay: 0.25,
-        };
-        nav = new TouchNavigation([
-          ButtonKind.ConfirmYesButton,
-        ]);
-        nav.schedule[0].button = okButton;
-      } else {
-        nav = new ClickNavigation([1, 0]);
-      }
-      await sim.navigate('.', `${m.prefix.toLowerCase()}-textual-sign_basic_eth_warning`, nav.schedule);
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x6984)
-    } finally {
-      await sim.close()
-    }
-  })
-
-  test.concurrent.each(DEVICE_MODELS)('sign basic textual evmos ', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new CosmosApp(sim.getTransport())
-
-      // Enable expert to allow sign with eth path
-      await sim.toggleExpertMode()
-
-      const path = [44, 60, 0, 0, 0]
-      const tx = Buffer.from(tx_sign_textual, 'hex')
-      const hrp = 'evmos'
-
-      // get address / publickey
-      const respPk = await app.getAddressAndPubKey(path, hrp)
-      expect(respPk.return_code).toEqual(0x9000)
-      expect(respPk.error_message).toEqual('No errors')
-      console.log(respPk)
-
-      // do not wait here..
-      const signatureRequest = app.sign(path, tx, hrp, TEXTUAL_TX)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      const last_index = await sim.navigateUntilText(
-        '.',
-        `${m.prefix.toLowerCase()}-textual-sign_basic_evmos`,
-        sim.startOptions.approveKeyword,
-        false,
-        false,
-      )
-
-      const resp = await signatureRequest
-      console.log(resp)
-
-      expect(resp.return_code).toEqual(0x9000)
-      expect(resp.error_message).toEqual('No errors')
-      expect(resp).toHaveProperty('signature')
-
-      // Now verify the signature
-      const sha3 = require('js-sha3')
-      const msgHash = Buffer.from(sha3.keccak256(tx), 'hex')
-
-      const signatureDER = resp.signature
-      const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER))
-
-      const pk = Uint8Array.from(respPk.compressed_pk)
-
-      const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk)
-      expect(signatureOk).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
-})
diff --git a/tests_zemu/tests/thor.test.ts b/tests_zemu/tests/thor.test.ts
new file mode 100644
index 00000000..415d7abc
--- /dev/null
+++ b/tests_zemu/tests/thor.test.ts
@@ -0,0 +1,97 @@
+/** ******************************************************************************
+ *  (c) 2018-2022 Zondax GmbH
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ ******************************************************************************* */
+
+import Zemu, { ClickNavigation, TouchNavigation, IDeviceModel } from '@zondax/zemu'
+// @ts-ignore
+import { CosmosApp } from '@zondax/ledger-cosmos-js'
+import {
+  defaultOptions,
+  DEVICE_MODELS,
+  AMINO_JSON_TX,
+  example_tx_str_MsgSend,
+  example_tx_str_MsgDeposit,
+} from './common'
+
+// @ts-ignore
+import secp256k1 from 'secp256k1/elliptic'
+// @ts-ignore
+import crypto from 'crypto'
+import { ButtonKind, IButton } from '@zondax/zemu/dist/types'
+
+jest.setTimeout(120000)
+
+async function signAndVerifyTransaction(m: IDeviceModel, test_name: String, transaction: any) {
+  const sim = new Zemu(m.path);
+  try {
+    await sim.start({ ...defaultOptions, model: m.name });
+    const app = new CosmosApp(sim.getTransport());
+
+    const path = [44, 931, 0, 0, 0];
+    const tx = Buffer.from(JSON.stringify(transaction), "utf-8");
+    const hrp = 'thor';
+
+    // get address / publickey
+    const respPk = await app.getAddressAndPubKey(path, hrp);
+    expect(respPk.return_code).toEqual(0x9000)
+    expect(respPk.error_message).toEqual('No errors')
+    console.log(respPk);
+
+    // do not wait here..
+    const signatureRequest = app.sign(path, tx, hrp, AMINO_JSON_TX);
+
+    // Wait until we are not in the main menu
+    await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot());
+    await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-${test_name}`);
+
+    const resp = await signatureRequest;
+    console.log(resp);
+
+    expect(resp.return_code).toEqual(0x9000)
+    expect(resp.error_message).toEqual('No errors')
+    expect(resp).toHaveProperty('signature')
+
+    // Now verify the signature
+    const hash = crypto.createHash('sha256');
+    const msgHash = Uint8Array.from(hash.update(tx).digest());
+
+    const signatureDER = resp.signature;
+    const signature = secp256k1.signatureImport(Uint8Array.from(signatureDER));
+
+    const pk = Uint8Array.from(respPk.compressed_pk);
+
+    const signatureOk = secp256k1.ecdsaVerify(signature, msgHash, pk);
+    expect(signatureOk).toEqual(true);
+  } finally {
+    await sim.close();
+  }
+}
+
+describe('Thor', function () {
+  // eslint-disable-next-line jest/expect-expect
+  test.concurrent.each([DEVICE_MODELS])('can start and stop container', async function (m) {
+    const sim = new Zemu(m.path)
+    try {
+      await sim.start({ ...defaultOptions, model: m.name })
+    } finally {
+      await sim.close()
+    }
+  });
+
+  test.concurrent.each(DEVICE_MODELS)('sign msgSend normal', async function (m) {
+    await signAndVerifyTransaction(m, 'sign_msgSend', example_tx_str_MsgSend);
+  });
+
+})