diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 69b7338d..14dfd539 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -3,12 +3,18 @@ name: Compilation & tests
 on: [workflow_dispatch, push, pull_request]
 
 jobs:
+  build_application:
+    name: Build application using the reusable workflow
+    uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_build.yml@v1
+    with:
+      upload_app_binaries_artifact: "compiled_app_binaries"
+
   job_nanoS_build_debug:
     name: Build debug app for NanoS
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:d5bfe2e793f15a826971ae9de2adcad524df3e8e
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:3.19.0
 
     steps:
       - name: Clone
@@ -29,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:d5bfe2e793f15a826971ae9de2adcad524df3e8e
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:3.19.0
 
     steps:
       - name: Clone
@@ -50,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:d5bfe2e793f15a826971ae9de2adcad524df3e8e
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:3.19.0
 
     steps:
       - name: Clone
@@ -72,7 +78,7 @@ jobs:
     needs: job_nanoS_build_debug
 
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:d5bfe2e793f15a826971ae9de2adcad524df3e8e
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:3.19.0
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/guidelines_enforcer.yml b/.github/workflows/guidelines_enforcer.yml
index 3aa0962e..32cfd201 100644
--- a/.github/workflows/guidelines_enforcer.yml
+++ b/.github/workflows/guidelines_enforcer.yml
@@ -17,5 +17,3 @@ jobs:
   guidelines_enforcer:
     name: Call Ledger guidelines_enforcer
     uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_guidelines_enforcer.yml@v1
-    with:
-        run_for_devices: '["nanos", "nanox", "nanosp"]'
diff --git a/Makefile b/Makefile
index dd2b649f..632d8534 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 
 APPVERSION_M = 1
 APPVERSION_N = 0
-APPVERSION_P = 6
+APPVERSION_P = 7
 
 NANOS_ID = 1
 WORDS = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
diff --git a/MakefileContainer.mk b/MakefileContainer.mk
index 6c947f62..8114fda5 100644
--- a/MakefileContainer.mk
+++ b/MakefileContainer.mk
@@ -19,7 +19,7 @@ ifneq ($(BOLOS_SDK),)
 $(error Containerized build, BOLOS_SDK should be empty)
 endif
 
-APP_BUILDER_IMAGE = ledger-app-builder:d5bfe2e793f15a826971ae9de2adcad524df3e8e
+APP_BUILDER_IMAGE = ledger-app-builder:3.19.0
 
 default_target: build
 
diff --git a/MakefileLocal.mk b/MakefileLocal.mk
index a00d8ad6..340de716 100644
--- a/MakefileLocal.mk
+++ b/MakefileLocal.mk
@@ -155,7 +155,7 @@ endif
 #   Build    #
 ##############
 
-build: bin/app.elf
+build: all
 	@cp $(DBG_DIR)/app.asm debug/app.asm
 	@cp $(DBG_DIR)/app.map debug/app.map
 	@cp $(BIN_DIR)/app.hex bin/app.hex
diff --git a/MakefileSpeculos.mk b/MakefileSpeculos.mk
index 885f4551..7ee282e1 100644
--- a/MakefileSpeculos.mk
+++ b/MakefileSpeculos.mk
@@ -15,7 +15,7 @@
 #  limitations under the License.
 #*******************************************************************************
 
-SPECULOS_IMAGE = speculos:sha-6a34680
+SPECULOS_IMAGE = speculos:6409e73ba640fbec2e46dfae7ae0f18887a7ee42
 	
 define run_announce
 	@perl -e 'use Time::HiRes; use POSIX; $$ts = sprintf qq[%f], Time::HiRes::time(); ($$f) = $$ts =~ m~(\....)~; printf qq[%s%s %s make: %s\n], POSIX::strftime("%H:%M:%S", gmtime), $$f, q[-] x 126, $$ARGV[0];' "$(1)"
diff --git a/ledgerjs-fio/src/interactions/transactionTemplates/commands.ts b/ledgerjs-fio/src/interactions/transactionTemplates/commands.ts
index 572c1744..600441bf 100644
--- a/ledgerjs-fio/src/interactions/transactionTemplates/commands.ts
+++ b/ledgerjs-fio/src/interactions/transactionTemplates/commands.ts
@@ -413,30 +413,28 @@ export function ADD_STORAGE_CHECK(check: VALUE_STORAGE_COMPARE, c: Command): Com
     }
 }
 
-export function COMMAND_APPEND_DATA_MEMO_HASH(memo?: VarlenAsciiString, hash?: VarlenAsciiString, offline_url?: VarlenAsciiString): Command {
-    var varData: Buffer = Buffer.from("");
-    if (memo === undefined) {
-        validate(hash !== undefined, InvalidDataReason.INVALID_HASH);
-        validate(offline_url !== undefined, InvalidDataReason.INVALID_OFFLINE_URL);
-        varData = Buffer.concat([
-            Buffer.from("0001", "hex"), 
-            varuint32_to_buf(hash.length),
-            Buffer.from(hash),
-            Buffer.from("01", "hex"),
-            varuint32_to_buf(offline_url.length),
-            Buffer.from(offline_url),
-        ])
+function serializeOptionalString(str?: VarlenAsciiString): Buffer {
+    if (str === undefined) {
+        return Buffer.from("00", "hex")
     }
     else {
-        validate(hash === undefined, InvalidDataReason.INVALID_HASH);
-        validate(hash === undefined, InvalidDataReason.INVALID_OFFLINE_URL);
-        varData = Buffer.concat([
+        return Buffer.concat([
             Buffer.from("01", "hex"), 
-            varuint32_to_buf(memo.length),
-            Buffer.from(memo),
-            Buffer.from("0000", "hex"),
+            varuint32_to_buf(str.length),
+            Buffer.from(str),
         ])
     }
+}
+
+export function COMMAND_APPEND_DATA_MEMO_HASH(memo?: VarlenAsciiString, hash?: VarlenAsciiString, offline_url?: VarlenAsciiString): Command {
+    validate((hash !== undefined && offline_url !== undefined) || (hash === undefined && offline_url === undefined), InvalidDataReason.INVALID_HASH);
+            
+    const varData = Buffer.concat([
+        serializeOptionalString(memo),
+        serializeOptionalString(hash),
+        serializeOptionalString(offline_url),
+    ])
+
     return {
         ...defaultCommand,
         command: COMMAND.APPEND_DATA, 
diff --git a/src/decodeDH.c b/src/decodeDH.c
index 7e1a28cf..84a082cf 100644
--- a/src/decodeDH.c
+++ b/src/decodeDH.c
@@ -122,78 +122,62 @@ static void decodeNewfundsreqMemo_ui_runStep() {
 }
 
 enum {
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_MESSAGE1 = 250,
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_MESSAGE2,
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_PAYEE_PUBLIC_ADDRESS,
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_AMOUNT,
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_CHAIN_CODE,
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_TOKEN_CODE,
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_HASH,
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_OFFLINE_URL,
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_CONFIRM,
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_RESPOND,
-    DECODE_NEWFUNDSREQ_HASH_UI_STEP_INVALID,
+    DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_MESSAGE1 = 250,
+    DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_MESSAGE2,
+    DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_PAYEE_PUBLIC_ADDRESS,
+    DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_AMOUNT,
+    DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_CHAIN_CODE,
+    DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_TOKEN_CODE,
+    DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_CONFIRM,
+    DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_RESPOND,
+    DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_INVALID,
 };
 
-static void decodeNewfundsreqHash_ui_runStep() {
+static void decodeNewfundsreqNoMemo_ui_runStep() {
     TRACE("UI step %d", ctx->ui_step);
-    ui_callback_fn_t *this_fn = decodeNewfundsreqHash_ui_runStep;
+    ui_callback_fn_t *this_fn = decodeNewfundsreqNoMemo_ui_runStep;
 
     UI_STEP_BEGIN(ctx->ui_step, this_fn);
 
-    UI_STEP(DECODE_NEWFUNDSREQ_HASH_UI_STEP_MESSAGE1) {
+    UI_STEP(DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_MESSAGE1) {
         ui_displayPaginatedText("Decrypt content", "", this_fn);
     }
-    UI_STEP(DECODE_NEWFUNDSREQ_HASH_UI_STEP_MESSAGE2) {
+    UI_STEP(DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_MESSAGE2) {
         ui_displayPaginatedText("Interpreting", "the message as Request funds", this_fn);
     }
-    UI_STEP(DECODE_NEWFUNDSREQ_HASH_UI_STEP_PAYEE_PUBLIC_ADDRESS) {
+    UI_STEP(DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_PAYEE_PUBLIC_ADDRESS) {
         ui_displayAsciiBufferScreen("Payee public address",
                                     ctx->parsedContent.payee_public_address->data,
                                     ctx->parsedContent.payee_public_address->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_NEWFUNDSREQ_HASH_UI_STEP_AMOUNT) {
+    UI_STEP(DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_AMOUNT) {
         ui_displayAsciiBufferScreen("Amount",
                                     ctx->parsedContent.amount->data,
                                     ctx->parsedContent.amount->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_NEWFUNDSREQ_HASH_UI_STEP_CHAIN_CODE) {
+    UI_STEP(DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_CHAIN_CODE) {
         ui_displayAsciiBufferScreen("Chain code",
                                     ctx->parsedContent.chain_code->data,
                                     ctx->parsedContent.chain_code->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_NEWFUNDSREQ_HASH_UI_STEP_TOKEN_CODE) {
+    UI_STEP(DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_TOKEN_CODE) {
         ui_displayAsciiBufferScreen("Token code",
                                     ctx->parsedContent.token_code->data,
                                     ctx->parsedContent.token_code->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_NEWFUNDSREQ_HASH_UI_STEP_HASH) {
-        ASSERT(ctx->parsedContent.hash != NULL);
-        ui_displayAsciiBufferScreen("Hash",
-                                    ctx->parsedContent.hash->data,
-                                    ctx->parsedContent.hash->length,
-                                    this_fn);
-    }
-    UI_STEP(DECODE_NEWFUNDSREQ_HASH_UI_STEP_OFFLINE_URL) {
-        ASSERT(ctx->parsedContent.offline_url != NULL);
-        ui_displayAsciiBufferScreen("Offline URL",
-                                    ctx->parsedContent.offline_url->data,
-                                    ctx->parsedContent.offline_url->length,
-                                    this_fn);
-    }
-    UI_STEP(DECODE_NEWFUNDSREQ_HASH_UI_STEP_CONFIRM) {
+    UI_STEP(DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_CONFIRM) {
         ui_displayPrompt("Confirm", "response", this_fn, dh_respond_with_user_reject);
     }
-    UI_STEP(DECODE_NEWFUNDSREQ_HASH_UI_STEP_RESPOND) {
+    UI_STEP(DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_RESPOND) {
         io_send_buf(SUCCESS, NULL, 0);
         ui_displayBusy();  // needs to happen after I/O
         ctx->stage = DECODE_STAGE_SEND_REST;
     }
-    UI_STEP_END(DECODE_NEWFUNDSREQ_HASH_UI_STEP_INVALID);
+    UI_STEP_END(DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_INVALID);
 }
 
 // Parse newfundsreq data
@@ -210,18 +194,17 @@ static void decodeNewfundsreqUIFlow() {
     readOptionalStringWithLength(&read, &ctx->parsedContent.hash);
     readOptionalStringWithLength(&read, &ctx->parsedContent.offline_url);
     VALIDATE(read == ctx->bufferLen, ERR_INVALID_DATA);
+    bool hasMemo = (ctx->parsedContent.memo != NULL);
+    bool hasHash = (ctx->parsedContent.hash != NULL);
+    bool hasOfflineUrl = (ctx->parsedContent.offline_url != NULL);
+    VALIDATE((hasHash && hasOfflineUrl) || (!hasHash && !hasOfflineUrl), ERR_INVALID_DATA);
 
-    if (ctx->parsedContent.memo != NULL && ctx->parsedContent.hash == NULL &&
-        ctx->parsedContent.offline_url == NULL) {
+    if (hasMemo) {
         ctx->ui_step = DECODE_NEWFUNDSREQ_MEMO_UI_STEP_MESSAGE1;
         decodeNewfundsreqMemo_ui_runStep();
-    } else if (ctx->parsedContent.memo == NULL && ctx->parsedContent.hash != NULL &&
-               ctx->parsedContent.offline_url != NULL) {
-        ctx->ui_step = DECODE_NEWFUNDSREQ_HASH_UI_STEP_MESSAGE1;
-        decodeNewfundsreqHash_ui_runStep();
-
     } else {
-        THROW(ERR_INVALID_DATA);
+        ctx->ui_step = DECODE_NEWFUNDSREQ_NOMEMO_UI_STEP_MESSAGE1;
+        decodeNewfundsreqNoMemo_ui_runStep();
     }
 }
 
@@ -318,101 +301,85 @@ static void decodeRecordobtMemo_ui_runStep() {
 }
 
 enum {
-    DECODE_RECORDOBT_HASH_UI_STEP_MESSAGE1 = 350,
-    DECODE_RECORDOBT_HASH_UI_STEP_MESSAGE2,
-    DECODE_RECORDOBT_HASH_UI_STEP_PAYEE_PUBLIC_ADDRESS,
-    DECODE_RECORDOBT_HASH_UI_STEP_PAYER_PUBLIC_ADDRESS,
-    DECODE_RECORDOBT_HASH_UI_STEP_AMOUNT,
-    DECODE_RECORDOBT_HASH_UI_STEP_CHAIN_CODE,
-    DECODE_RECORDOBT_HASH_UI_STEP_TOKEN_CODE,
-    DECODE_RECORDOBT_HASH_UI_STEP_STATUS,
-    DECODE_RECORDOBT_HASH_UI_STEP_OBT_ID,
-    DECODE_RECORDOBT_HASH_UI_STEP_HASH,
-    DECODE_RECORDOBT_HASH_UI_STEP_OFFLINE_URL,
-    DECODE_RECORDOBT_HASH_UI_STEP_CONFIRM,
-    DECODE_RECORDOBT_HASH_UI_STEP_RESPOND,
-    DECODE_RECORDOBT_HASH_UI_STEP_INVALID,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_MESSAGE1 = 350,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_MESSAGE2,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_PAYEE_PUBLIC_ADDRESS,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_PAYER_PUBLIC_ADDRESS,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_AMOUNT,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_CHAIN_CODE,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_TOKEN_CODE,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_STATUS,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_OBT_ID,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_CONFIRM,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_RESPOND,
+    DECODE_RECORDOBT_NO_MEMO_UI_STEP_INVALID,
 };
 
-static void decodeRecordobtHash_ui_runStep() {
+static void decodeRecordobtNoMemo_ui_runStep() {
     TRACE("UI step %d", ctx->ui_step);
-    ui_callback_fn_t *this_fn = decodeRecordobtHash_ui_runStep;
+    ui_callback_fn_t *this_fn = decodeRecordobtNoMemo_ui_runStep;
 
     UI_STEP_BEGIN(ctx->ui_step, this_fn);
 
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_MESSAGE1) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_MESSAGE1) {
         ui_displayPaginatedText("Decrypt content", "", this_fn);
     }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_MESSAGE2) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_MESSAGE2) {
         ui_displayPaginatedText("Interpreting",
                                 "the message as Record other blockchain transaction metadata",
                                 this_fn);
     }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_PAYEE_PUBLIC_ADDRESS) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_PAYEE_PUBLIC_ADDRESS) {
         ui_displayAsciiBufferScreen("Payee public address",
                                     ctx->parsedContent.payee_public_address->data,
                                     ctx->parsedContent.payee_public_address->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_PAYER_PUBLIC_ADDRESS) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_PAYER_PUBLIC_ADDRESS) {
         ui_displayAsciiBufferScreen("Payer public address",
                                     ctx->parsedContent.payer_public_address->data,
                                     ctx->parsedContent.payer_public_address->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_AMOUNT) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_AMOUNT) {
         ui_displayAsciiBufferScreen("Amount",
                                     ctx->parsedContent.amount->data,
                                     ctx->parsedContent.amount->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_CHAIN_CODE) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_CHAIN_CODE) {
         ui_displayAsciiBufferScreen("Chain code",
                                     ctx->parsedContent.chain_code->data,
                                     ctx->parsedContent.chain_code->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_TOKEN_CODE) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_TOKEN_CODE) {
         ui_displayAsciiBufferScreen("Token code",
                                     ctx->parsedContent.token_code->data,
                                     ctx->parsedContent.token_code->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_STATUS) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_STATUS) {
         ui_displayAsciiBufferScreen("Status",
                                     ctx->parsedContent.status->data,
                                     ctx->parsedContent.status->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_OBT_ID) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_OBT_ID) {
         ui_displayAsciiBufferScreen("Obt ID",
                                     ctx->parsedContent.obt_id->data,
                                     ctx->parsedContent.obt_id->length,
                                     this_fn);
     }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_HASH) {
-        ASSERT(ctx->parsedContent.hash != NULL);
-        ui_displayAsciiBufferScreen("Hash",
-                                    ctx->parsedContent.hash->data,
-                                    ctx->parsedContent.hash->length,
-                                    this_fn);
-    }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_OFFLINE_URL) {
-        ASSERT(ctx->parsedContent.offline_url != NULL);
-        ui_displayAsciiBufferScreen("Offline URL",
-                                    ctx->parsedContent.offline_url->data,
-                                    ctx->parsedContent.offline_url->length,
-                                    this_fn);
-    }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_CONFIRM) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_CONFIRM) {
         ui_displayPrompt("Confirm", "response", this_fn, dh_respond_with_user_reject);
     }
-    UI_STEP(DECODE_RECORDOBT_HASH_UI_STEP_RESPOND) {
+    UI_STEP(DECODE_RECORDOBT_NO_MEMO_UI_STEP_RESPOND) {
         io_send_buf(SUCCESS, NULL, 0);
         ui_displayBusy();  // needs to happen after I/O
         ctx->stage = DECODE_STAGE_SEND_REST;
     }
-    UI_STEP_END(DECODE_RECORDOBT_HASH_UI_STEP_INVALID);
+    UI_STEP_END(DECODE_RECORDOBT_NO_MEMO_UI_STEP_INVALID);
 }
 
 // Parse newfundsreq data
@@ -432,18 +399,17 @@ static void decodeRecordobtUIFlow() {
     readOptionalStringWithLength(&read, &ctx->parsedContent.hash);
     readOptionalStringWithLength(&read, &ctx->parsedContent.offline_url);
     VALIDATE(read == ctx->bufferLen, ERR_INVALID_DATA);
+    bool hasMemo = (ctx->parsedContent.memo != NULL);
+    bool hasHash = (ctx->parsedContent.hash != NULL);
+    bool hasOfflineUrl = (ctx->parsedContent.offline_url != NULL);
+    VALIDATE((hasHash && hasOfflineUrl) || (!hasHash && !hasOfflineUrl), ERR_INVALID_DATA);
 
-    if (ctx->parsedContent.memo != NULL && ctx->parsedContent.hash == NULL &&
-        ctx->parsedContent.offline_url == NULL) {
+    if (hasMemo) {
         ctx->ui_step = DECODE_RECORDOBT_MEMO_UI_STEP_MESSAGE1;
         decodeRecordobtMemo_ui_runStep();
-    } else if (ctx->parsedContent.memo == NULL && ctx->parsedContent.hash != NULL &&
-               ctx->parsedContent.offline_url != NULL) {
-        ctx->ui_step = DECODE_RECORDOBT_HASH_UI_STEP_MESSAGE1;
-        decodeRecordobtHash_ui_runStep();
-
     } else {
-        THROW(ERR_INVALID_DATA);
+        ctx->ui_step = DECODE_RECORDOBT_NO_MEMO_UI_STEP_MESSAGE1;
+        decodeRecordobtNoMemo_ui_runStep();
     }
 }
 
diff --git a/src/signTransactionParse.c b/src/signTransactionParse.c
index 29bb4177..aa71c715 100644
--- a/src/signTransactionParse.c
+++ b/src/signTransactionParse.c
@@ -86,38 +86,37 @@ static void displayASCIIStringWithLength(const uint8_t *value,
     display[strLen] = 0;
 }
 
+// helper for displayMemoHash
+static bool validateOptional(const uint8_t *value, uint8_t valueLen, uint8_t *read) {
+    VALIDATE(valueLen >= *read + 1, ERR_INVALID_DATA);
+    uint8_t hasOptional = value[*read];
+    if (hasOptional) {
+        VALIDATE(hasOptional == 1, ERR_INVALID_DATA);
+        VALIDATE(valueLen >= *read + 2, ERR_INVALID_DATA);
+        uint8_t optionalLen = value[*read + 1];
+        VALIDATE(optionalLen < 127, ERR_INVALID_DATA);
+        *read += 2 + optionalLen;
+        return true;
+    } else {
+        *read += 1;
+        return false;
+    }
+}
+
 static void displayMemoHash(const uint8_t *value,
                             uint8_t valueLen,
                             char display[MAX_DISPLAY_VALUE_LENGTH]) {
     // data format:
     // hasMemo(0x00/0x01), if yes then memolength (1b, < 127) and memo
-    // then hash and offline url in the same manner
-    // Either memo is present, or both hash and offline url.
+    // hasHash(0x00/0x01), if yes then hashlength (1b, < 127) and hash
+    // hasOfflineUrl(0x00/0x01), if yes then offlineurllength (1b, < 127) and offlineurl
+    // hash and offline url have to be present at the same time.
     TRACE_BUFFER(value, valueLen);
-    VALIDATE(valueLen >= 1, ERR_INVALID_DATA);
-    if (value[0] == 1) {  // has memo
-        VALIDATE(valueLen >= 2,
-                 ERR_INVALID_DATA);  // this also checks that memo has length at least 1
-        size_t memoLen = value[1];
-        VALIDATE(memoLen < 127, ERR_INVALID_DATA);
-        VALIDATE(valueLen == memoLen + 4,
-                 ERR_INVALID_DATA);  // has memo, memo length, memo, no hash, no url
-        VALIDATE(value[2 + memoLen] == 0, ERR_INVALID_DATA);  // no hash
-        VALIDATE(value[3 + memoLen] == 0, ERR_INVALID_DATA);  // no offline_url
-    } else if (value[0] == 0) {                               // no memo
-        TRACE("No memo");
-        VALIDATE(valueLen >= 3, ERR_INVALID_DATA);
-        VALIDATE(value[1] == 1, ERR_INVALID_DATA);  // has hash
-        size_t hashLen = value[2];
-        VALIDATE(hashLen < 127, ERR_INVALID_DATA);
-        VALIDATE(valueLen >= hashLen + 5, ERR_INVALID_DATA);
-        VALIDATE(value[hashLen + 3] == 1, ERR_INVALID_DATA);  // has url
-        size_t urlLen = value[hashLen + 4];
-        VALIDATE(urlLen < 127, ERR_INVALID_DATA);
-        VALIDATE(valueLen == hashLen + urlLen + 5, ERR_INVALID_DATA);
-    } else {
-        VALIDATE(false, ERR_INVALID_DATA);
-    }
+    uint8_t read = 0;
+    bool hasMemo = validateOptional(value, valueLen, &read);
+    bool hasHash = validateOptional(value, valueLen, &read);
+    bool hasOfflineUrl = validateOptional(value, valueLen, &read);
+    VALIDATE((hasHash && hasOfflineUrl) || (!hasHash && !hasOfflineUrl), ERR_INVALID_DATA);
     // These data are not meant to e displayed at themoement
     snprintf(display, MAX_DISPLAY_VALUE_LENGTH, "NOT IMPLEMENTED");
 }
diff --git a/test-integration/decodeMessage.js b/test-integration/decodeMessage.js
index b0da1113..0929220b 100644
--- a/test-integration/decodeMessage.js
+++ b/test-integration/decodeMessage.js
@@ -67,13 +67,23 @@ const content4 = {
 }
 
 const content5 = {
+    payee_public_address: "Payee public address",
+    amount: "Amount 100",
+    chain_code: "BTC1",
+    token_code: "BTC2",
+    memo: undefined,
+    hash: undefined,
+    offline_url: undefined,
+}
+
+const content6 = {
     payee_public_address: "Payee public address",
     amount: "Amount 100",
     chain_code: "BTC1",
     token_code: "BTC2",
     memo: "My memo",
     hash: "My hash",
-    offline_url: "Offline URL",
+    offline_url: undefined,
 }
 
 const path = [44 + HARDENED, 235 + HARDENED, 0 + HARDENED, 0, 0]
@@ -91,6 +101,7 @@ const encryptedContent2 = sharedCipher.encrypt('new_funds_content', content2)
 const encryptedContent3 = sharedCipher.encrypt('record_obt_data_content', content3)
 const encryptedContent4 = sharedCipher.encrypt('record_obt_data_content', content4)
 const encryptedContent5 = sharedCipher.encrypt('new_funds_content', content5)
+const encryptedContent6 = sharedCipher.encrypt('new_funds_content', content6)
 
 testStep(" - - -", "await app.decodeMessage() - newfundsreq memo");
 {
@@ -105,7 +116,7 @@ testStep(" - - -", "await app.decodeMessage() - newfundsreq hash");
 {
     const decodeMessagePromise = app.decodeMessage({path: path, publicKeyHex: otherPublicKey.toUncompressed().toBuffer().toString("hex"), 
                                                     message: encryptedContent2, context: "newfundsreq"});
-    await device.review([1, 1, 1, 1, 1, 1, 1, 1], "Review decode message");
+    await device.review([1, 1, 1, 1, 1, 1], "Review decode message");
     const decodeMessageResponse = await decodeMessagePromise;
     assert.equal(decodeMessageResponse.message.toString("hex"), "145061796565207075626c696320616464726573730a416d6f756e7420313030044254433104425443320001074d792068617368010b4f66666c696e652055524c")    
 }
@@ -124,15 +135,24 @@ testStep(" - - -", "await app.decodeMessage() - recordobt hash");
     console.log(encryptedContent4)
     const decodeMessagePromise = app.decodeMessage({path: path, publicKeyHex: otherPublicKey.toUncompressed().toBuffer().toString("hex"), 
                                                     message: encryptedContent4, context: "recordobt"});
-    await device.review([1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1], "Review decode message");
+    await device.review([1, 2, 1, 1, 1, 1, 1, 1, 1], "Review decode message");
     const decodeMessageResponse = await decodeMessagePromise;
     assert.equal(decodeMessageResponse.message.toString("hex"), "2d5061796572207075626c696320616464726573732069732076657279206c6f6e672c206c6f6e672c206c6f6e672d5061796565207075626c696320616464726573732069732076657279206c6f6e672c206c6f6e672c206c6f6e670a416d6f756e74203130300442544331044254433206537461747573064f62742049440001234d792068617368206973207175697465206c6f6e6720746f6f2c20746f6f2c20746f6f01224f66666c696e652055524c206973207175697465206c6f6e6720746f6f2c20746f6f")    
 }
 
-testStep(" - - -", "await app.decodeMessage() - newfundsreq invalid both memo and hash");
+testStep(" - - -", "await app.decodeMessage() - newfundsreq no memo no hash no offline url");
 {
     const decodeMessagePromise = app.decodeMessage({path: path, publicKeyHex: otherPublicKey.toUncompressed().toBuffer().toString("hex"), 
                                                     message: encryptedContent5, context: "newfundsreq"});
+    await device.review([1, 1, 1, 1, 1, 1], "Review decode message");
+    const decodeMessageResponse = await decodeMessagePromise;
+    assert.equal(decodeMessageResponse.message.toString("hex"), "145061796565207075626c696320616464726573730a416d6f756e742031303004425443310442544332000000")    
+}
+
+testStep(" - - -", "await app.decodeMessage() - newfundsreq invalid hash defined offlineurl undefined");
+{
+    const decodeMessagePromise = app.decodeMessage({path: path, publicKeyHex: otherPublicKey.toUncompressed().toBuffer().toString("hex"), 
+                                                    message: encryptedContent6, context: "newfundsreq"});
     await assert.rejects(decodeMessagePromise, DeviceStatusError); 
 }
 
diff --git a/test-integration/signTransactionNewfundsreq.js b/test-integration/signTransactionNewfundsreq.js
index 8e413b98..310d5921 100644
--- a/test-integration/signTransactionNewfundsreq.js
+++ b/test-integration/signTransactionNewfundsreq.js
@@ -156,6 +156,34 @@ const txHash = {
     }],
 }
 
+const txNothing = {
+    expiration: "2021-08-28T12:50:36.686",
+    ref_block_num: 0x1122,
+    ref_block_prefix: 0x33445566,
+    context_free_actions: [],
+    actions: [{
+        account: "fio.reqobt",
+        name: "newfundsreq",
+        authorization: [{
+            actor: "aftyershcu22",
+            permission: "active",
+        }],
+        data: {
+            payer_fio_address: "My payer address",
+            payee_fio_address:  "My payee address",
+            max_fee: 0x11223344,
+            tpid: "rewards@wallet",
+            actor: "aftyershcu22",
+
+            other_public_key: otherPublicKey.toUncompressed().toBuffer().toString("hex"),
+            payee_public_address: "My payee public address",
+            amount: "amount 1000",
+            chain_code: "BTC",
+            token_code: "BTC",
+        },
+    }],
+}
+
 //------------------- SERIALIZE TRANSACTION ------------------------------------------------
 
 async function buildTxUsingFioJs(network, tx, iv) {
@@ -277,9 +305,9 @@ testStep(" - - -", "Sign testnet transaction - hash");
     await runTxTest("TESTNET", txHash, longSequence, secondSequence)
 }
 
-testStep(" - - -", "Sign testnet mainnet - hash");
+testStep(" - - -", "Sign testnet mainnet - nothing");
 {
-    await runTxTest("MAINNET", txHash, longSequence, secondSequence)
+    await runTxTest("MAINNET", txNothing, longSequence, secondSequence)
 }
 
 await transport.close()
diff --git a/test-integration/signTransactionRecordobt.js b/test-integration/signTransactionRecordobt.js
index 1e62aa89..d56c1fb9 100644
--- a/test-integration/signTransactionRecordobt.js
+++ b/test-integration/signTransactionRecordobt.js
@@ -171,6 +171,41 @@ const txHash = {
     }],
 }
 
+const txAll = {
+    expiration: "2021-08-28T12:50:36.686",
+    ref_block_num: 0x1122,
+    ref_block_prefix: 0x33445566,
+    context_free_actions: [],
+    actions: [{
+        account: "fio.reqobt",
+        name: "recordobt",
+        authorization: [{
+            actor: "aftyershcu22",
+            permission: "active",
+        }],
+        data: {
+            fio_request_id: "",
+            payer_fio_address: "My payer address",
+            payee_fio_address:  "My payee address",
+            max_fee: 0x11223344,
+            tpid: "rewards@wallet",
+            actor: "aftyershcu22",
+
+            other_public_key: otherPublicKey.toUncompressed().toBuffer().toString("hex"),
+            payer_public_address: "My payer public address",
+            payee_public_address: "My payee public address",
+            amount: "amount 1000",
+            chain_code: "BTC",
+            token_code: "BTC",
+            status: "status",
+            obt_id: "obt ID",
+            memo: "I have memo",
+            hash: "I have hash",
+            offline_url: "I have url",
+        },
+    }],
+}
+
 //------------------- SERIALIZE TRANSACTION ------------------------------------------------
 
 async function buildTxUsingFioJs(network, tx, iv) {
@@ -295,7 +330,7 @@ testStep(" - - -", "Sign testnet mainnet - memo");
 
 testStep(" - - -", "Sign testnet transaction - hash");
 {
-    await runTxTest("TESTNET", txHash, longSequenceHash, secondSequence)
+    await runTxTest("TESTNET", txAll, longSequenceHash, secondSequence)
 }
 
 testStep(" - - -", "Sign testnet mainnet - hash");
diff --git a/test-integration/snapshots/decodeMessage/nanos.01.png b/test-integration/snapshots/decodeMessage/nanos.01.png
index a0f9b734..0b823004 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.01.png and b/test-integration/snapshots/decodeMessage/nanos.01.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.10.png b/test-integration/snapshots/decodeMessage/nanos.10.png
index a0f9b734..0b823004 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.10.png and b/test-integration/snapshots/decodeMessage/nanos.10.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.17.png b/test-integration/snapshots/decodeMessage/nanos.17.png
index 10c21272..8d806ca2 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.17.png and b/test-integration/snapshots/decodeMessage/nanos.17.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.18.png b/test-integration/snapshots/decodeMessage/nanos.18.png
index 22b41df9..0b823004 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.18.png and b/test-integration/snapshots/decodeMessage/nanos.18.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.19.png b/test-integration/snapshots/decodeMessage/nanos.19.png
index 8d806ca2..4a84ea79 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.19.png and b/test-integration/snapshots/decodeMessage/nanos.19.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.20.png b/test-integration/snapshots/decodeMessage/nanos.20.png
index a0f9b734..20641a16 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.20.png and b/test-integration/snapshots/decodeMessage/nanos.20.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.21.png b/test-integration/snapshots/decodeMessage/nanos.21.png
index 4a84ea79..7cbf9471 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.21.png and b/test-integration/snapshots/decodeMessage/nanos.21.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.22.png b/test-integration/snapshots/decodeMessage/nanos.22.png
index 20641a16..f855df8f 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.22.png and b/test-integration/snapshots/decodeMessage/nanos.22.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.23.png b/test-integration/snapshots/decodeMessage/nanos.23.png
index 7cbf9471..e4da8444 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.23.png and b/test-integration/snapshots/decodeMessage/nanos.23.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.24.png b/test-integration/snapshots/decodeMessage/nanos.24.png
index f855df8f..355c272a 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.24.png and b/test-integration/snapshots/decodeMessage/nanos.24.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.25.png b/test-integration/snapshots/decodeMessage/nanos.25.png
index e4da8444..e3087cbe 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.25.png and b/test-integration/snapshots/decodeMessage/nanos.25.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.26.png b/test-integration/snapshots/decodeMessage/nanos.26.png
index 355c272a..47045550 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.26.png and b/test-integration/snapshots/decodeMessage/nanos.26.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.27.png b/test-integration/snapshots/decodeMessage/nanos.27.png
index e3087cbe..4622c002 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.27.png and b/test-integration/snapshots/decodeMessage/nanos.27.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.28.png b/test-integration/snapshots/decodeMessage/nanos.28.png
index 47045550..0a6229c9 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.28.png and b/test-integration/snapshots/decodeMessage/nanos.28.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.29.png b/test-integration/snapshots/decodeMessage/nanos.29.png
index 4622c002..8d806ca2 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.29.png and b/test-integration/snapshots/decodeMessage/nanos.29.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.30.png b/test-integration/snapshots/decodeMessage/nanos.30.png
index 0a6229c9..0b823004 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.30.png and b/test-integration/snapshots/decodeMessage/nanos.30.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.31.png b/test-integration/snapshots/decodeMessage/nanos.31.png
index 8d806ca2..4a84ea79 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.31.png and b/test-integration/snapshots/decodeMessage/nanos.31.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.32.png b/test-integration/snapshots/decodeMessage/nanos.32.png
index a0f9b734..20641a16 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.32.png and b/test-integration/snapshots/decodeMessage/nanos.32.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.33.png b/test-integration/snapshots/decodeMessage/nanos.33.png
index 4a84ea79..7cbf9471 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.33.png and b/test-integration/snapshots/decodeMessage/nanos.33.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.34.png b/test-integration/snapshots/decodeMessage/nanos.34.png
index 20641a16..f855df8f 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.34.png and b/test-integration/snapshots/decodeMessage/nanos.34.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.35.png b/test-integration/snapshots/decodeMessage/nanos.35.png
index 7cbf9471..e4da8444 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.35.png and b/test-integration/snapshots/decodeMessage/nanos.35.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.36.png b/test-integration/snapshots/decodeMessage/nanos.36.png
index f855df8f..355c272a 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.36.png and b/test-integration/snapshots/decodeMessage/nanos.36.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.37.png b/test-integration/snapshots/decodeMessage/nanos.37.png
index e4da8444..e3087cbe 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.37.png and b/test-integration/snapshots/decodeMessage/nanos.37.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.38.png b/test-integration/snapshots/decodeMessage/nanos.38.png
index 355c272a..47045550 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.38.png and b/test-integration/snapshots/decodeMessage/nanos.38.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.39.png b/test-integration/snapshots/decodeMessage/nanos.39.png
index e3087cbe..4622c002 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.39.png and b/test-integration/snapshots/decodeMessage/nanos.39.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.40.png b/test-integration/snapshots/decodeMessage/nanos.40.png
index 47045550..8d806ca2 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.40.png and b/test-integration/snapshots/decodeMessage/nanos.40.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.41.png b/test-integration/snapshots/decodeMessage/nanos.41.png
index 4622c002..0b823004 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.41.png and b/test-integration/snapshots/decodeMessage/nanos.41.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.42.png b/test-integration/snapshots/decodeMessage/nanos.42.png
index 066aed0d..4a84ea79 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.42.png and b/test-integration/snapshots/decodeMessage/nanos.42.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.43.png b/test-integration/snapshots/decodeMessage/nanos.43.png
index e55ef587..20641a16 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.43.png and b/test-integration/snapshots/decodeMessage/nanos.43.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.44.png b/test-integration/snapshots/decodeMessage/nanos.44.png
index 8d806ca2..7cbf9471 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.44.png and b/test-integration/snapshots/decodeMessage/nanos.44.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.45.png b/test-integration/snapshots/decodeMessage/nanos.45.png
index a0f9b734..e4da8444 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.45.png and b/test-integration/snapshots/decodeMessage/nanos.45.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.46.png b/test-integration/snapshots/decodeMessage/nanos.46.png
index 4a84ea79..355c272a 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.46.png and b/test-integration/snapshots/decodeMessage/nanos.46.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.47.png b/test-integration/snapshots/decodeMessage/nanos.47.png
index 20641a16..e3087cbe 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.47.png and b/test-integration/snapshots/decodeMessage/nanos.47.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.48.png b/test-integration/snapshots/decodeMessage/nanos.48.png
index 7cbf9471..8d806ca2 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.48.png and b/test-integration/snapshots/decodeMessage/nanos.48.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.49.png b/test-integration/snapshots/decodeMessage/nanos.49.png
index e4da8444..0b823004 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.49.png and b/test-integration/snapshots/decodeMessage/nanos.49.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.50.png b/test-integration/snapshots/decodeMessage/nanos.50.png
index 355c272a..4a84ea79 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.50.png and b/test-integration/snapshots/decodeMessage/nanos.50.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.51.png b/test-integration/snapshots/decodeMessage/nanos.51.png
index e3087cbe..20641a16 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.51.png and b/test-integration/snapshots/decodeMessage/nanos.51.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.52.png b/test-integration/snapshots/decodeMessage/nanos.52.png
index 0a6229c9..7cbf9471 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.52.png and b/test-integration/snapshots/decodeMessage/nanos.52.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.53.png b/test-integration/snapshots/decodeMessage/nanos.53.png
index 8d806ca2..e4da8444 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.53.png and b/test-integration/snapshots/decodeMessage/nanos.53.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.54.png b/test-integration/snapshots/decodeMessage/nanos.54.png
index a0f9b734..355c272a 100644
Binary files a/test-integration/snapshots/decodeMessage/nanos.54.png and b/test-integration/snapshots/decodeMessage/nanos.54.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.55.png b/test-integration/snapshots/decodeMessage/nanos.55.png
new file mode 100644
index 00000000..e3087cbe
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanos.55.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.56.png b/test-integration/snapshots/decodeMessage/nanos.56.png
new file mode 100644
index 00000000..0a6229c9
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanos.56.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.57.png b/test-integration/snapshots/decodeMessage/nanos.57.png
new file mode 100644
index 00000000..8d806ca2
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanos.57.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanos.58.png b/test-integration/snapshots/decodeMessage/nanos.58.png
new file mode 100644
index 00000000..0b823004
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanos.58.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.01.png b/test-integration/snapshots/decodeMessage/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.01.png and b/test-integration/snapshots/decodeMessage/nanosp.01.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.02.png b/test-integration/snapshots/decodeMessage/nanosp.02.png
index d2f0dd67..89232403 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.02.png and b/test-integration/snapshots/decodeMessage/nanosp.02.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.03.png b/test-integration/snapshots/decodeMessage/nanosp.03.png
index a1a25bcc..a64aac08 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.03.png and b/test-integration/snapshots/decodeMessage/nanosp.03.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.04.png b/test-integration/snapshots/decodeMessage/nanosp.04.png
index 1c8a714f..dbe6f3f7 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.04.png and b/test-integration/snapshots/decodeMessage/nanosp.04.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.05.png b/test-integration/snapshots/decodeMessage/nanosp.05.png
index 14b19bdf..94384bb3 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.05.png and b/test-integration/snapshots/decodeMessage/nanosp.05.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.10.png b/test-integration/snapshots/decodeMessage/nanosp.10.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.10.png and b/test-integration/snapshots/decodeMessage/nanosp.10.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.11.png b/test-integration/snapshots/decodeMessage/nanosp.11.png
index d2f0dd67..89232403 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.11.png and b/test-integration/snapshots/decodeMessage/nanosp.11.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.12.png b/test-integration/snapshots/decodeMessage/nanosp.12.png
index a1a25bcc..a64aac08 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.12.png and b/test-integration/snapshots/decodeMessage/nanosp.12.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.13.png b/test-integration/snapshots/decodeMessage/nanosp.13.png
index 1c8a714f..dbe6f3f7 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.13.png and b/test-integration/snapshots/decodeMessage/nanosp.13.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.14.png b/test-integration/snapshots/decodeMessage/nanosp.14.png
index 14b19bdf..94384bb3 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.14.png and b/test-integration/snapshots/decodeMessage/nanosp.14.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.17.png b/test-integration/snapshots/decodeMessage/nanosp.17.png
index 5854c8c5..0966b381 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.17.png and b/test-integration/snapshots/decodeMessage/nanosp.17.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.18.png b/test-integration/snapshots/decodeMessage/nanosp.18.png
index 8ffe94b0..c843773c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.18.png and b/test-integration/snapshots/decodeMessage/nanosp.18.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.19.png b/test-integration/snapshots/decodeMessage/nanosp.19.png
index 0966b381..89232403 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.19.png and b/test-integration/snapshots/decodeMessage/nanosp.19.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.20.png b/test-integration/snapshots/decodeMessage/nanosp.20.png
index a7a87405..eb63da2d 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.20.png and b/test-integration/snapshots/decodeMessage/nanosp.20.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.21.png b/test-integration/snapshots/decodeMessage/nanosp.21.png
index d2f0dd67..5d91b1e4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.21.png and b/test-integration/snapshots/decodeMessage/nanosp.21.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.22.png b/test-integration/snapshots/decodeMessage/nanosp.22.png
index 63ca3308..dbe6f3f7 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.22.png and b/test-integration/snapshots/decodeMessage/nanosp.22.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.23.png b/test-integration/snapshots/decodeMessage/nanosp.23.png
index 6f75fc20..a27c581c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.23.png and b/test-integration/snapshots/decodeMessage/nanosp.23.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.24.png b/test-integration/snapshots/decodeMessage/nanosp.24.png
index 1c8a714f..94384bb3 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.24.png and b/test-integration/snapshots/decodeMessage/nanosp.24.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.25.png b/test-integration/snapshots/decodeMessage/nanosp.25.png
index 50781aad..e23183a4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.25.png and b/test-integration/snapshots/decodeMessage/nanosp.25.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.26.png b/test-integration/snapshots/decodeMessage/nanosp.26.png
index 14b19bdf..56eff548 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.26.png and b/test-integration/snapshots/decodeMessage/nanosp.26.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.27.png b/test-integration/snapshots/decodeMessage/nanosp.27.png
index e23183a4..9fbc447c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.27.png and b/test-integration/snapshots/decodeMessage/nanosp.27.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.28.png b/test-integration/snapshots/decodeMessage/nanosp.28.png
index 56eff548..dc6bcf5b 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.28.png and b/test-integration/snapshots/decodeMessage/nanosp.28.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.29.png b/test-integration/snapshots/decodeMessage/nanosp.29.png
index 9fbc447c..8a50d7e0 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.29.png and b/test-integration/snapshots/decodeMessage/nanosp.29.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.30.png b/test-integration/snapshots/decodeMessage/nanosp.30.png
index 6fb64278..0966b381 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.30.png and b/test-integration/snapshots/decodeMessage/nanosp.30.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.31.png b/test-integration/snapshots/decodeMessage/nanosp.31.png
index 8a50d7e0..c843773c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.31.png and b/test-integration/snapshots/decodeMessage/nanosp.31.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.32.png b/test-integration/snapshots/decodeMessage/nanosp.32.png
index 0966b381..89232403 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.32.png and b/test-integration/snapshots/decodeMessage/nanosp.32.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.33.png b/test-integration/snapshots/decodeMessage/nanosp.33.png
index a7a87405..eb63da2d 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.33.png and b/test-integration/snapshots/decodeMessage/nanosp.33.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.34.png b/test-integration/snapshots/decodeMessage/nanosp.34.png
index d2f0dd67..5d91b1e4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.34.png and b/test-integration/snapshots/decodeMessage/nanosp.34.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.35.png b/test-integration/snapshots/decodeMessage/nanosp.35.png
index 63ca3308..7624fa47 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.35.png and b/test-integration/snapshots/decodeMessage/nanosp.35.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.36.png b/test-integration/snapshots/decodeMessage/nanosp.36.png
index 6f75fc20..759abef5 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.36.png and b/test-integration/snapshots/decodeMessage/nanosp.36.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.37.png b/test-integration/snapshots/decodeMessage/nanosp.37.png
index 8b705272..94384bb3 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.37.png and b/test-integration/snapshots/decodeMessage/nanosp.37.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.38.png b/test-integration/snapshots/decodeMessage/nanosp.38.png
index 05aa18f8..e23183a4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.38.png and b/test-integration/snapshots/decodeMessage/nanosp.38.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.39.png b/test-integration/snapshots/decodeMessage/nanosp.39.png
index 14b19bdf..56eff548 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.39.png and b/test-integration/snapshots/decodeMessage/nanosp.39.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.40.png b/test-integration/snapshots/decodeMessage/nanosp.40.png
index e23183a4..9fbc447c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.40.png and b/test-integration/snapshots/decodeMessage/nanosp.40.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.41.png b/test-integration/snapshots/decodeMessage/nanosp.41.png
index 56eff548..dc6bcf5b 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.41.png and b/test-integration/snapshots/decodeMessage/nanosp.41.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.42.png b/test-integration/snapshots/decodeMessage/nanosp.42.png
index 9fbc447c..0966b381 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.42.png and b/test-integration/snapshots/decodeMessage/nanosp.42.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.43.png b/test-integration/snapshots/decodeMessage/nanosp.43.png
index 6fb64278..c843773c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.43.png and b/test-integration/snapshots/decodeMessage/nanosp.43.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.44.png b/test-integration/snapshots/decodeMessage/nanosp.44.png
index 5a9a698b..89232403 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.44.png and b/test-integration/snapshots/decodeMessage/nanosp.44.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.45.png b/test-integration/snapshots/decodeMessage/nanosp.45.png
index 0f9f76e5..a64aac08 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.45.png and b/test-integration/snapshots/decodeMessage/nanosp.45.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.46.png b/test-integration/snapshots/decodeMessage/nanosp.46.png
index 0966b381..dbe6f3f7 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.46.png and b/test-integration/snapshots/decodeMessage/nanosp.46.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.47.png b/test-integration/snapshots/decodeMessage/nanosp.47.png
index a7a87405..94384bb3 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.47.png and b/test-integration/snapshots/decodeMessage/nanosp.47.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.48.png b/test-integration/snapshots/decodeMessage/nanosp.48.png
index d2f0dd67..e23183a4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.48.png and b/test-integration/snapshots/decodeMessage/nanosp.48.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.49.png b/test-integration/snapshots/decodeMessage/nanosp.49.png
index a1a25bcc..56eff548 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.49.png and b/test-integration/snapshots/decodeMessage/nanosp.49.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.50.png b/test-integration/snapshots/decodeMessage/nanosp.50.png
index 1c8a714f..0966b381 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.50.png and b/test-integration/snapshots/decodeMessage/nanosp.50.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.51.png b/test-integration/snapshots/decodeMessage/nanosp.51.png
index 14b19bdf..c843773c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.51.png and b/test-integration/snapshots/decodeMessage/nanosp.51.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.52.png b/test-integration/snapshots/decodeMessage/nanosp.52.png
index e23183a4..89232403 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.52.png and b/test-integration/snapshots/decodeMessage/nanosp.52.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.53.png b/test-integration/snapshots/decodeMessage/nanosp.53.png
index 56eff548..a64aac08 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.53.png and b/test-integration/snapshots/decodeMessage/nanosp.53.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.54.png b/test-integration/snapshots/decodeMessage/nanosp.54.png
index 8a50d7e0..dbe6f3f7 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.54.png and b/test-integration/snapshots/decodeMessage/nanosp.54.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.55.png b/test-integration/snapshots/decodeMessage/nanosp.55.png
index 0966b381..94384bb3 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.55.png and b/test-integration/snapshots/decodeMessage/nanosp.55.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.56.png b/test-integration/snapshots/decodeMessage/nanosp.56.png
index cbdc0a71..e23183a4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.56.png and b/test-integration/snapshots/decodeMessage/nanosp.56.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.57.png b/test-integration/snapshots/decodeMessage/nanosp.57.png
index a7a87405..56eff548 100644
Binary files a/test-integration/snapshots/decodeMessage/nanosp.57.png and b/test-integration/snapshots/decodeMessage/nanosp.57.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.58.png b/test-integration/snapshots/decodeMessage/nanosp.58.png
new file mode 100644
index 00000000..8a50d7e0
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanosp.58.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.59.png b/test-integration/snapshots/decodeMessage/nanosp.59.png
new file mode 100644
index 00000000..0966b381
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanosp.59.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.60.png b/test-integration/snapshots/decodeMessage/nanosp.60.png
new file mode 100644
index 00000000..348d43dc
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanosp.60.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanosp.61.png b/test-integration/snapshots/decodeMessage/nanosp.61.png
new file mode 100644
index 00000000..c843773c
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanosp.61.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.17.png b/test-integration/snapshots/decodeMessage/nanox.17.png
index 5854c8c5..0966b381 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.17.png and b/test-integration/snapshots/decodeMessage/nanox.17.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.18.png b/test-integration/snapshots/decodeMessage/nanox.18.png
index 8ffe94b0..c843773c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.18.png and b/test-integration/snapshots/decodeMessage/nanox.18.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.19.png b/test-integration/snapshots/decodeMessage/nanox.19.png
index 0966b381..89232403 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.19.png and b/test-integration/snapshots/decodeMessage/nanox.19.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.20.png b/test-integration/snapshots/decodeMessage/nanox.20.png
index c843773c..eb63da2d 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.20.png and b/test-integration/snapshots/decodeMessage/nanox.20.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.21.png b/test-integration/snapshots/decodeMessage/nanox.21.png
index 89232403..5d91b1e4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.21.png and b/test-integration/snapshots/decodeMessage/nanox.21.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.22.png b/test-integration/snapshots/decodeMessage/nanox.22.png
index eb63da2d..dbe6f3f7 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.22.png and b/test-integration/snapshots/decodeMessage/nanox.22.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.23.png b/test-integration/snapshots/decodeMessage/nanox.23.png
index 5d91b1e4..a27c581c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.23.png and b/test-integration/snapshots/decodeMessage/nanox.23.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.24.png b/test-integration/snapshots/decodeMessage/nanox.24.png
index dbe6f3f7..94384bb3 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.24.png and b/test-integration/snapshots/decodeMessage/nanox.24.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.25.png b/test-integration/snapshots/decodeMessage/nanox.25.png
index a27c581c..e23183a4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.25.png and b/test-integration/snapshots/decodeMessage/nanox.25.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.26.png b/test-integration/snapshots/decodeMessage/nanox.26.png
index 94384bb3..56eff548 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.26.png and b/test-integration/snapshots/decodeMessage/nanox.26.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.27.png b/test-integration/snapshots/decodeMessage/nanox.27.png
index e23183a4..9fbc447c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.27.png and b/test-integration/snapshots/decodeMessage/nanox.27.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.28.png b/test-integration/snapshots/decodeMessage/nanox.28.png
index 56eff548..dc6bcf5b 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.28.png and b/test-integration/snapshots/decodeMessage/nanox.28.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.29.png b/test-integration/snapshots/decodeMessage/nanox.29.png
index 9fbc447c..8a50d7e0 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.29.png and b/test-integration/snapshots/decodeMessage/nanox.29.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.30.png b/test-integration/snapshots/decodeMessage/nanox.30.png
index dc6bcf5b..0966b381 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.30.png and b/test-integration/snapshots/decodeMessage/nanox.30.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.31.png b/test-integration/snapshots/decodeMessage/nanox.31.png
index 8a50d7e0..c843773c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.31.png and b/test-integration/snapshots/decodeMessage/nanox.31.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.32.png b/test-integration/snapshots/decodeMessage/nanox.32.png
index 0966b381..89232403 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.32.png and b/test-integration/snapshots/decodeMessage/nanox.32.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.33.png b/test-integration/snapshots/decodeMessage/nanox.33.png
index c843773c..eb63da2d 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.33.png and b/test-integration/snapshots/decodeMessage/nanox.33.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.34.png b/test-integration/snapshots/decodeMessage/nanox.34.png
index 89232403..5d91b1e4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.34.png and b/test-integration/snapshots/decodeMessage/nanox.34.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.35.png b/test-integration/snapshots/decodeMessage/nanox.35.png
index eb63da2d..7624fa47 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.35.png and b/test-integration/snapshots/decodeMessage/nanox.35.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.36.png b/test-integration/snapshots/decodeMessage/nanox.36.png
index 5d91b1e4..759abef5 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.36.png and b/test-integration/snapshots/decodeMessage/nanox.36.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.37.png b/test-integration/snapshots/decodeMessage/nanox.37.png
index 7624fa47..94384bb3 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.37.png and b/test-integration/snapshots/decodeMessage/nanox.37.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.38.png b/test-integration/snapshots/decodeMessage/nanox.38.png
index 759abef5..e23183a4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.38.png and b/test-integration/snapshots/decodeMessage/nanox.38.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.39.png b/test-integration/snapshots/decodeMessage/nanox.39.png
index 94384bb3..56eff548 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.39.png and b/test-integration/snapshots/decodeMessage/nanox.39.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.40.png b/test-integration/snapshots/decodeMessage/nanox.40.png
index e23183a4..9fbc447c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.40.png and b/test-integration/snapshots/decodeMessage/nanox.40.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.41.png b/test-integration/snapshots/decodeMessage/nanox.41.png
index 56eff548..dc6bcf5b 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.41.png and b/test-integration/snapshots/decodeMessage/nanox.41.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.42.png b/test-integration/snapshots/decodeMessage/nanox.42.png
index 9fbc447c..0966b381 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.42.png and b/test-integration/snapshots/decodeMessage/nanox.42.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.43.png b/test-integration/snapshots/decodeMessage/nanox.43.png
index dc6bcf5b..c843773c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.43.png and b/test-integration/snapshots/decodeMessage/nanox.43.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.44.png b/test-integration/snapshots/decodeMessage/nanox.44.png
index d9bc6a61..89232403 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.44.png and b/test-integration/snapshots/decodeMessage/nanox.44.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.45.png b/test-integration/snapshots/decodeMessage/nanox.45.png
index ae332bd6..a64aac08 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.45.png and b/test-integration/snapshots/decodeMessage/nanox.45.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.46.png b/test-integration/snapshots/decodeMessage/nanox.46.png
index 0966b381..dbe6f3f7 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.46.png and b/test-integration/snapshots/decodeMessage/nanox.46.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.47.png b/test-integration/snapshots/decodeMessage/nanox.47.png
index c843773c..94384bb3 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.47.png and b/test-integration/snapshots/decodeMessage/nanox.47.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.48.png b/test-integration/snapshots/decodeMessage/nanox.48.png
index 89232403..e23183a4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.48.png and b/test-integration/snapshots/decodeMessage/nanox.48.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.49.png b/test-integration/snapshots/decodeMessage/nanox.49.png
index a64aac08..56eff548 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.49.png and b/test-integration/snapshots/decodeMessage/nanox.49.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.50.png b/test-integration/snapshots/decodeMessage/nanox.50.png
index dbe6f3f7..0966b381 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.50.png and b/test-integration/snapshots/decodeMessage/nanox.50.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.51.png b/test-integration/snapshots/decodeMessage/nanox.51.png
index 94384bb3..c843773c 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.51.png and b/test-integration/snapshots/decodeMessage/nanox.51.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.52.png b/test-integration/snapshots/decodeMessage/nanox.52.png
index e23183a4..89232403 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.52.png and b/test-integration/snapshots/decodeMessage/nanox.52.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.53.png b/test-integration/snapshots/decodeMessage/nanox.53.png
index 56eff548..a64aac08 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.53.png and b/test-integration/snapshots/decodeMessage/nanox.53.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.54.png b/test-integration/snapshots/decodeMessage/nanox.54.png
index 8a50d7e0..dbe6f3f7 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.54.png and b/test-integration/snapshots/decodeMessage/nanox.54.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.55.png b/test-integration/snapshots/decodeMessage/nanox.55.png
index 0966b381..94384bb3 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.55.png and b/test-integration/snapshots/decodeMessage/nanox.55.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.56.png b/test-integration/snapshots/decodeMessage/nanox.56.png
index 348d43dc..e23183a4 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.56.png and b/test-integration/snapshots/decodeMessage/nanox.56.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.57.png b/test-integration/snapshots/decodeMessage/nanox.57.png
index c843773c..56eff548 100644
Binary files a/test-integration/snapshots/decodeMessage/nanox.57.png and b/test-integration/snapshots/decodeMessage/nanox.57.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.58.png b/test-integration/snapshots/decodeMessage/nanox.58.png
new file mode 100644
index 00000000..8a50d7e0
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanox.58.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.59.png b/test-integration/snapshots/decodeMessage/nanox.59.png
new file mode 100644
index 00000000..0966b381
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanox.59.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.60.png b/test-integration/snapshots/decodeMessage/nanox.60.png
new file mode 100644
index 00000000..348d43dc
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanox.60.png differ
diff --git a/test-integration/snapshots/decodeMessage/nanox.61.png b/test-integration/snapshots/decodeMessage/nanox.61.png
new file mode 100644
index 00000000..c843773c
Binary files /dev/null and b/test-integration/snapshots/decodeMessage/nanox.61.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.01.png b/test-integration/snapshots/getPublicKey/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.01.png and b/test-integration/snapshots/getPublicKey/nanosp.01.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.02.png b/test-integration/snapshots/getPublicKey/nanosp.02.png
index 8ec94d88..8a51e7d7 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.02.png and b/test-integration/snapshots/getPublicKey/nanosp.02.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.03.png b/test-integration/snapshots/getPublicKey/nanosp.03.png
index 50907ccb..411eb315 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.03.png and b/test-integration/snapshots/getPublicKey/nanosp.03.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.04.png b/test-integration/snapshots/getPublicKey/nanosp.04.png
index 09ddad6f..936a20ed 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.04.png and b/test-integration/snapshots/getPublicKey/nanosp.04.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.05.png b/test-integration/snapshots/getPublicKey/nanosp.05.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.05.png and b/test-integration/snapshots/getPublicKey/nanosp.05.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.06.png b/test-integration/snapshots/getPublicKey/nanosp.06.png
index 8ec94d88..8a51e7d7 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.06.png and b/test-integration/snapshots/getPublicKey/nanosp.06.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.07.png b/test-integration/snapshots/getPublicKey/nanosp.07.png
index 50907ccb..411eb315 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.07.png and b/test-integration/snapshots/getPublicKey/nanosp.07.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.08.png b/test-integration/snapshots/getPublicKey/nanosp.08.png
index 09ddad6f..936a20ed 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.08.png and b/test-integration/snapshots/getPublicKey/nanosp.08.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.09.png b/test-integration/snapshots/getPublicKey/nanosp.09.png
index cbdc0a71..348d43dc 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.09.png and b/test-integration/snapshots/getPublicKey/nanosp.09.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.10.png b/test-integration/snapshots/getPublicKey/nanosp.10.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.10.png and b/test-integration/snapshots/getPublicKey/nanosp.10.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.12.png b/test-integration/snapshots/getPublicKey/nanosp.12.png
index 93dcd8f2..81d7ae04 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.12.png and b/test-integration/snapshots/getPublicKey/nanosp.12.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.13.png b/test-integration/snapshots/getPublicKey/nanosp.13.png
index d83595e4..da1533ee 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.13.png and b/test-integration/snapshots/getPublicKey/nanosp.13.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.14.png b/test-integration/snapshots/getPublicKey/nanosp.14.png
index 759123d3..7c6e3c34 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.14.png and b/test-integration/snapshots/getPublicKey/nanosp.14.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.15.png b/test-integration/snapshots/getPublicKey/nanosp.15.png
index 09ddad6f..936a20ed 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.15.png and b/test-integration/snapshots/getPublicKey/nanosp.15.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.16.png b/test-integration/snapshots/getPublicKey/nanosp.16.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.16.png and b/test-integration/snapshots/getPublicKey/nanosp.16.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.18.png b/test-integration/snapshots/getPublicKey/nanosp.18.png
index 93dcd8f2..81d7ae04 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.18.png and b/test-integration/snapshots/getPublicKey/nanosp.18.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.19.png b/test-integration/snapshots/getPublicKey/nanosp.19.png
index d83595e4..da1533ee 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.19.png and b/test-integration/snapshots/getPublicKey/nanosp.19.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.20.png b/test-integration/snapshots/getPublicKey/nanosp.20.png
index 759123d3..7c6e3c34 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.20.png and b/test-integration/snapshots/getPublicKey/nanosp.20.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.21.png b/test-integration/snapshots/getPublicKey/nanosp.21.png
index 09ddad6f..936a20ed 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.21.png and b/test-integration/snapshots/getPublicKey/nanosp.21.png differ
diff --git a/test-integration/snapshots/getPublicKey/nanosp.22.png b/test-integration/snapshots/getPublicKey/nanosp.22.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/getPublicKey/nanosp.22.png and b/test-integration/snapshots/getPublicKey/nanosp.22.png differ
diff --git a/test-integration/snapshots/getSerial/nanosp.01.png b/test-integration/snapshots/getSerial/nanosp.01.png
index a7a87405..6f674cef 100644
Binary files a/test-integration/snapshots/getSerial/nanosp.01.png and b/test-integration/snapshots/getSerial/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.01.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.01.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.03.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.03.png
index 4b5bc3ab..7d8c81e3 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.03.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.03.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.04.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.04.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.04.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.04.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.05.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.05.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.05.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.05.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.06.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.06.png
index 07574cbb..335e8e79 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.06.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.06.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.08.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.08.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.08.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.09.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.09.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.09.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.09.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.10.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.10.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.10.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.10.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.11.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.11.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.11.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.11.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.13.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.13.png
index 4b5bc3ab..7d8c81e3 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.13.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.13.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.14.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.14.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.14.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.14.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.15.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.15.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.15.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.15.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.16.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.16.png
index 07574cbb..335e8e79 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.16.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.16.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.17.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.17.png
index 7de90fc3..3898b521 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.17.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.17.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.19.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.19.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.19.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.19.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.20.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.20.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.20.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.20.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.21.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.21.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.21.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.21.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.22.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.22.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.22.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.22.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.24.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.24.png
index 4b5bc3ab..7d8c81e3 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.24.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.24.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.25.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.25.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.25.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.25.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.26.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.26.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.26.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.26.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.27.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.27.png
index 07574cbb..335e8e79 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.27.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.27.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.28.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.28.png
index 6f2ed5c1..06cd83b0 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.28.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.28.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.29.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.29.png
index 9dd74af9..997b97fb 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.29.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.29.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.31.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.31.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.31.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.31.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.32.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.32.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.32.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.32.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.33.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.33.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.33.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.33.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.34.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.34.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.34.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.34.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.36.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.36.png
index 4b5bc3ab..7d8c81e3 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.36.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.36.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.37.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.37.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.37.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.37.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.38.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.38.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.38.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.38.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.39.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.39.png
index 07574cbb..335e8e79 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.39.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.39.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.40.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.40.png
index 5ebc4ffd..24d42318 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.40.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.40.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.41.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.41.png
index 9dd74af9..997b97fb 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.41.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.41.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.42.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.42.png
index 85bc4b28..8325832e 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.42.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.42.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.44.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.44.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.44.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.44.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.45.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.45.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.45.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.45.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.46.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.46.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.46.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.46.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.47.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.47.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.47.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.47.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.49.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.49.png
index 4b5bc3ab..7d8c81e3 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.49.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.49.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.50.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.50.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.50.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.50.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.51.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.51.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.51.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.51.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.52.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.52.png
index 07574cbb..335e8e79 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.52.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.52.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.53.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.53.png
index 5ebc4ffd..24d42318 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.53.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.53.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.54.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.54.png
index 9dd74af9..997b97fb 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.54.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.54.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.55.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.55.png
index 85bc4b28..8325832e 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.55.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.55.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.56.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.56.png
index 57361d73..73150ce0 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.56.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.56.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.58.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.58.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.58.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.58.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.59.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.59.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.59.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.59.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.60.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.60.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.60.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.60.png differ
diff --git a/test-integration/snapshots/signTransactionAddaddress/nanosp.61.png b/test-integration/snapshots/signTransactionAddaddress/nanosp.61.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionAddaddress/nanosp.61.png and b/test-integration/snapshots/signTransactionAddaddress/nanosp.61.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.01.png b/test-integration/snapshots/signTransactionAddnft/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.01.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.04.png b/test-integration/snapshots/signTransactionAddnft/nanosp.04.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.04.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.04.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.05.png b/test-integration/snapshots/signTransactionAddnft/nanosp.05.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.05.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.05.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.06.png b/test-integration/snapshots/signTransactionAddnft/nanosp.06.png
index 3a4a3270..272e4d1b 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.06.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.06.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.08.png b/test-integration/snapshots/signTransactionAddnft/nanosp.08.png
index 928e1056..2f9e9a54 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.08.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.11.png b/test-integration/snapshots/signTransactionAddnft/nanosp.11.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.11.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.11.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.12.png b/test-integration/snapshots/signTransactionAddnft/nanosp.12.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.12.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.12.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.13.png b/test-integration/snapshots/signTransactionAddnft/nanosp.13.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.13.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.13.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.14.png b/test-integration/snapshots/signTransactionAddnft/nanosp.14.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.14.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.14.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.17.png b/test-integration/snapshots/signTransactionAddnft/nanosp.17.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.17.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.17.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.18.png b/test-integration/snapshots/signTransactionAddnft/nanosp.18.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.18.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.18.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.19.png b/test-integration/snapshots/signTransactionAddnft/nanosp.19.png
index 3a4a3270..272e4d1b 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.19.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.19.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.21.png b/test-integration/snapshots/signTransactionAddnft/nanosp.21.png
index 928e1056..2f9e9a54 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.21.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.21.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.23.png b/test-integration/snapshots/signTransactionAddnft/nanosp.23.png
index bbcd093d..c52915e3 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.23.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.23.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.25.png b/test-integration/snapshots/signTransactionAddnft/nanosp.25.png
index e17bdfa9..9b9ae3db 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.25.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.25.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.28.png b/test-integration/snapshots/signTransactionAddnft/nanosp.28.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.28.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.28.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.29.png b/test-integration/snapshots/signTransactionAddnft/nanosp.29.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.29.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.29.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.30.png b/test-integration/snapshots/signTransactionAddnft/nanosp.30.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.30.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.30.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.31.png b/test-integration/snapshots/signTransactionAddnft/nanosp.31.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.31.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.31.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.34.png b/test-integration/snapshots/signTransactionAddnft/nanosp.34.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.34.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.34.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.35.png b/test-integration/snapshots/signTransactionAddnft/nanosp.35.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.35.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.35.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.36.png b/test-integration/snapshots/signTransactionAddnft/nanosp.36.png
index 3a4a3270..272e4d1b 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.36.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.36.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.38.png b/test-integration/snapshots/signTransactionAddnft/nanosp.38.png
index 928e1056..2f9e9a54 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.38.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.38.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.40.png b/test-integration/snapshots/signTransactionAddnft/nanosp.40.png
index bbcd093d..c52915e3 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.40.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.40.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.42.png b/test-integration/snapshots/signTransactionAddnft/nanosp.42.png
index e17bdfa9..9b9ae3db 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.42.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.42.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.44.png b/test-integration/snapshots/signTransactionAddnft/nanosp.44.png
index ca5570e4..b1caf4f0 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.44.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.44.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.46.png b/test-integration/snapshots/signTransactionAddnft/nanosp.46.png
index dbef48d4..94c5ed4a 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.46.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.46.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.47.png b/test-integration/snapshots/signTransactionAddnft/nanosp.47.png
index 360b7921..36e2d17e 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.47.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.47.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.50.png b/test-integration/snapshots/signTransactionAddnft/nanosp.50.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.50.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.50.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.51.png b/test-integration/snapshots/signTransactionAddnft/nanosp.51.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.51.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.51.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.52.png b/test-integration/snapshots/signTransactionAddnft/nanosp.52.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.52.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.52.png differ
diff --git a/test-integration/snapshots/signTransactionAddnft/nanosp.53.png b/test-integration/snapshots/signTransactionAddnft/nanosp.53.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionAddnft/nanosp.53.png and b/test-integration/snapshots/signTransactionAddnft/nanosp.53.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.01.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.01.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.03.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.03.png
index ff8a2bbd..a4101bc7 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.03.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.03.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.07.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.07.png
index 8be05678..095632e6 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.07.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.07.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.08.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.08.png
index 53a92bd8..2abe5bd2 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.08.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.11.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.11.png
index 4bd0b0ea..00e1084a 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.11.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.11.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.13.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.13.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.13.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.13.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.14.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.14.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.14.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.14.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.15.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.15.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.15.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.15.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.16.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.16.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.16.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.16.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.18.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.18.png
index ff8a2bbd..a4101bc7 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.18.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.18.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.22.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.22.png
index 8be05678..095632e6 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.22.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.22.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.23.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.23.png
index 53a92bd8..2abe5bd2 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.23.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.23.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.26.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.26.png
index 4bd0b0ea..00e1084a 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.26.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.26.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.28.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.28.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.28.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.28.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.29.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.29.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.29.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.29.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.30.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.30.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.30.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.30.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.31.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.31.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.31.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.31.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.33.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.33.png
index ff8a2bbd..a4101bc7 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.33.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.33.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.37.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.37.png
index 8be05678..095632e6 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.37.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.37.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.38.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.38.png
index 53a92bd8..2abe5bd2 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.38.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.38.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.41.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.41.png
index 4bd0b0ea..00e1084a 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.41.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.41.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.43.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.43.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.43.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.43.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.44.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.44.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.44.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.44.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.45.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.45.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.45.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.45.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.46.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.46.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.46.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.46.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.48.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.48.png
index ff8a2bbd..a4101bc7 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.48.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.48.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.52.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.52.png
index 8be05678..095632e6 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.52.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.52.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.53.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.53.png
index 53a92bd8..2abe5bd2 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.53.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.53.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.56.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.56.png
index 4bd0b0ea..00e1084a 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.56.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.56.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.58.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.58.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.58.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.58.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.59.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.59.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.59.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.59.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.60.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.60.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.60.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.60.png differ
diff --git a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.61.png b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.61.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionNewfundsreq/nanosp.61.png and b/test-integration/snapshots/signTransactionNewfundsreq/nanosp.61.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.01.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.01.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.05.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.05.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.05.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.05.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.06.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.06.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.06.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.06.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.08.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.08.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.08.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.09.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.09.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.09.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.09.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.10.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.10.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.10.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.10.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.103.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.103.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.103.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.103.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.104.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.104.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.104.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.104.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.106.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.106.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.106.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.106.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.107.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.107.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.107.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.107.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.108.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.108.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.108.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.108.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.109.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.109.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.109.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.109.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.11.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.11.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.11.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.11.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.121.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.121.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.121.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.121.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.122.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.122.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.122.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.122.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.124.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.124.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.124.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.124.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.125.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.125.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.125.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.125.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.126.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.126.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.126.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.126.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.127.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.127.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.127.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.127.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.140.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.140.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.140.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.140.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.141.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.141.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.141.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.141.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.143.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.143.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.143.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.143.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.144.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.144.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.144.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.144.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.145.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.145.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.145.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.145.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.146.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.146.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.146.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.146.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.16.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.16.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.16.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.16.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.160.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.160.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.160.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.160.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.161.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.161.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.161.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.161.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.163.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.163.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.163.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.163.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.164.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.164.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.164.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.164.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.165.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.165.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.165.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.165.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.166.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.166.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.166.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.166.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.17.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.17.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.17.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.17.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.181.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.181.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.181.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.181.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.182.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.182.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.182.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.182.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.184.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.184.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.184.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.184.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.185.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.185.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.185.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.185.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.186.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.186.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.186.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.186.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.187.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.187.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.187.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.187.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.19.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.19.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.19.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.19.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.20.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.20.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.20.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.20.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.203.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.203.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.203.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.203.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.204.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.204.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.204.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.204.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.206.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.206.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.206.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.206.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.207.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.207.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.207.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.207.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.208.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.208.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.208.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.208.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.209.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.209.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.209.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.209.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.21.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.21.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.21.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.21.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.22.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.22.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.22.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.22.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.226.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.226.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.226.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.226.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.227.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.227.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.227.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.227.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.229.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.229.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.229.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.229.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.230.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.230.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.230.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.230.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.231.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.231.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.231.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.231.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.232.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.232.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.232.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.232.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.250.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.250.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.250.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.250.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.251.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.251.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.251.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.251.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.253.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.253.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.253.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.253.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.254.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.254.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.254.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.254.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.255.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.255.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.255.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.255.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.256.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.256.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.256.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.256.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.275.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.275.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.275.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.275.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.276.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.276.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.276.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.276.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.278.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.278.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.278.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.278.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.279.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.279.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.279.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.279.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.28.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.28.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.28.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.28.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.280.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.280.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.280.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.280.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.281.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.281.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.281.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.281.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.29.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.29.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.29.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.29.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.301.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.301.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.301.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.301.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.302.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.302.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.302.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.302.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.304.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.304.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.304.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.304.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.305.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.305.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.305.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.305.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.306.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.306.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.306.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.306.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.307.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.307.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.307.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.307.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.31.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.31.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.31.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.31.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.32.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.32.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.32.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.32.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.328.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.328.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.328.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.328.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.329.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.329.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.329.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.329.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.33.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.33.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.33.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.33.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.331.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.331.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.331.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.331.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.332.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.332.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.332.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.332.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.333.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.333.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.333.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.333.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.334.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.334.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.334.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.334.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.34.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.34.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.34.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.34.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.356.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.356.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.356.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.356.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.357.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.357.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.357.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.357.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.359.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.359.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.359.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.359.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.360.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.360.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.360.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.360.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.361.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.361.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.361.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.361.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.362.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.362.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.362.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.362.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.385.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.385.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.385.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.385.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.386.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.386.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.386.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.386.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.388.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.388.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.388.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.388.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.389.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.389.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.389.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.389.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.390.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.390.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.390.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.390.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.391.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.391.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.391.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.391.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.41.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.41.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.41.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.41.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.415.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.415.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.415.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.415.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.416.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.416.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.416.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.416.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.418.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.418.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.418.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.418.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.419.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.419.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.419.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.419.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.42.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.42.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.42.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.42.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.420.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.420.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.420.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.420.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.421.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.421.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.421.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.421.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.44.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.44.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.44.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.44.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.446.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.446.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.446.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.446.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.447.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.447.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.447.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.447.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.449.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.449.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.449.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.449.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.45.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.45.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.45.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.45.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.450.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.450.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.450.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.450.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.451.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.451.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.451.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.451.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.452.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.452.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.452.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.452.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.46.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.46.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.46.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.46.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.47.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.47.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.47.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.47.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.478.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.478.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.478.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.478.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.479.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.479.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.479.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.479.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.481.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.481.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.481.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.481.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.482.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.482.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.482.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.482.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.483.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.483.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.483.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.483.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.484.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.484.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.484.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.484.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.511.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.511.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.511.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.511.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.512.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.512.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.512.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.512.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.514.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.514.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.514.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.514.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.515.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.515.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.515.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.515.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.516.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.516.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.516.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.516.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.517.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.517.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.517.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.517.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.545.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.545.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.545.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.545.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.546.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.546.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.546.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.546.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.548.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.548.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.548.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.548.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.549.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.549.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.549.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.549.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.55.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.55.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.55.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.55.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.550.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.550.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.550.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.550.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.551.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.551.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.551.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.551.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.56.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.56.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.56.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.56.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.58.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.58.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.58.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.58.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.580.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.580.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.580.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.580.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.581.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.581.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.581.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.581.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.583.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.583.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.583.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.583.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.584.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.584.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.584.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.584.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.585.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.585.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.585.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.585.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.586.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.586.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.586.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.586.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.59.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.59.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.59.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.59.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.60.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.60.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.60.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.60.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.61.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.61.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.61.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.61.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.616.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.616.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.616.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.616.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.617.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.617.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.617.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.617.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.619.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.619.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.619.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.619.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.620.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.620.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.620.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.620.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.621.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.621.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.621.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.621.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.622.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.622.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.622.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.622.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.653.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.653.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.653.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.653.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.654.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.654.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.654.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.654.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.656.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.656.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.656.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.656.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.657.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.657.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.657.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.657.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.658.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.658.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.658.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.658.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.659.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.659.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.659.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.659.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.691.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.691.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.691.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.691.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.692.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.692.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.692.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.692.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.694.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.694.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.694.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.694.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.695.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.695.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.695.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.695.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.696.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.696.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.696.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.696.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.697.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.697.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.697.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.697.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.70.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.70.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.70.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.70.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.71.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.71.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.71.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.71.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.73.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.73.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.73.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.73.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.730.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.730.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.730.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.730.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.731.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.731.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.731.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.731.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.733.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.733.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.733.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.733.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.734.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.734.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.734.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.734.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.735.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.735.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.735.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.735.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.736.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.736.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.736.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.736.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.74.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.74.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.74.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.74.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.740.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.740.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.740.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.740.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.741.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.741.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.741.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.741.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.743.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.743.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.743.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.743.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.744.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.744.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.744.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.744.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.745.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.745.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.745.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.745.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.746.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.746.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.746.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.746.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.75.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.75.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.75.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.75.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.76.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.76.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.76.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.76.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.86.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.86.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.86.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.86.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.87.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.87.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.87.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.87.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.89.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.89.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.89.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.89.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.90.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.90.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.90.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.90.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.91.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.91.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.91.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.91.png differ
diff --git a/test-integration/snapshots/signTransactionOtherEosio/nanosp.92.png b/test-integration/snapshots/signTransactionOtherEosio/nanosp.92.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherEosio/nanosp.92.png and b/test-integration/snapshots/signTransactionOtherEosio/nanosp.92.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.01.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.01.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.03.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.03.png
index cad4e28f..60bb1c9c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.03.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.03.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.04.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.04.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.04.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.04.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.05.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.05.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.05.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.05.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.07.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.07.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.07.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.07.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.08.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.08.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.08.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.09.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.09.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.09.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.09.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.10.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.10.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.10.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.10.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.13.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.13.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.13.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.13.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.14.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.14.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.14.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.14.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.17.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.17.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.17.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.17.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.18.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.18.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.18.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.18.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.19.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.19.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.19.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.19.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.20.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.20.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.20.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.20.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.23.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.23.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.23.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.23.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.24.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.24.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.24.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.24.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.25.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.25.png
index ff979c46..11cbf159 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.25.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.25.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.27.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.27.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.27.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.27.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.28.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.28.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.28.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.28.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.29.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.29.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.29.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.29.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.30.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.30.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.30.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.30.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.33.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.33.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.33.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.33.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.34.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.34.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.34.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.34.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.35.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.35.png
index ff979c46..11cbf159 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.35.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.35.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.37.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.37.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.37.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.37.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.38.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.38.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.38.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.38.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.39.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.39.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.39.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.39.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.40.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.40.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.40.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.40.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.44.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.44.png
index ff979c46..11cbf159 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.44.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.44.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.46.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.46.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.46.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.46.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.47.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.47.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.47.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.47.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.48.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.48.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.48.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.48.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.49.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.49.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.49.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.49.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.54.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.54.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.54.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.54.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.55.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.55.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.55.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.55.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.56.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.56.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.56.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.56.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.57.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.57.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.57.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.57.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.59.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.59.png
index 1cf8cb52..4c81460f 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.59.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.59.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.63.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.63.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.63.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.63.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.64.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.64.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.64.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.64.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.65.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.65.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.65.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.65.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.66.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.66.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.66.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.66.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.68.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.68.png
index 1cf8cb52..4c81460f 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.68.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.68.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.72.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.72.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.72.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.72.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.73.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.73.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.73.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.73.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.74.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.74.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.74.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.74.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.75.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.75.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.75.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.75.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.79.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.79.png
index e3ad063f..b65d7b38 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.79.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.79.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.81.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.81.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.81.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.81.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.82.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.82.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.82.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.82.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.83.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.83.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.83.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.83.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.84.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.84.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.84.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.84.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.87.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.87.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.87.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.87.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.88.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.88.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.88.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.88.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.90.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.90.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.90.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.90.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.91.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.91.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.91.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.91.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.92.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.92.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.92.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.92.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.93.png b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.93.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.93.png and b/test-integration/snapshots/signTransactionOtherFioAddress/nanosp.93.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.01.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.01.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.04.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.04.png
index e9df7a28..dc8f82fe 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.04.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.04.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.06.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.06.png
index f4dc8305..b78cfcf4 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.06.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.06.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.09.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.09.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.09.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.09.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.10.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.10.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.10.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.10.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.11.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.11.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.11.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.11.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.12.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.12.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.12.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.12.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.17.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.17.png
index f4dc8305..b78cfcf4 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.17.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.17.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.20.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.20.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.20.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.20.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.21.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.21.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.21.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.21.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.22.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.22.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.22.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.22.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.23.png b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.23.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.23.png and b/test-integration/snapshots/signTransactionOtherFioOracle/nanosp.23.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.01.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.01.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.03.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.03.png
index 00cfdfe5..4a8bb38a 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.03.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.03.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.04.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.04.png
index c1a66c3d..2d8f3742 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.04.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.04.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.06.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.06.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.06.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.06.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.07.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.07.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.07.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.07.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.08.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.08.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.08.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.09.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.09.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.09.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.09.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.11.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.11.png
index a8df15af..d1cab6a7 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.11.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.11.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.12.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.12.png
index c1a66c3d..2d8f3742 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.12.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.12.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.14.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.14.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.14.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.14.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.15.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.15.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.15.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.15.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.16.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.16.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.16.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.16.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.17.png b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.17.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.17.png and b/test-integration/snapshots/signTransactionOtherFioReqobt/nanosp.17.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.01.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.01.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.04.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.04.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.04.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.04.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.05.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.05.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.05.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.05.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.08.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.08.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.08.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.09.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.09.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.09.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.09.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.10.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.10.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.10.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.10.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.11.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.11.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.11.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.11.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.14.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.14.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.14.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.14.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.15.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.15.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.15.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.15.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.18.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.18.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.18.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.18.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.19.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.19.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.19.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.19.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.20.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.20.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.20.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.20.png differ
diff --git a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.21.png b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.21.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.21.png and b/test-integration/snapshots/signTransactionOtherFioStaking/nanosp.21.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.01.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.01.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.04.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.04.png
index c1a66c3d..2d8f3742 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.04.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.04.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.08.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.08.png
index 2a064b24..9e4fd242 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.08.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.09.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.09.png
index 8be05678..095632e6 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.09.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.09.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.10.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.10.png
index 53a92bd8..2abe5bd2 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.10.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.10.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.14.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.14.png
index 1649b937..807849bb 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.14.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.14.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.15.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.15.png
index 4bd0b0ea..00e1084a 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.15.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.15.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.17.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.17.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.17.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.17.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.18.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.18.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.18.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.18.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.19.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.19.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.19.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.19.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.20.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.20.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.20.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.20.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.23.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.23.png
index c1a66c3d..2d8f3742 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.23.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.23.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.27.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.27.png
index 2a064b24..9e4fd242 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.27.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.27.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.28.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.28.png
index 8be05678..095632e6 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.28.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.28.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.29.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.29.png
index 53a92bd8..2abe5bd2 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.29.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.29.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.33.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.33.png
index 1649b937..807849bb 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.33.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.33.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.34.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.34.png
index 4bd0b0ea..00e1084a 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.34.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.34.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.36.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.36.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.36.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.36.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.37.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.37.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.37.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.37.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.38.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.38.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.38.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.38.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.39.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.39.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.39.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.39.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.45.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.45.png
index 2a064b24..9e4fd242 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.45.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.45.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.46.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.46.png
index 8be05678..095632e6 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.46.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.46.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.47.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.47.png
index 53a92bd8..2abe5bd2 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.47.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.47.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.51.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.51.png
index 1649b937..807849bb 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.51.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.51.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.52.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.52.png
index 4bd0b0ea..00e1084a 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.52.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.52.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.54.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.54.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.54.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.54.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.55.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.55.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.55.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.55.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.56.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.56.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.56.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.56.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.57.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.57.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.57.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.57.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.63.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.63.png
index 2a064b24..9e4fd242 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.63.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.63.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.64.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.64.png
index 8be05678..095632e6 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.64.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.64.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.65.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.65.png
index 53a92bd8..2abe5bd2 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.65.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.65.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.69.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.69.png
index 1649b937..807849bb 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.69.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.69.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.70.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.70.png
index 4bd0b0ea..00e1084a 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.70.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.70.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.72.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.72.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.72.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.72.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.73.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.73.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.73.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.73.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.74.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.74.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.74.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.74.png differ
diff --git a/test-integration/snapshots/signTransactionRecordobt/nanosp.75.png b/test-integration/snapshots/signTransactionRecordobt/nanosp.75.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRecordobt/nanosp.75.png and b/test-integration/snapshots/signTransactionRecordobt/nanosp.75.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.01.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.01.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.03.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.03.png
index c61bb216..55dcee1f 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.03.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.03.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.04.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.04.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.04.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.04.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.05.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.05.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.05.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.05.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.06.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.06.png
index 07574cbb..335e8e79 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.06.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.06.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.08.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.08.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.08.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.09.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.09.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.09.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.09.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.10.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.10.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.10.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.10.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.11.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.11.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.11.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.11.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.13.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.13.png
index c61bb216..55dcee1f 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.13.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.13.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.14.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.14.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.14.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.14.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.15.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.15.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.15.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.15.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.16.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.16.png
index 07574cbb..335e8e79 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.16.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.16.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.17.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.17.png
index 5ebc4ffd..24d42318 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.17.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.17.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.19.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.19.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.19.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.19.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.20.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.20.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.20.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.20.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.21.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.21.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.21.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.21.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.22.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.22.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.22.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.22.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.24.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.24.png
index c61bb216..55dcee1f 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.24.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.24.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.25.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.25.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.25.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.25.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.26.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.26.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.26.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.26.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.27.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.27.png
index 07574cbb..335e8e79 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.27.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.27.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.28.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.28.png
index 5ebc4ffd..24d42318 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.28.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.28.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.29.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.29.png
index 9dd74af9..997b97fb 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.29.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.29.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.31.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.31.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.31.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.31.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.32.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.32.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.32.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.32.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.33.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.33.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.33.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.33.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.34.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.34.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.34.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.34.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.36.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.36.png
index c61bb216..55dcee1f 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.36.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.36.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.37.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.37.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.37.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.37.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.38.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.38.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.38.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.38.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.39.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.39.png
index 07574cbb..335e8e79 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.39.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.39.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.40.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.40.png
index 5ebc4ffd..24d42318 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.40.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.40.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.41.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.41.png
index 9dd74af9..997b97fb 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.41.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.41.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.42.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.42.png
index 85bc4b28..8325832e 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.42.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.42.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.44.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.44.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.44.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.44.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.45.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.45.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.45.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.45.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.46.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.46.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.46.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.46.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.47.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.47.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.47.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.47.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.49.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.49.png
index c61bb216..55dcee1f 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.49.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.49.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.50.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.50.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.50.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.50.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.51.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.51.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.51.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.51.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.52.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.52.png
index 07574cbb..335e8e79 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.52.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.52.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.53.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.53.png
index 5ebc4ffd..24d42318 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.53.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.53.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.54.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.54.png
index 9dd74af9..997b97fb 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.54.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.54.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.55.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.55.png
index 85bc4b28..8325832e 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.55.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.55.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.56.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.56.png
index 19b3df1d..de6400e6 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.56.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.56.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.58.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.58.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.58.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.58.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.59.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.59.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.59.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.59.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.60.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.60.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.60.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.60.png differ
diff --git a/test-integration/snapshots/signTransactionRemaddress/nanosp.61.png b/test-integration/snapshots/signTransactionRemaddress/nanosp.61.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRemaddress/nanosp.61.png and b/test-integration/snapshots/signTransactionRemaddress/nanosp.61.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.01.png b/test-integration/snapshots/signTransactionRemnft/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.01.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.04.png b/test-integration/snapshots/signTransactionRemnft/nanosp.04.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.04.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.04.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.05.png b/test-integration/snapshots/signTransactionRemnft/nanosp.05.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.05.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.05.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.06.png b/test-integration/snapshots/signTransactionRemnft/nanosp.06.png
index 3a4a3270..272e4d1b 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.06.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.06.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.08.png b/test-integration/snapshots/signTransactionRemnft/nanosp.08.png
index 928e1056..2f9e9a54 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.08.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.11.png b/test-integration/snapshots/signTransactionRemnft/nanosp.11.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.11.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.11.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.12.png b/test-integration/snapshots/signTransactionRemnft/nanosp.12.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.12.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.12.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.13.png b/test-integration/snapshots/signTransactionRemnft/nanosp.13.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.13.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.13.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.14.png b/test-integration/snapshots/signTransactionRemnft/nanosp.14.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.14.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.14.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.17.png b/test-integration/snapshots/signTransactionRemnft/nanosp.17.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.17.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.17.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.18.png b/test-integration/snapshots/signTransactionRemnft/nanosp.18.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.18.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.18.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.19.png b/test-integration/snapshots/signTransactionRemnft/nanosp.19.png
index 3a4a3270..272e4d1b 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.19.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.19.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.21.png b/test-integration/snapshots/signTransactionRemnft/nanosp.21.png
index 928e1056..2f9e9a54 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.21.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.21.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.23.png b/test-integration/snapshots/signTransactionRemnft/nanosp.23.png
index bbcd093d..c52915e3 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.23.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.23.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.25.png b/test-integration/snapshots/signTransactionRemnft/nanosp.25.png
index e17bdfa9..9b9ae3db 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.25.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.25.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.28.png b/test-integration/snapshots/signTransactionRemnft/nanosp.28.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.28.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.28.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.29.png b/test-integration/snapshots/signTransactionRemnft/nanosp.29.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.29.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.29.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.30.png b/test-integration/snapshots/signTransactionRemnft/nanosp.30.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.30.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.30.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.31.png b/test-integration/snapshots/signTransactionRemnft/nanosp.31.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.31.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.31.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.34.png b/test-integration/snapshots/signTransactionRemnft/nanosp.34.png
index c1dd7f06..c90cc3d9 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.34.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.34.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.35.png b/test-integration/snapshots/signTransactionRemnft/nanosp.35.png
index f9daa857..432c6913 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.35.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.35.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.36.png b/test-integration/snapshots/signTransactionRemnft/nanosp.36.png
index 3a4a3270..272e4d1b 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.36.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.36.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.38.png b/test-integration/snapshots/signTransactionRemnft/nanosp.38.png
index 928e1056..2f9e9a54 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.38.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.38.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.40.png b/test-integration/snapshots/signTransactionRemnft/nanosp.40.png
index bbcd093d..c52915e3 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.40.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.40.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.42.png b/test-integration/snapshots/signTransactionRemnft/nanosp.42.png
index e17bdfa9..9b9ae3db 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.42.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.42.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.44.png b/test-integration/snapshots/signTransactionRemnft/nanosp.44.png
index ca5570e4..b1caf4f0 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.44.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.44.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.46.png b/test-integration/snapshots/signTransactionRemnft/nanosp.46.png
index 10d3f52b..266dd530 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.46.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.46.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.49.png b/test-integration/snapshots/signTransactionRemnft/nanosp.49.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.49.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.49.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.50.png b/test-integration/snapshots/signTransactionRemnft/nanosp.50.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.50.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.50.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.51.png b/test-integration/snapshots/signTransactionRemnft/nanosp.51.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.51.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.51.png differ
diff --git a/test-integration/snapshots/signTransactionRemnft/nanosp.52.png b/test-integration/snapshots/signTransactionRemnft/nanosp.52.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionRemnft/nanosp.52.png and b/test-integration/snapshots/signTransactionRemnft/nanosp.52.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.01.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.01.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.01.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.01.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.04.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.04.png
index 8aa5b6b6..9ea44041 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.04.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.04.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.05.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.05.png
index 225672c1..db499272 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.05.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.05.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.08.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.08.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.08.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.08.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.09.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.09.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.09.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.09.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.10.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.10.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.10.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.10.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.11.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.11.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.11.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.11.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.14.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.14.png
index 8aa5b6b6..9ea44041 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.14.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.14.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.15.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.15.png
index 225672c1..db499272 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.15.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.15.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.18.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.18.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.18.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.18.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.19.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.19.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.19.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.19.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.20.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.20.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.20.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.20.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.21.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.21.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.21.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.21.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.24.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.24.png
index 8aa5b6b6..9ea44041 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.24.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.24.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.25.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.25.png
index 225672c1..db499272 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.25.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.25.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.28.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.28.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.28.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.28.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.29.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.29.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.29.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.29.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.30.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.30.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.30.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.30.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.31.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.31.png
index cbdc0a71..348d43dc 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.31.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.31.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.32.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.32.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.32.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.32.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.35.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.35.png
index 8aa5b6b6..9ea44041 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.35.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.35.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.36.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.36.png
index 225672c1..db499272 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.36.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.36.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.38.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.38.png
index 4bded1cd..879dc8a9 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.38.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.38.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.39.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.39.png
index 6f7fe29c..4b4b7f83 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.39.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.39.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.40.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.40.png
index 8ac15c6d..5d0997ef 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.40.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.40.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.41.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.41.png
index 525864b4..2f8f58e6 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.41.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.41.png differ
diff --git a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.42.png b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.42.png
index a7a87405..c843773c 100644
Binary files a/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.42.png and b/test-integration/snapshots/signTransactionTrnsfiopubky/nanosp.42.png differ
diff --git a/test-integration/speculos-buttons-and-snapshots.js b/test-integration/speculos-buttons-and-snapshots.js
index ee2cfe04..b5d5b202 100644
--- a/test-integration/speculos-buttons-and-snapshots.js
+++ b/test-integration/speculos-buttons-and-snapshots.js
@@ -3,13 +3,13 @@ import { syncBackTicks, sleep, humanTime } from "./speculos-common.js"
 const fioWaitingForCommandsSHA = {
     "nanos": "sha256:13bd32a0f8a2eb3d5723b7e131e439105d63875272e952f703a268a0f1e00728",
     "nanox": "sha256:ce937171040b94097e5d805f76eda47fe8eeb41e50215706634939417214544c",
-    "nanosp": "sha256:86fa19f6aa42fb59d1058cc245e95132629b88adb42efea49af289ddeb651405",
+    "nanosp": "sha256:ce937171040b94097e5d805f76eda47fe8eeb41e50215706634939417214544c",
 } 
 
 const fioWarningDevelSHA = {
     "nanos": "sha256:df7553b0b614d9d3ff0dcb5facde9e1e7e308e2691be9669d206a241f958a999",
-    "nanox": "sha256:2bb665c41bcb7e7abda8fc30255f28b35144d26997f314074290eb24b23e37fa", 
-    "nanosp": "sha256:2bb665c41bcb7e7abda8fc30255f28b35144d26997f314074290eb24b23e37fa",
+    "nanox": "sha256:bc21ced95ca0a8fcea97428b4a840c35db373ed2b6c67654b5de66b330e466f9", 
+    "nanosp": "sha256:bc21ced95ca0a8fcea97428b4a840c35db373ed2b6c67654b5de66b330e466f9",
 } 
 
 const fioThreeDotsSHA = {
@@ -167,7 +167,7 @@ class ButtonsAndSnapshots {
     //Each step should end on "FIO Ready" screen
     checkFioReadyScreen(sha) {
 		if (sha != this.fioWaitingSHA && sha != this.fioWarningSHA) {
-			throw new Error();
+    		throw new Error();
 		}
 	}