diff --git a/.github/workflows/swap-ci-workflow.yml b/.github/workflows/swap-ci-workflow.yml
index efab7198..f96ebf78 100644
--- a/.github/workflows/swap-ci-workflow.yml
+++ b/.github/workflows/swap-ci-workflow.yml
@@ -13,5 +13,7 @@ jobs:
   job_functional_tests:
     uses: LedgerHQ/app-exchange/.github/workflows/reusable_swap_functional_tests.yml@develop
     with:
+      # Allow overriding the repo on forks
+      repo_for_tron: ${{ vars.REPO_FOR_TRON || null }}
       branch_for_tron: ${{ github.ref }}
       test_filter: '"TRX or trx or Tron or tron"'
diff --git a/VERSION b/VERSION
index f38fc539..0a1ffad4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7.3
+0.7.4
diff --git a/src/handlers/sign.c b/src/handlers/sign.c
index 733e93b0..0fd78313 100644
--- a/src/handlers/sign.c
+++ b/src/handlers/sign.c
@@ -54,12 +54,6 @@ static void fillVoteAmountSlot(void *destination, uint64_t value, uint8_t index)
     PRINTF("Amount: %d - %s\n", index, destination + (voteSlot(index, VOTE_AMOUNT)));
 }
 
-static void convertUint256BE(uint8_t *data, uint32_t length, uint256_t *target) {
-    uint8_t tmp[32] = {0};
-    memcpy(tmp + 32 - length, data, length);
-    readu256BE(tmp, target);
-}
-
 int handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer, uint16_t dataLength) {
     uint256_t uint256;
     bool data_warning;
@@ -282,8 +276,9 @@ int handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer, uint16_t dataLength)
                                     strlen((const char *) G_io_apdu_buffer + 100),
                                     (char *) G_io_apdu_buffer,
                                     100,
-                                    txContent.decimals[0]))
+                                    txContent.decimals[0])) {
                     return io_send_sw(E_INCORRECT_LENGTH);
+                }
             } else {
                 print_amount(
                     txContent.amount[0],
diff --git a/src/parse.c b/src/parse.c
index d8cb924e..c87ead41 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -39,6 +39,24 @@ tokenDefinition_t *getKnownToken(txContent_t *context) {
     return NULL;
 }
 
+/**
+ * Adjusts a numeric string by adding a decimal point at the specified position and trimming
+ * trailing zeros.
+ *
+ * @param[in] src
+ *   Pointer to the source numeric string.
+ * @param[in] srcLength
+ *   Length of the number as the number of actual characters (not the size of the buffer).
+ * @param[out] target
+ *   Pointer to the buffer where the adjusted string will be stored.
+ * @param[in] targetLength
+ *   Size of the target buffer.
+ * @param[in] decimals
+ *   Number of decimal places to shift.
+ *
+ * @return
+ *   True if successful, false otherwise (e.g., if the target buffer is too small).
+ */
 bool adjustDecimals(const char *src,
                     uint32_t srcLength,
                     char *target,
diff --git a/src/swap/handle_get_printable_amount.c b/src/swap/handle_get_printable_amount.c
index fbcfdf47..4e70bba9 100644
--- a/src/swap/handle_get_printable_amount.c
+++ b/src/swap/handle_get_printable_amount.c
@@ -20,12 +20,12 @@
 
 #include "handle_swap_sign_transaction.h"
 #include "parse.h"
+#include "uint256.h"
 
 /* Set empty printable_amount on error, printable amount otherwise */
 void swap_handle_get_printable_amount(get_printable_amount_parameters_t* params) {
     uint8_t decimals;
     char ticker[MAX_SWAP_TOKEN_LENGTH] = {0};
-    uint64_t amount;
 
     PRINTF("Inside Tron swap_handle_get_printable_amount\n");
 
@@ -45,15 +45,20 @@ void swap_handle_get_printable_amount(get_printable_amount_parameters_t* params)
         }
     }
 
-    if (!swap_str_to_u64(params->amount, params->amount_length, &amount)) {
-        PRINTF("Amount is too big\n");
-        goto error;
-    }
+    uint256_t amount_number = {0};
+
+    // Raw amount string without a decimal point
+    char amount_raw_string[MAX_PRINTABLE_AMOUNT_SIZE] = {0};
+
+    convertUint256BE(params->amount, params->amount_length, &amount_number);
+
+    tostring256(&amount_number, 10, amount_raw_string, sizeof(amount_raw_string));
 
-    if (print_amount(amount,
-                     params->printable_amount,
-                     sizeof(params->printable_amount),
-                     decimals) == 0) {
+    if (!adjustDecimals(amount_raw_string,
+                        strnlen(amount_raw_string, sizeof(amount_raw_string)),
+                        params->printable_amount,
+                        sizeof(params->printable_amount),
+                        decimals)) {
         PRINTF("print_amount failed\n");
         goto error;
     }
diff --git a/src/swap/handle_swap_sign_transaction.c b/src/swap/handle_swap_sign_transaction.c
index 58a55b94..82e9a92a 100644
--- a/src/swap/handle_swap_sign_transaction.c
+++ b/src/swap/handle_swap_sign_transaction.c
@@ -20,12 +20,13 @@
 #include "swap.h"
 
 #include "parse.h"
+#include "uint256.h"
 
 typedef struct swap_validated_s {
     bool initialized;
     uint8_t decimals;
     char ticker[MAX_SWAP_TOKEN_LENGTH];
-    uint64_t amount;
+    uint256_t amount;
     char recipient[BASE58CHECK_ADDRESS_SIZE + 1];
 } swap_validated_t;
 
@@ -92,10 +93,7 @@ bool swap_copy_transaction_parameters(create_transaction_parameters_t* params) {
         return false;
     }
 
-    // Save amount
-    if (!swap_str_to_u64(params->amount, params->amount_length, &swap_validated.amount)) {
-        return false;
-    }
+    convertUint256BE(params->amount, params->amount_length, &swap_validated.amount);
 
     swap_validated.initialized = true;
 
@@ -111,17 +109,22 @@ bool swap_copy_transaction_parameters(create_transaction_parameters_t* params) {
 }
 
 // Check that the amount in parameter is the same as the previously saved amount
-static bool check_swap_amount(const char* amount) {
-    char validated_amount[MAX_PRINTABLE_AMOUNT_SIZE];
-    if (print_amount(G_swap_validated.amount,
-                     validated_amount,
-                     sizeof(validated_amount),
-                     G_swap_validated.decimals) == 0) {
+static bool check_swap_amount(const char* amount, const uint8_t decimals) {
+    char validated_amount[MAX_PRINTABLE_AMOUNT_SIZE] = {0};
+    char amount_raw_string[MAX_PRINTABLE_AMOUNT_SIZE] = {0};
+
+    tostring256(&G_swap_validated.amount, 10, amount_raw_string, sizeof(amount_raw_string));
+
+    if (!adjustDecimals(amount_raw_string,
+                        strnlen(amount_raw_string, sizeof(amount_raw_string)),
+                        validated_amount,
+                        sizeof(validated_amount),
+                        decimals)) {
         PRINTF("Conversion failed\n");
         return false;
     }
 
-    if (strcmp(amount, validated_amount) != 0) {
+    if (strncmp(amount, validated_amount, MAX_PRINTABLE_AMOUNT_SIZE) != 0) {
         PRINTF("Amount requested in this transaction = %s\n", amount);
         PRINTF("Amount validated in swap = %s\n", validated_amount);
         return false;
@@ -140,21 +143,21 @@ bool swap_check_validity(const char* amount,
         return false;
     }
 
-    if (!check_swap_amount(amount)) {
+    if (!check_swap_amount(amount, G_swap_validated.decimals)) {
         return false;
     }
 
-    if (strcmp(tokenName, G_swap_validated.ticker) != 0) {
+    if (strncmp(tokenName, G_swap_validated.ticker, MAX_SWAP_TOKEN_LENGTH) != 0) {
         PRINTF("Refused field '%s', expecting '%s'\n", tokenName, G_swap_validated.ticker);
         return false;
     }
 
-    if (strcmp(action, "To") != 0) {
+    if (strncmp(action, "To", 3) != 0) {
         PRINTF("Refused field '%s', expecting 'To'\n", action);
         return false;
     }
 
-    if (strcmp(G_swap_validated.recipient, toAddress) != 0) {
+    if (strncmp(G_swap_validated.recipient, toAddress, BASE58CHECK_ADDRESS_SIZE + 1) != 0) {
         PRINTF("Recipient requested in this transaction = %s\n", toAddress);
         PRINTF("Recipient validated in swap = %s\n", G_swap_validated.recipient);
         return false;
diff --git a/src/uint256.c b/src/uint256.c
index 772642df..b1319efd 100644
--- a/src/uint256.c
+++ b/src/uint256.c
@@ -21,6 +21,8 @@
 #include <stdlib.h>
 #include "uint256.h"
 
+#include <string.h>
+
 static const char HEXDIGITS[] = "0123456789abcdef";
 
 static uint64_t readUint64BE(uint8_t *buffer) {
@@ -40,6 +42,12 @@ void readu256BE(uint8_t *buffer, uint256_t *target) {
     readu128BE(buffer + 16, &LOWER_P(target));
 }
 
+void convertUint256BE(const uint8_t *data, const uint32_t length, uint256_t *target) {
+    uint8_t tmp[32] = {0};
+    memcpy(tmp + 32 - length, data, length);
+    readu256BE(tmp, target);
+}
+
 bool zero128(uint128_t *number) {
     return ((LOWER_P(number) == 0) && (UPPER_P(number) == 0));
 }
diff --git a/src/uint256.h b/src/uint256.h
index 5ecdee44..82810177 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -35,6 +35,7 @@ typedef struct uint256_t {
 
 void readu128BE(uint8_t *buffer, uint128_t *target);
 void readu256BE(uint8_t *buffer, uint256_t *target);
+void convertUint256BE(const uint8_t *data, uint32_t length, uint256_t *target);
 bool zero128(uint128_t *number);
 bool zero256(uint256_t *number);
 void copy128(uint128_t *target, uint128_t *number);
diff --git a/tests/snapshots/apex_p/test_trx_trc20_approve/00001.png b/tests/snapshots/apex_p/test_trx_trc20_approve/00001.png
index f404bb00..74afdc47 100644
Binary files a/tests/snapshots/apex_p/test_trx_trc20_approve/00001.png and b/tests/snapshots/apex_p/test_trx_trc20_approve/00001.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00000.png b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00000.png
new file mode 100644
index 00000000..eb54a2bd
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00000.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00001.png b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00001.png
new file mode 100644
index 00000000..38436a62
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00001.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00002.png b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00002.png
new file mode 100644
index 00000000..d04cbffd
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00002.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00003.png b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00003.png
new file mode 100644
index 00000000..994ec56e
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00003.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00004.png b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00004.png
new file mode 100644
index 00000000..4aba0a2b
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00004.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00005.png b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00005.png
new file mode 100644
index 00000000..fea994c8
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_e20_amount/00005.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00000.png b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00000.png
new file mode 100644
index 00000000..eb54a2bd
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00000.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00001.png b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00001.png
new file mode 100644
index 00000000..de9501bb
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00001.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00002.png b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00002.png
new file mode 100644
index 00000000..d04cbffd
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00002.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00003.png b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00003.png
new file mode 100644
index 00000000..994ec56e
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00003.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00004.png b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00004.png
new file mode 100644
index 00000000..4aba0a2b
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00004.png differ
diff --git a/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00005.png b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00005.png
new file mode 100644
index 00000000..fea994c8
Binary files /dev/null and b/tests/snapshots/apex_p/test_trx_trc20_send_zero_amount/00005.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00000.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00000.png
index c2f7b0a3..a72fe0f1 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00000.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00000.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00001.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00001.png
index c3665f29..63a40606 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00001.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00001.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00002.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00002.png
index 4a3cd371..2c012683 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00002.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00002.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00003.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00003.png
index c3665f29..63a40606 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00003.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00003.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00004.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00004.png
index 4321e601..8d07f2f2 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00004.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00004.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00005.png b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_accepted/00005.png and b/tests/snapshots/flex/test_get_public_key_confirm_accepted/00005.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00000.png b/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00000.png
index c2f7b0a3..a72fe0f1 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00000.png and b/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00001.png b/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00001.png
index 45c08d4e..7c8c42e8 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00001.png and b/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00002.png b/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00002.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00002.png and b/tests/snapshots/flex/test_get_public_key_confirm_refused/part0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00000.png b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00000.png
index c2f7b0a3..a72fe0f1 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00000.png and b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00001.png b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00001.png
index c3665f29..63a40606 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00001.png and b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00001.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00002.png b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00002.png
index 45c08d4e..7c8c42e8 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00002.png and b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00002.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00003.png b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00003.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00003.png and b/tests/snapshots/flex/test_get_public_key_confirm_refused/part1/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_account_update/00000.png b/tests/snapshots/flex/test_trx_account_update/00000.png
index 838e1593..acb7d359 100644
Binary files a/tests/snapshots/flex/test_trx_account_update/00000.png and b/tests/snapshots/flex/test_trx_account_update/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_account_update/00001.png b/tests/snapshots/flex/test_trx_account_update/00001.png
index 6eb950e8..88b13190 100644
Binary files a/tests/snapshots/flex/test_trx_account_update/00001.png and b/tests/snapshots/flex/test_trx_account_update/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_account_update/00002.png b/tests/snapshots/flex/test_trx_account_update/00002.png
index 8aaa376e..acc6cfa3 100644
Binary files a/tests/snapshots/flex/test_trx_account_update/00002.png and b/tests/snapshots/flex/test_trx_account_update/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_account_update/00003.png b/tests/snapshots/flex/test_trx_account_update/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_account_update/00003.png and b/tests/snapshots/flex/test_trx_account_update/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_account_update/00004.png b/tests/snapshots/flex/test_trx_account_update/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_account_update/00004.png and b/tests/snapshots/flex/test_trx_account_update/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_custom_contract/part1/00000.png b/tests/snapshots/flex/test_trx_custom_contract/part1/00000.png
index 372a556b..4adfc677 100644
Binary files a/tests/snapshots/flex/test_trx_custom_contract/part1/00000.png and b/tests/snapshots/flex/test_trx_custom_contract/part1/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_custom_contract/part1/00001.png b/tests/snapshots/flex/test_trx_custom_contract/part1/00001.png
index 52c47cba..bec2b6e0 100644
Binary files a/tests/snapshots/flex/test_trx_custom_contract/part1/00001.png and b/tests/snapshots/flex/test_trx_custom_contract/part1/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_custom_contract/part2/00000.png b/tests/snapshots/flex/test_trx_custom_contract/part2/00000.png
index 52c47cba..bec2b6e0 100644
Binary files a/tests/snapshots/flex/test_trx_custom_contract/part2/00000.png and b/tests/snapshots/flex/test_trx_custom_contract/part2/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_custom_contract/part2/00001.png b/tests/snapshots/flex/test_trx_custom_contract/part2/00001.png
index 87ace027..a92d848f 100644
Binary files a/tests/snapshots/flex/test_trx_custom_contract/part2/00001.png and b/tests/snapshots/flex/test_trx_custom_contract/part2/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_custom_contract/part2/00002.png b/tests/snapshots/flex/test_trx_custom_contract/part2/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_custom_contract/part2/00002.png and b/tests/snapshots/flex/test_trx_custom_contract/part2/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_custom_contract/part2/00003.png b/tests/snapshots/flex/test_trx_custom_contract/part2/00003.png
index 2f4f46ca..1e6c79d5 100644
Binary files a/tests/snapshots/flex/test_trx_custom_contract/part2/00003.png and b/tests/snapshots/flex/test_trx_custom_contract/part2/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_custom_contract/part2/00004.png b/tests/snapshots/flex/test_trx_custom_contract/part2/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_custom_contract/part2/00004.png and b/tests/snapshots/flex/test_trx_custom_contract/part2/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_custom_contract/part2/00005.png b/tests/snapshots/flex/test_trx_custom_contract/part2/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_custom_contract/part2/00005.png and b/tests/snapshots/flex/test_trx_custom_contract/part2/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_delegate_resource/00000.png b/tests/snapshots/flex/test_trx_delegate_resource/00000.png
index 16e43d63..5a0f110e 100644
Binary files a/tests/snapshots/flex/test_trx_delegate_resource/00000.png and b/tests/snapshots/flex/test_trx_delegate_resource/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_delegate_resource/00001.png b/tests/snapshots/flex/test_trx_delegate_resource/00001.png
index e7bdfec3..543b2359 100644
Binary files a/tests/snapshots/flex/test_trx_delegate_resource/00001.png and b/tests/snapshots/flex/test_trx_delegate_resource/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_delegate_resource/00002.png b/tests/snapshots/flex/test_trx_delegate_resource/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_delegate_resource/00002.png and b/tests/snapshots/flex/test_trx_delegate_resource/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_delegate_resource/00003.png b/tests/snapshots/flex/test_trx_delegate_resource/00003.png
index 7378e8e6..5ecc4a7b 100644
Binary files a/tests/snapshots/flex/test_trx_delegate_resource/00003.png and b/tests/snapshots/flex/test_trx_delegate_resource/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_delegate_resource/00004.png b/tests/snapshots/flex/test_trx_delegate_resource/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_delegate_resource/00004.png and b/tests/snapshots/flex/test_trx_delegate_resource/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_delegate_resource/00005.png b/tests/snapshots/flex/test_trx_delegate_resource/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_delegate_resource/00005.png and b/tests/snapshots/flex/test_trx_delegate_resource/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_ecdh_key/00000.png b/tests/snapshots/flex/test_trx_ecdh_key/00000.png
index 7d25fe94..947157a0 100644
Binary files a/tests/snapshots/flex/test_trx_ecdh_key/00000.png and b/tests/snapshots/flex/test_trx_ecdh_key/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_ecdh_key/00001.png b/tests/snapshots/flex/test_trx_ecdh_key/00001.png
index 7bac7248..b47f2dc4 100644
Binary files a/tests/snapshots/flex/test_trx_ecdh_key/00001.png and b/tests/snapshots/flex/test_trx_ecdh_key/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_ecdh_key/00002.png b/tests/snapshots/flex/test_trx_ecdh_key/00002.png
index f271dc9a..75c49a5a 100644
Binary files a/tests/snapshots/flex/test_trx_ecdh_key/00002.png and b/tests/snapshots/flex/test_trx_ecdh_key/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_ecdh_key/00003.png b/tests/snapshots/flex/test_trx_ecdh_key/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_ecdh_key/00003.png and b/tests/snapshots/flex/test_trx_ecdh_key/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_ecdh_key/00004.png b/tests/snapshots/flex/test_trx_ecdh_key/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_ecdh_key/00004.png and b/tests/snapshots/flex/test_trx_ecdh_key/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create/00000.png b/tests/snapshots/flex/test_trx_exchange_create/00000.png
index bd24f2be..b5ca2ba7 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create/00000.png and b/tests/snapshots/flex/test_trx_exchange_create/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create/00001.png b/tests/snapshots/flex/test_trx_exchange_create/00001.png
index 53fffbd2..ad772053 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create/00001.png and b/tests/snapshots/flex/test_trx_exchange_create/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create/00002.png b/tests/snapshots/flex/test_trx_exchange_create/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create/00002.png and b/tests/snapshots/flex/test_trx_exchange_create/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create/00003.png b/tests/snapshots/flex/test_trx_exchange_create/00003.png
index 3be55ed6..752f10c1 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create/00003.png and b/tests/snapshots/flex/test_trx_exchange_create/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create/00004.png b/tests/snapshots/flex/test_trx_exchange_create/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create/00004.png and b/tests/snapshots/flex/test_trx_exchange_create/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create/00005.png b/tests/snapshots/flex/test_trx_exchange_create/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create/00005.png and b/tests/snapshots/flex/test_trx_exchange_create/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00000.png b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00000.png
index bd24f2be..b5ca2ba7 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00000.png and b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00001.png b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00001.png
index 3fca6b10..e597d142 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00001.png and b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00002.png b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00002.png and b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00003.png b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00003.png
index 3be55ed6..752f10c1 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00003.png and b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00004.png b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00004.png and b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00005.png b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00005.png and b/tests/snapshots/flex/test_trx_exchange_create_with_token_name/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_inject/00000.png b/tests/snapshots/flex/test_trx_exchange_inject/00000.png
index f2224d87..d871f385 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_inject/00000.png and b/tests/snapshots/flex/test_trx_exchange_inject/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_inject/00001.png b/tests/snapshots/flex/test_trx_exchange_inject/00001.png
index d7cf9207..8fe0b187 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_inject/00001.png and b/tests/snapshots/flex/test_trx_exchange_inject/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_inject/00002.png b/tests/snapshots/flex/test_trx_exchange_inject/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_inject/00002.png and b/tests/snapshots/flex/test_trx_exchange_inject/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_inject/00003.png b/tests/snapshots/flex/test_trx_exchange_inject/00003.png
index 2f4f46ca..1e6c79d5 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_inject/00003.png and b/tests/snapshots/flex/test_trx_exchange_inject/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_inject/00004.png b/tests/snapshots/flex/test_trx_exchange_inject/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_inject/00004.png and b/tests/snapshots/flex/test_trx_exchange_inject/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_inject/00005.png b/tests/snapshots/flex/test_trx_exchange_inject/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_inject/00005.png and b/tests/snapshots/flex/test_trx_exchange_inject/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_transaction/00000.png b/tests/snapshots/flex/test_trx_exchange_transaction/00000.png
index f2224d87..d871f385 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_transaction/00000.png and b/tests/snapshots/flex/test_trx_exchange_transaction/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_transaction/00001.png b/tests/snapshots/flex/test_trx_exchange_transaction/00001.png
index 84f82c1c..d6d7b79e 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_transaction/00001.png and b/tests/snapshots/flex/test_trx_exchange_transaction/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_transaction/00002.png b/tests/snapshots/flex/test_trx_exchange_transaction/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_transaction/00002.png and b/tests/snapshots/flex/test_trx_exchange_transaction/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_transaction/00003.png b/tests/snapshots/flex/test_trx_exchange_transaction/00003.png
index 2f4f46ca..1e6c79d5 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_transaction/00003.png and b/tests/snapshots/flex/test_trx_exchange_transaction/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_transaction/00004.png b/tests/snapshots/flex/test_trx_exchange_transaction/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_transaction/00004.png and b/tests/snapshots/flex/test_trx_exchange_transaction/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_transaction/00005.png b/tests/snapshots/flex/test_trx_exchange_transaction/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_transaction/00005.png and b/tests/snapshots/flex/test_trx_exchange_transaction/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_withdraw/00000.png b/tests/snapshots/flex/test_trx_exchange_withdraw/00000.png
index f2224d87..d871f385 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_withdraw/00000.png and b/tests/snapshots/flex/test_trx_exchange_withdraw/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_withdraw/00001.png b/tests/snapshots/flex/test_trx_exchange_withdraw/00001.png
index 2c51cd59..a136e835 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_withdraw/00001.png and b/tests/snapshots/flex/test_trx_exchange_withdraw/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_withdraw/00002.png b/tests/snapshots/flex/test_trx_exchange_withdraw/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_withdraw/00002.png and b/tests/snapshots/flex/test_trx_exchange_withdraw/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_withdraw/00003.png b/tests/snapshots/flex/test_trx_exchange_withdraw/00003.png
index 2f4f46ca..1e6c79d5 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_withdraw/00003.png and b/tests/snapshots/flex/test_trx_exchange_withdraw/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_withdraw/00004.png b/tests/snapshots/flex/test_trx_exchange_withdraw/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_withdraw/00004.png and b/tests/snapshots/flex/test_trx_exchange_withdraw/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_exchange_withdraw/00005.png b/tests/snapshots/flex/test_trx_exchange_withdraw/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_exchange_withdraw/00005.png and b/tests/snapshots/flex/test_trx_exchange_withdraw/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_freezeV2_balance/00000.png b/tests/snapshots/flex/test_trx_freezeV2_balance/00000.png
index 3dbdbaef..5527bc6d 100644
Binary files a/tests/snapshots/flex/test_trx_freezeV2_balance/00000.png and b/tests/snapshots/flex/test_trx_freezeV2_balance/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_freezeV2_balance/00001.png b/tests/snapshots/flex/test_trx_freezeV2_balance/00001.png
index 5091ce2e..5ead85fb 100644
Binary files a/tests/snapshots/flex/test_trx_freezeV2_balance/00001.png and b/tests/snapshots/flex/test_trx_freezeV2_balance/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_freezeV2_balance/00002.png b/tests/snapshots/flex/test_trx_freezeV2_balance/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_freezeV2_balance/00002.png and b/tests/snapshots/flex/test_trx_freezeV2_balance/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_freezeV2_balance/00003.png b/tests/snapshots/flex/test_trx_freezeV2_balance/00003.png
index 302506ce..1fa43340 100644
Binary files a/tests/snapshots/flex/test_trx_freezeV2_balance/00003.png and b/tests/snapshots/flex/test_trx_freezeV2_balance/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_freezeV2_balance/00004.png b/tests/snapshots/flex/test_trx_freezeV2_balance/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_freezeV2_balance/00004.png and b/tests/snapshots/flex/test_trx_freezeV2_balance/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_freezeV2_balance/00005.png b/tests/snapshots/flex/test_trx_freezeV2_balance/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_freezeV2_balance/00005.png and b/tests/snapshots/flex/test_trx_freezeV2_balance/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_bw/00000.png b/tests/snapshots/flex/test_trx_freeze_balance_bw/00000.png
index 46baf2fc..0b509a41 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_bw/00000.png and b/tests/snapshots/flex/test_trx_freeze_balance_bw/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_bw/00001.png b/tests/snapshots/flex/test_trx_freeze_balance_bw/00001.png
index abdab327..4b819353 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_bw/00001.png and b/tests/snapshots/flex/test_trx_freeze_balance_bw/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_bw/00002.png b/tests/snapshots/flex/test_trx_freeze_balance_bw/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_bw/00002.png and b/tests/snapshots/flex/test_trx_freeze_balance_bw/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_bw/00003.png b/tests/snapshots/flex/test_trx_freeze_balance_bw/00003.png
index be64aaee..66ab618d 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_bw/00003.png and b/tests/snapshots/flex/test_trx_freeze_balance_bw/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_bw/00004.png b/tests/snapshots/flex/test_trx_freeze_balance_bw/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_bw/00004.png and b/tests/snapshots/flex/test_trx_freeze_balance_bw/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_bw/00005.png b/tests/snapshots/flex/test_trx_freeze_balance_bw/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_bw/00005.png and b/tests/snapshots/flex/test_trx_freeze_balance_bw/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00000.png b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00000.png
index 46baf2fc..0b509a41 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00000.png and b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00001.png b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00001.png
index 1e26cd15..c046fb7b 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00001.png and b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00002.png b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00002.png and b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00003.png b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00003.png
index be64aaee..66ab618d 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00003.png and b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00004.png b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00004.png and b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00005.png b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00005.png and b/tests/snapshots/flex/test_trx_freeze_balance_delegate_energy/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_energy/00000.png b/tests/snapshots/flex/test_trx_freeze_balance_energy/00000.png
index 46baf2fc..0b509a41 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_energy/00000.png and b/tests/snapshots/flex/test_trx_freeze_balance_energy/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_energy/00001.png b/tests/snapshots/flex/test_trx_freeze_balance_energy/00001.png
index a3ccfed9..fbb7fc6f 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_energy/00001.png and b/tests/snapshots/flex/test_trx_freeze_balance_energy/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_energy/00002.png b/tests/snapshots/flex/test_trx_freeze_balance_energy/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_energy/00002.png and b/tests/snapshots/flex/test_trx_freeze_balance_energy/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_energy/00003.png b/tests/snapshots/flex/test_trx_freeze_balance_energy/00003.png
index be64aaee..66ab618d 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_energy/00003.png and b/tests/snapshots/flex/test_trx_freeze_balance_energy/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_energy/00004.png b/tests/snapshots/flex/test_trx_freeze_balance_energy/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_energy/00004.png and b/tests/snapshots/flex/test_trx_freeze_balance_energy/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_freeze_balance_energy/00005.png b/tests/snapshots/flex/test_trx_freeze_balance_energy/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_freeze_balance_energy/00005.png and b/tests/snapshots/flex/test_trx_freeze_balance_energy/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_approve/00000.png b/tests/snapshots/flex/test_trx_proposal_approve/00000.png
index 838e1593..acb7d359 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_approve/00000.png and b/tests/snapshots/flex/test_trx_proposal_approve/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_approve/00001.png b/tests/snapshots/flex/test_trx_proposal_approve/00001.png
index f8ad19d5..207c80f3 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_approve/00001.png and b/tests/snapshots/flex/test_trx_proposal_approve/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_approve/00002.png b/tests/snapshots/flex/test_trx_proposal_approve/00002.png
index 8aaa376e..acc6cfa3 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_approve/00002.png and b/tests/snapshots/flex/test_trx_proposal_approve/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_approve/00003.png b/tests/snapshots/flex/test_trx_proposal_approve/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_approve/00003.png and b/tests/snapshots/flex/test_trx_proposal_approve/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_approve/00004.png b/tests/snapshots/flex/test_trx_proposal_approve/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_approve/00004.png and b/tests/snapshots/flex/test_trx_proposal_approve/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_create/00000.png b/tests/snapshots/flex/test_trx_proposal_create/00000.png
index 838e1593..acb7d359 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_create/00000.png and b/tests/snapshots/flex/test_trx_proposal_create/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_create/00001.png b/tests/snapshots/flex/test_trx_proposal_create/00001.png
index 7a4b832d..c2d7a159 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_create/00001.png and b/tests/snapshots/flex/test_trx_proposal_create/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_create/00002.png b/tests/snapshots/flex/test_trx_proposal_create/00002.png
index 8aaa376e..acc6cfa3 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_create/00002.png and b/tests/snapshots/flex/test_trx_proposal_create/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_create/00003.png b/tests/snapshots/flex/test_trx_proposal_create/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_create/00003.png and b/tests/snapshots/flex/test_trx_proposal_create/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_create/00004.png b/tests/snapshots/flex/test_trx_proposal_create/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_create/00004.png and b/tests/snapshots/flex/test_trx_proposal_create/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_delete/00000.png b/tests/snapshots/flex/test_trx_proposal_delete/00000.png
index 838e1593..acb7d359 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_delete/00000.png and b/tests/snapshots/flex/test_trx_proposal_delete/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_delete/00001.png b/tests/snapshots/flex/test_trx_proposal_delete/00001.png
index 975e901d..fbfb0ca5 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_delete/00001.png and b/tests/snapshots/flex/test_trx_proposal_delete/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_delete/00002.png b/tests/snapshots/flex/test_trx_proposal_delete/00002.png
index 8aaa376e..acc6cfa3 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_delete/00002.png and b/tests/snapshots/flex/test_trx_proposal_delete/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_delete/00003.png b/tests/snapshots/flex/test_trx_proposal_delete/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_delete/00003.png and b/tests/snapshots/flex/test_trx_proposal_delete/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_proposal_delete/00004.png b/tests/snapshots/flex/test_trx_proposal_delete/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_proposal_delete/00004.png and b/tests/snapshots/flex/test_trx_proposal_delete/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_send/00000.png b/tests/snapshots/flex/test_trx_send/00000.png
index a5a8b1bb..1dcc875e 100644
Binary files a/tests/snapshots/flex/test_trx_send/00000.png and b/tests/snapshots/flex/test_trx_send/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_send/00001.png b/tests/snapshots/flex/test_trx_send/00001.png
index 260cd937..2bf2240b 100644
Binary files a/tests/snapshots/flex/test_trx_send/00001.png and b/tests/snapshots/flex/test_trx_send/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_send/00002.png b/tests/snapshots/flex/test_trx_send/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_send/00002.png and b/tests/snapshots/flex/test_trx_send/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_send/00003.png b/tests/snapshots/flex/test_trx_send/00003.png
index be65232c..4f8fa38f 100644
Binary files a/tests/snapshots/flex/test_trx_send/00003.png and b/tests/snapshots/flex/test_trx_send/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_send/00004.png b/tests/snapshots/flex/test_trx_send/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_send/00004.png and b/tests/snapshots/flex/test_trx_send/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_send/00005.png b/tests/snapshots/flex/test_trx_send/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_send/00005.png and b/tests/snapshots/flex/test_trx_send/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_with_name/00000.png b/tests/snapshots/flex/test_trx_send_asset_with_name/00000.png
index a5a8b1bb..1dcc875e 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_with_name/00000.png and b/tests/snapshots/flex/test_trx_send_asset_with_name/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_with_name/00001.png b/tests/snapshots/flex/test_trx_send_asset_with_name/00001.png
index 6efcee00..3fdb545b 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_with_name/00001.png and b/tests/snapshots/flex/test_trx_send_asset_with_name/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_with_name/00002.png b/tests/snapshots/flex/test_trx_send_asset_with_name/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_with_name/00002.png and b/tests/snapshots/flex/test_trx_send_asset_with_name/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_with_name/00003.png b/tests/snapshots/flex/test_trx_send_asset_with_name/00003.png
index be65232c..4f8fa38f 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_with_name/00003.png and b/tests/snapshots/flex/test_trx_send_asset_with_name/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_with_name/00004.png b/tests/snapshots/flex/test_trx_send_asset_with_name/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_with_name/00004.png and b/tests/snapshots/flex/test_trx_send_asset_with_name/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_with_name/00005.png b/tests/snapshots/flex/test_trx_send_asset_with_name/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_with_name/00005.png and b/tests/snapshots/flex/test_trx_send_asset_with_name/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_without_name/00000.png b/tests/snapshots/flex/test_trx_send_asset_without_name/00000.png
index a5a8b1bb..1dcc875e 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_without_name/00000.png and b/tests/snapshots/flex/test_trx_send_asset_without_name/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_without_name/00001.png b/tests/snapshots/flex/test_trx_send_asset_without_name/00001.png
index 933bbe29..32f332aa 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_without_name/00001.png and b/tests/snapshots/flex/test_trx_send_asset_without_name/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_without_name/00002.png b/tests/snapshots/flex/test_trx_send_asset_without_name/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_without_name/00002.png and b/tests/snapshots/flex/test_trx_send_asset_without_name/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_without_name/00003.png b/tests/snapshots/flex/test_trx_send_asset_without_name/00003.png
index be65232c..4f8fa38f 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_without_name/00003.png and b/tests/snapshots/flex/test_trx_send_asset_without_name/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_without_name/00004.png b/tests/snapshots/flex/test_trx_send_asset_without_name/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_without_name/00004.png and b/tests/snapshots/flex/test_trx_send_asset_without_name/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_send_asset_without_name/00005.png b/tests/snapshots/flex/test_trx_send_asset_without_name/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_send_asset_without_name/00005.png and b/tests/snapshots/flex/test_trx_send_asset_without_name/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_send_permissioned/00000.png b/tests/snapshots/flex/test_trx_send_permissioned/00000.png
index a5a8b1bb..1dcc875e 100644
Binary files a/tests/snapshots/flex/test_trx_send_permissioned/00000.png and b/tests/snapshots/flex/test_trx_send_permissioned/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_send_permissioned/00001.png b/tests/snapshots/flex/test_trx_send_permissioned/00001.png
index 260cd937..2bf2240b 100644
Binary files a/tests/snapshots/flex/test_trx_send_permissioned/00001.png and b/tests/snapshots/flex/test_trx_send_permissioned/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_send_permissioned/00002.png b/tests/snapshots/flex/test_trx_send_permissioned/00002.png
index 4dd58130..8125dd09 100644
Binary files a/tests/snapshots/flex/test_trx_send_permissioned/00002.png and b/tests/snapshots/flex/test_trx_send_permissioned/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_send_permissioned/00003.png b/tests/snapshots/flex/test_trx_send_permissioned/00003.png
index be65232c..4f8fa38f 100644
Binary files a/tests/snapshots/flex/test_trx_send_permissioned/00003.png and b/tests/snapshots/flex/test_trx_send_permissioned/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_send_permissioned/00004.png b/tests/snapshots/flex/test_trx_send_permissioned/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_send_permissioned/00004.png and b/tests/snapshots/flex/test_trx_send_permissioned/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_send_permissioned/00005.png b/tests/snapshots/flex/test_trx_send_permissioned/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_send_permissioned/00005.png and b/tests/snapshots/flex/test_trx_send_permissioned/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_send_with_data_field/part1/00000.png b/tests/snapshots/flex/test_trx_send_with_data_field/part1/00000.png
index 4d75f674..de949fec 100644
Binary files a/tests/snapshots/flex/test_trx_send_with_data_field/part1/00000.png and b/tests/snapshots/flex/test_trx_send_with_data_field/part1/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_send_with_data_field/part1/00001.png b/tests/snapshots/flex/test_trx_send_with_data_field/part1/00001.png
index a5a8b1bb..1dcc875e 100644
Binary files a/tests/snapshots/flex/test_trx_send_with_data_field/part1/00001.png and b/tests/snapshots/flex/test_trx_send_with_data_field/part1/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00000.png b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00000.png
index a5a8b1bb..1dcc875e 100644
Binary files a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00000.png and b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00001.png b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00001.png
index 260cd937..2bf2240b 100644
Binary files a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00001.png and b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00002.png b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00002.png and b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00003.png b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00003.png
index be65232c..4f8fa38f 100644
Binary files a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00003.png and b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00004.png b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00004.png and b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00005.png b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_send_with_data_field/part2/00005.png and b/tests/snapshots/flex/test_trx_send_with_data_field/part2/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_send_wrong_path/00000.png b/tests/snapshots/flex/test_trx_send_wrong_path/00000.png
index a5a8b1bb..1dcc875e 100644
Binary files a/tests/snapshots/flex/test_trx_send_wrong_path/00000.png and b/tests/snapshots/flex/test_trx_send_wrong_path/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_send_wrong_path/00001.png b/tests/snapshots/flex/test_trx_send_wrong_path/00001.png
index 260cd937..2bf2240b 100644
Binary files a/tests/snapshots/flex/test_trx_send_wrong_path/00001.png and b/tests/snapshots/flex/test_trx_send_wrong_path/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_send_wrong_path/00002.png b/tests/snapshots/flex/test_trx_send_wrong_path/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_send_wrong_path/00002.png and b/tests/snapshots/flex/test_trx_send_wrong_path/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_send_wrong_path/00003.png b/tests/snapshots/flex/test_trx_send_wrong_path/00003.png
index be65232c..4f8fa38f 100644
Binary files a/tests/snapshots/flex/test_trx_send_wrong_path/00003.png and b/tests/snapshots/flex/test_trx_send_wrong_path/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_send_wrong_path/00004.png b/tests/snapshots/flex/test_trx_send_wrong_path/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_send_wrong_path/00004.png and b/tests/snapshots/flex/test_trx_send_wrong_path/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_send_wrong_path/00005.png b/tests/snapshots/flex/test_trx_send_wrong_path/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_send_wrong_path/00005.png and b/tests/snapshots/flex/test_trx_send_wrong_path/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_hash/00000.png b/tests/snapshots/flex/test_trx_sign_hash/00000.png
index 838e1593..acb7d359 100644
Binary files a/tests/snapshots/flex/test_trx_sign_hash/00000.png and b/tests/snapshots/flex/test_trx_sign_hash/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_hash/00001.png b/tests/snapshots/flex/test_trx_sign_hash/00001.png
index b7d8e46a..fee385c2 100644
Binary files a/tests/snapshots/flex/test_trx_sign_hash/00001.png and b/tests/snapshots/flex/test_trx_sign_hash/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_hash/00002.png b/tests/snapshots/flex/test_trx_sign_hash/00002.png
index 8aaa376e..acc6cfa3 100644
Binary files a/tests/snapshots/flex/test_trx_sign_hash/00002.png and b/tests/snapshots/flex/test_trx_sign_hash/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_hash/00003.png b/tests/snapshots/flex/test_trx_sign_hash/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_sign_hash/00003.png and b/tests/snapshots/flex/test_trx_sign_hash/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_hash/00004.png b/tests/snapshots/flex/test_trx_sign_hash/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_sign_hash/00004.png and b/tests/snapshots/flex/test_trx_sign_hash/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_message/00000.png b/tests/snapshots/flex/test_trx_sign_message/00000.png
index f97d209b..f2f2457b 100644
Binary files a/tests/snapshots/flex/test_trx_sign_message/00000.png and b/tests/snapshots/flex/test_trx_sign_message/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_message/00001.png b/tests/snapshots/flex/test_trx_sign_message/00001.png
index 4a8d64bf..d9f24898 100644
Binary files a/tests/snapshots/flex/test_trx_sign_message/00001.png and b/tests/snapshots/flex/test_trx_sign_message/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_message/00002.png b/tests/snapshots/flex/test_trx_sign_message/00002.png
index 95d11137..2b9bcbe5 100644
Binary files a/tests/snapshots/flex/test_trx_sign_message/00002.png and b/tests/snapshots/flex/test_trx_sign_message/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_message/00003.png b/tests/snapshots/flex/test_trx_sign_message/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_sign_message/00003.png and b/tests/snapshots/flex/test_trx_sign_message/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_message/00004.png b/tests/snapshots/flex/test_trx_sign_message/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_sign_message/00004.png and b/tests/snapshots/flex/test_trx_sign_message/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_tip712/00000.png b/tests/snapshots/flex/test_trx_sign_tip712/00000.png
index f97d209b..f2f2457b 100644
Binary files a/tests/snapshots/flex/test_trx_sign_tip712/00000.png and b/tests/snapshots/flex/test_trx_sign_tip712/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_tip712/00001.png b/tests/snapshots/flex/test_trx_sign_tip712/00001.png
index 4afcc936..243df442 100644
Binary files a/tests/snapshots/flex/test_trx_sign_tip712/00001.png and b/tests/snapshots/flex/test_trx_sign_tip712/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_tip712/00002.png b/tests/snapshots/flex/test_trx_sign_tip712/00002.png
index 95d11137..2b9bcbe5 100644
Binary files a/tests/snapshots/flex/test_trx_sign_tip712/00002.png and b/tests/snapshots/flex/test_trx_sign_tip712/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_tip712/00003.png b/tests/snapshots/flex/test_trx_sign_tip712/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_sign_tip712/00003.png and b/tests/snapshots/flex/test_trx_sign_tip712/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_sign_tip712/00004.png b/tests/snapshots/flex/test_trx_sign_tip712/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_sign_tip712/00004.png and b/tests/snapshots/flex/test_trx_sign_tip712/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_approve/00000.png b/tests/snapshots/flex/test_trx_trc20_approve/00000.png
index a5a8b1bb..1dcc875e 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_approve/00000.png and b/tests/snapshots/flex/test_trx_trc20_approve/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_approve/00001.png b/tests/snapshots/flex/test_trx_trc20_approve/00001.png
index 20adc992..30166481 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_approve/00001.png and b/tests/snapshots/flex/test_trx_trc20_approve/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_approve/00002.png b/tests/snapshots/flex/test_trx_trc20_approve/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_approve/00002.png and b/tests/snapshots/flex/test_trx_trc20_approve/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_approve/00003.png b/tests/snapshots/flex/test_trx_trc20_approve/00003.png
index be65232c..4f8fa38f 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_approve/00003.png and b/tests/snapshots/flex/test_trx_trc20_approve/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_approve/00004.png b/tests/snapshots/flex/test_trx_trc20_approve/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_approve/00004.png and b/tests/snapshots/flex/test_trx_trc20_approve/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_approve/00005.png b/tests/snapshots/flex/test_trx_trc20_approve/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_approve/00005.png and b/tests/snapshots/flex/test_trx_trc20_approve/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send/00000.png b/tests/snapshots/flex/test_trx_trc20_send/00000.png
index a5a8b1bb..1dcc875e 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_send/00000.png and b/tests/snapshots/flex/test_trx_trc20_send/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send/00001.png b/tests/snapshots/flex/test_trx_trc20_send/00001.png
index 8bcff954..30166481 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_send/00001.png and b/tests/snapshots/flex/test_trx_trc20_send/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send/00002.png b/tests/snapshots/flex/test_trx_trc20_send/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_send/00002.png and b/tests/snapshots/flex/test_trx_trc20_send/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send/00003.png b/tests/snapshots/flex/test_trx_trc20_send/00003.png
index be65232c..4f8fa38f 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_send/00003.png and b/tests/snapshots/flex/test_trx_trc20_send/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send/00004.png b/tests/snapshots/flex/test_trx_trc20_send/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_send/00004.png and b/tests/snapshots/flex/test_trx_trc20_send/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send/00005.png b/tests/snapshots/flex/test_trx_trc20_send/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_trc20_send/00005.png and b/tests/snapshots/flex/test_trx_trc20_send/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00000.png b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00000.png
new file mode 100644
index 00000000..1dcc875e
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00001.png b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00001.png
new file mode 100644
index 00000000..3e5b3799
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00002.png b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00002.png
new file mode 100644
index 00000000..6a8a81b6
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00003.png b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00003.png
new file mode 100644
index 00000000..4f8fa38f
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00004.png b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00004.png
new file mode 100644
index 00000000..435aa78b
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00005.png b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00005.png
new file mode 100644
index 00000000..fe45d728
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_e20_amount/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00000.png b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00000.png
new file mode 100644
index 00000000..1dcc875e
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00001.png b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00001.png
new file mode 100644
index 00000000..faf23829
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00002.png b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00002.png
new file mode 100644
index 00000000..6a8a81b6
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00003.png b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00003.png
new file mode 100644
index 00000000..4f8fa38f
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00004.png b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00004.png
new file mode 100644
index 00000000..435aa78b
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00005.png b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00005.png
new file mode 100644
index 00000000..fe45d728
Binary files /dev/null and b/tests/snapshots/flex/test_trx_trc20_send_zero_amount/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_undelegate_resource/00000.png b/tests/snapshots/flex/test_trx_undelegate_resource/00000.png
index d4b8751d..a8adb0bd 100644
Binary files a/tests/snapshots/flex/test_trx_undelegate_resource/00000.png and b/tests/snapshots/flex/test_trx_undelegate_resource/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_undelegate_resource/00001.png b/tests/snapshots/flex/test_trx_undelegate_resource/00001.png
index 37c7fdc8..9860aa98 100644
Binary files a/tests/snapshots/flex/test_trx_undelegate_resource/00001.png and b/tests/snapshots/flex/test_trx_undelegate_resource/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_undelegate_resource/00002.png b/tests/snapshots/flex/test_trx_undelegate_resource/00002.png
index d4d8ac05..8b79dcdf 100644
Binary files a/tests/snapshots/flex/test_trx_undelegate_resource/00002.png and b/tests/snapshots/flex/test_trx_undelegate_resource/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_undelegate_resource/00003.png b/tests/snapshots/flex/test_trx_undelegate_resource/00003.png
index aff73cb1..f25e2858 100644
Binary files a/tests/snapshots/flex/test_trx_undelegate_resource/00003.png and b/tests/snapshots/flex/test_trx_undelegate_resource/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_undelegate_resource/00004.png b/tests/snapshots/flex/test_trx_undelegate_resource/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_undelegate_resource/00004.png and b/tests/snapshots/flex/test_trx_undelegate_resource/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_undelegate_resource/00005.png b/tests/snapshots/flex/test_trx_undelegate_resource/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_undelegate_resource/00005.png and b/tests/snapshots/flex/test_trx_undelegate_resource/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00000.png b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00000.png
index 3c72fcd5..0f32d447 100644
Binary files a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00000.png and b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00001.png b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00001.png
index 37c7fdc8..9860aa98 100644
Binary files a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00001.png and b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00002.png b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00002.png and b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00003.png b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00003.png
index d9303f57..656df26e 100644
Binary files a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00003.png and b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00004.png b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00004.png and b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00005.png b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_unfreezeV2_balance/00005.png and b/tests/snapshots/flex/test_trx_unfreezeV2_balance/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00000.png b/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00000.png
index 5833a723..f830764b 100644
Binary files a/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00000.png and b/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00001.png b/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00001.png
index 25986037..4c903dd9 100644
Binary files a/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00001.png and b/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00002.png b/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00002.png
index 14897d52..20dd86b8 100644
Binary files a/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00002.png and b/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00003.png b/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00003.png and b/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00004.png b/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00004.png and b/tests/snapshots/flex/test_trx_unfreeze_balance_bw/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00000.png b/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00000.png
index 5833a723..f830764b 100644
Binary files a/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00000.png and b/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00001.png b/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00001.png
index 224d109c..4df6af33 100644
Binary files a/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00001.png and b/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00002.png b/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00002.png
index 14897d52..20dd86b8 100644
Binary files a/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00002.png and b/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00003.png b/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00003.png and b/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00004.png b/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00004.png and b/tests/snapshots/flex/test_trx_unfreeze_balance_delegate_energy/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_unknown_trc20_send/part1/00000.png b/tests/snapshots/flex/test_trx_unknown_trc20_send/part1/00000.png
index 372a556b..4adfc677 100644
Binary files a/tests/snapshots/flex/test_trx_unknown_trc20_send/part1/00000.png and b/tests/snapshots/flex/test_trx_unknown_trc20_send/part1/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_unknown_trc20_send/part1/00001.png b/tests/snapshots/flex/test_trx_unknown_trc20_send/part1/00001.png
index 52c47cba..bec2b6e0 100644
Binary files a/tests/snapshots/flex/test_trx_unknown_trc20_send/part1/00001.png and b/tests/snapshots/flex/test_trx_unknown_trc20_send/part1/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00000.png b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00000.png
index 52c47cba..bec2b6e0 100644
Binary files a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00000.png and b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00001.png b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00001.png
index 3bc0a59e..372881ba 100644
Binary files a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00001.png and b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00002.png b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00002.png
index 3234a084..6a8a81b6 100644
Binary files a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00002.png and b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00003.png b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00003.png
index 2f4f46ca..1e6c79d5 100644
Binary files a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00003.png and b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00004.png b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00004.png and b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00005.png b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00005.png and b/tests/snapshots/flex/test_trx_unknown_trc20_send/part2/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_vote_witness/00000.png b/tests/snapshots/flex/test_trx_vote_witness/00000.png
index e80f4e26..64b4777c 100644
Binary files a/tests/snapshots/flex/test_trx_vote_witness/00000.png and b/tests/snapshots/flex/test_trx_vote_witness/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_vote_witness/00001.png b/tests/snapshots/flex/test_trx_vote_witness/00001.png
index b43008fb..66fad99a 100644
Binary files a/tests/snapshots/flex/test_trx_vote_witness/00001.png and b/tests/snapshots/flex/test_trx_vote_witness/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_vote_witness/00002.png b/tests/snapshots/flex/test_trx_vote_witness/00002.png
index dd8136be..755687f1 100644
Binary files a/tests/snapshots/flex/test_trx_vote_witness/00002.png and b/tests/snapshots/flex/test_trx_vote_witness/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_vote_witness/00003.png b/tests/snapshots/flex/test_trx_vote_witness/00003.png
index 442865ab..9ebb206f 100644
Binary files a/tests/snapshots/flex/test_trx_vote_witness/00003.png and b/tests/snapshots/flex/test_trx_vote_witness/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_vote_witness/00004.png b/tests/snapshots/flex/test_trx_vote_witness/00004.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_vote_witness/00004.png and b/tests/snapshots/flex/test_trx_vote_witness/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_vote_witness/00005.png b/tests/snapshots/flex/test_trx_vote_witness/00005.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_vote_witness/00005.png and b/tests/snapshots/flex/test_trx_vote_witness/00005.png differ
diff --git a/tests/snapshots/flex/test_trx_withdraw_balance/00000.png b/tests/snapshots/flex/test_trx_withdraw_balance/00000.png
index ce7b7249..030874f7 100644
Binary files a/tests/snapshots/flex/test_trx_withdraw_balance/00000.png and b/tests/snapshots/flex/test_trx_withdraw_balance/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_withdraw_balance/00001.png b/tests/snapshots/flex/test_trx_withdraw_balance/00001.png
index 6753bd1d..423e30ca 100644
Binary files a/tests/snapshots/flex/test_trx_withdraw_balance/00001.png and b/tests/snapshots/flex/test_trx_withdraw_balance/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_withdraw_balance/00002.png b/tests/snapshots/flex/test_trx_withdraw_balance/00002.png
index 00ee60a9..e79f5374 100644
Binary files a/tests/snapshots/flex/test_trx_withdraw_balance/00002.png and b/tests/snapshots/flex/test_trx_withdraw_balance/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_withdraw_balance/00003.png b/tests/snapshots/flex/test_trx_withdraw_balance/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_withdraw_balance/00003.png and b/tests/snapshots/flex/test_trx_withdraw_balance/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_withdraw_balance/00004.png b/tests/snapshots/flex/test_trx_withdraw_balance/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_withdraw_balance/00004.png and b/tests/snapshots/flex/test_trx_withdraw_balance/00004.png differ
diff --git a/tests/snapshots/flex/test_trx_withdraw_unfreeze/00000.png b/tests/snapshots/flex/test_trx_withdraw_unfreeze/00000.png
index f8d4067b..8b1d623a 100644
Binary files a/tests/snapshots/flex/test_trx_withdraw_unfreeze/00000.png and b/tests/snapshots/flex/test_trx_withdraw_unfreeze/00000.png differ
diff --git a/tests/snapshots/flex/test_trx_withdraw_unfreeze/00001.png b/tests/snapshots/flex/test_trx_withdraw_unfreeze/00001.png
index 6753bd1d..423e30ca 100644
Binary files a/tests/snapshots/flex/test_trx_withdraw_unfreeze/00001.png and b/tests/snapshots/flex/test_trx_withdraw_unfreeze/00001.png differ
diff --git a/tests/snapshots/flex/test_trx_withdraw_unfreeze/00002.png b/tests/snapshots/flex/test_trx_withdraw_unfreeze/00002.png
index 6fc53e81..94088f12 100644
Binary files a/tests/snapshots/flex/test_trx_withdraw_unfreeze/00002.png and b/tests/snapshots/flex/test_trx_withdraw_unfreeze/00002.png differ
diff --git a/tests/snapshots/flex/test_trx_withdraw_unfreeze/00003.png b/tests/snapshots/flex/test_trx_withdraw_unfreeze/00003.png
index be51a9d5..435aa78b 100644
Binary files a/tests/snapshots/flex/test_trx_withdraw_unfreeze/00003.png and b/tests/snapshots/flex/test_trx_withdraw_unfreeze/00003.png differ
diff --git a/tests/snapshots/flex/test_trx_withdraw_unfreeze/00004.png b/tests/snapshots/flex/test_trx_withdraw_unfreeze/00004.png
index 8a75d8c4..fe45d728 100644
Binary files a/tests/snapshots/flex/test_trx_withdraw_unfreeze/00004.png and b/tests/snapshots/flex/test_trx_withdraw_unfreeze/00004.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_approve/00004.png b/tests/snapshots/nanosp/test_trx_trc20_approve/00004.png
index 1c361fd1..002022d9 100644
Binary files a/tests/snapshots/nanosp/test_trx_trc20_approve/00004.png and b/tests/snapshots/nanosp/test_trx_trc20_approve/00004.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00000.png b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00000.png
new file mode 100644
index 00000000..1776f453
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00000.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00001.png b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00001.png
new file mode 100644
index 00000000..6ca95744
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00001.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00002.png b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00002.png
new file mode 100644
index 00000000..d291f096
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00002.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00003.png b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00003.png
new file mode 100644
index 00000000..208526b5
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00003.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00004.png b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00004.png
new file mode 100644
index 00000000..002022d9
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00004.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00005.png b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00005.png
new file mode 100644
index 00000000..1366e8da
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00005.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00006.png b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00006.png
new file mode 100644
index 00000000..7f93c5f5
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_e20_amount/00006.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00000.png b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00000.png
new file mode 100644
index 00000000..1776f453
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00000.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00001.png b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00001.png
new file mode 100644
index 00000000..010852d8
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00001.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00002.png b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00002.png
new file mode 100644
index 00000000..d291f096
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00002.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00003.png b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00003.png
new file mode 100644
index 00000000..208526b5
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00003.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00004.png b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00004.png
new file mode 100644
index 00000000..002022d9
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00004.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00005.png b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00005.png
new file mode 100644
index 00000000..1366e8da
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00005.png differ
diff --git a/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00006.png b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00006.png
new file mode 100644
index 00000000..7f93c5f5
Binary files /dev/null and b/tests/snapshots/nanosp/test_trx_trc20_send_zero_amount/00006.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_approve/00004.png b/tests/snapshots/nanox/test_trx_trc20_approve/00004.png
index 1c361fd1..002022d9 100644
Binary files a/tests/snapshots/nanox/test_trx_trc20_approve/00004.png and b/tests/snapshots/nanox/test_trx_trc20_approve/00004.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00000.png b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00000.png
new file mode 100644
index 00000000..1776f453
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00000.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00001.png b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00001.png
new file mode 100644
index 00000000..6ca95744
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00001.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00002.png b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00002.png
new file mode 100644
index 00000000..d291f096
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00002.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00003.png b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00003.png
new file mode 100644
index 00000000..208526b5
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00003.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00004.png b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00004.png
new file mode 100644
index 00000000..002022d9
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00004.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00005.png b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00005.png
new file mode 100644
index 00000000..1366e8da
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00005.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00006.png b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00006.png
new file mode 100644
index 00000000..7f93c5f5
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_e20_amount/00006.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00000.png b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00000.png
new file mode 100644
index 00000000..1776f453
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00000.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00001.png b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00001.png
new file mode 100644
index 00000000..010852d8
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00001.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00002.png b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00002.png
new file mode 100644
index 00000000..d291f096
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00002.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00003.png b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00003.png
new file mode 100644
index 00000000..208526b5
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00003.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00004.png b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00004.png
new file mode 100644
index 00000000..002022d9
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00004.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00005.png b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00005.png
new file mode 100644
index 00000000..1366e8da
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00005.png differ
diff --git a/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00006.png b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00006.png
new file mode 100644
index 00000000..7f93c5f5
Binary files /dev/null and b/tests/snapshots/nanox/test_trx_trc20_send_zero_amount/00006.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00004.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00004.png
index 7a494786..ef044255 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00004.png and b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00004.png differ
diff --git a/tests/snapshots/stax/test_trx_account_update/00002.png b/tests/snapshots/stax/test_trx_account_update/00002.png
index 2be69205..7946355d 100644
Binary files a/tests/snapshots/stax/test_trx_account_update/00002.png and b/tests/snapshots/stax/test_trx_account_update/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_account_update/00003.png b/tests/snapshots/stax/test_trx_account_update/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_account_update/00003.png and b/tests/snapshots/stax/test_trx_account_update/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_custom_contract/part2/00002.png b/tests/snapshots/stax/test_trx_custom_contract/part2/00002.png
index 2be69205..7946355d 100644
Binary files a/tests/snapshots/stax/test_trx_custom_contract/part2/00002.png and b/tests/snapshots/stax/test_trx_custom_contract/part2/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_custom_contract/part2/00003.png b/tests/snapshots/stax/test_trx_custom_contract/part2/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_custom_contract/part2/00003.png and b/tests/snapshots/stax/test_trx_custom_contract/part2/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_delegate_resource/00003.png b/tests/snapshots/stax/test_trx_delegate_resource/00003.png
index 730125ea..196acc1d 100644
Binary files a/tests/snapshots/stax/test_trx_delegate_resource/00003.png and b/tests/snapshots/stax/test_trx_delegate_resource/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_delegate_resource/00004.png b/tests/snapshots/stax/test_trx_delegate_resource/00004.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_delegate_resource/00004.png and b/tests/snapshots/stax/test_trx_delegate_resource/00004.png differ
diff --git a/tests/snapshots/stax/test_trx_ecdh_key/00002.png b/tests/snapshots/stax/test_trx_ecdh_key/00002.png
index a0a5c903..862087e7 100644
Binary files a/tests/snapshots/stax/test_trx_ecdh_key/00002.png and b/tests/snapshots/stax/test_trx_ecdh_key/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_ecdh_key/00003.png b/tests/snapshots/stax/test_trx_ecdh_key/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_ecdh_key/00003.png and b/tests/snapshots/stax/test_trx_ecdh_key/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_exchange_create/00002.png b/tests/snapshots/stax/test_trx_exchange_create/00002.png
index c57f585c..1c3ccc1f 100644
Binary files a/tests/snapshots/stax/test_trx_exchange_create/00002.png and b/tests/snapshots/stax/test_trx_exchange_create/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_exchange_create/00003.png b/tests/snapshots/stax/test_trx_exchange_create/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_exchange_create/00003.png and b/tests/snapshots/stax/test_trx_exchange_create/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_exchange_create_with_token_name/00002.png b/tests/snapshots/stax/test_trx_exchange_create_with_token_name/00002.png
index c57f585c..1c3ccc1f 100644
Binary files a/tests/snapshots/stax/test_trx_exchange_create_with_token_name/00002.png and b/tests/snapshots/stax/test_trx_exchange_create_with_token_name/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_exchange_create_with_token_name/00003.png b/tests/snapshots/stax/test_trx_exchange_create_with_token_name/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_exchange_create_with_token_name/00003.png and b/tests/snapshots/stax/test_trx_exchange_create_with_token_name/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_exchange_inject/00002.png b/tests/snapshots/stax/test_trx_exchange_inject/00002.png
index 2be69205..7946355d 100644
Binary files a/tests/snapshots/stax/test_trx_exchange_inject/00002.png and b/tests/snapshots/stax/test_trx_exchange_inject/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_exchange_inject/00003.png b/tests/snapshots/stax/test_trx_exchange_inject/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_exchange_inject/00003.png and b/tests/snapshots/stax/test_trx_exchange_inject/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_exchange_transaction/00002.png b/tests/snapshots/stax/test_trx_exchange_transaction/00002.png
index 2be69205..7946355d 100644
Binary files a/tests/snapshots/stax/test_trx_exchange_transaction/00002.png and b/tests/snapshots/stax/test_trx_exchange_transaction/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_exchange_transaction/00003.png b/tests/snapshots/stax/test_trx_exchange_transaction/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_exchange_transaction/00003.png and b/tests/snapshots/stax/test_trx_exchange_transaction/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_exchange_withdraw/00002.png b/tests/snapshots/stax/test_trx_exchange_withdraw/00002.png
index 2be69205..7946355d 100644
Binary files a/tests/snapshots/stax/test_trx_exchange_withdraw/00002.png and b/tests/snapshots/stax/test_trx_exchange_withdraw/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_exchange_withdraw/00003.png b/tests/snapshots/stax/test_trx_exchange_withdraw/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_exchange_withdraw/00003.png and b/tests/snapshots/stax/test_trx_exchange_withdraw/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_freezeV2_balance/00002.png b/tests/snapshots/stax/test_trx_freezeV2_balance/00002.png
index 2f686b36..0434444f 100644
Binary files a/tests/snapshots/stax/test_trx_freezeV2_balance/00002.png and b/tests/snapshots/stax/test_trx_freezeV2_balance/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_freezeV2_balance/00003.png b/tests/snapshots/stax/test_trx_freezeV2_balance/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_freezeV2_balance/00003.png and b/tests/snapshots/stax/test_trx_freezeV2_balance/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_freeze_balance_bw/00002.png b/tests/snapshots/stax/test_trx_freeze_balance_bw/00002.png
index 6f660a97..86505971 100644
Binary files a/tests/snapshots/stax/test_trx_freeze_balance_bw/00002.png and b/tests/snapshots/stax/test_trx_freeze_balance_bw/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_freeze_balance_bw/00003.png b/tests/snapshots/stax/test_trx_freeze_balance_bw/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_freeze_balance_bw/00003.png and b/tests/snapshots/stax/test_trx_freeze_balance_bw/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_freeze_balance_delegate_energy/00002.png b/tests/snapshots/stax/test_trx_freeze_balance_delegate_energy/00002.png
index 6f660a97..86505971 100644
Binary files a/tests/snapshots/stax/test_trx_freeze_balance_delegate_energy/00002.png and b/tests/snapshots/stax/test_trx_freeze_balance_delegate_energy/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_freeze_balance_delegate_energy/00003.png b/tests/snapshots/stax/test_trx_freeze_balance_delegate_energy/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_freeze_balance_delegate_energy/00003.png and b/tests/snapshots/stax/test_trx_freeze_balance_delegate_energy/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_freeze_balance_energy/00002.png b/tests/snapshots/stax/test_trx_freeze_balance_energy/00002.png
index 6f660a97..86505971 100644
Binary files a/tests/snapshots/stax/test_trx_freeze_balance_energy/00002.png and b/tests/snapshots/stax/test_trx_freeze_balance_energy/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_freeze_balance_energy/00003.png b/tests/snapshots/stax/test_trx_freeze_balance_energy/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_freeze_balance_energy/00003.png and b/tests/snapshots/stax/test_trx_freeze_balance_energy/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_proposal_approve/00002.png b/tests/snapshots/stax/test_trx_proposal_approve/00002.png
index 2be69205..7946355d 100644
Binary files a/tests/snapshots/stax/test_trx_proposal_approve/00002.png and b/tests/snapshots/stax/test_trx_proposal_approve/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_proposal_approve/00003.png b/tests/snapshots/stax/test_trx_proposal_approve/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_proposal_approve/00003.png and b/tests/snapshots/stax/test_trx_proposal_approve/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_proposal_create/00002.png b/tests/snapshots/stax/test_trx_proposal_create/00002.png
index 2be69205..7946355d 100644
Binary files a/tests/snapshots/stax/test_trx_proposal_create/00002.png and b/tests/snapshots/stax/test_trx_proposal_create/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_proposal_create/00003.png b/tests/snapshots/stax/test_trx_proposal_create/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_proposal_create/00003.png and b/tests/snapshots/stax/test_trx_proposal_create/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_proposal_delete/00002.png b/tests/snapshots/stax/test_trx_proposal_delete/00002.png
index 2be69205..7946355d 100644
Binary files a/tests/snapshots/stax/test_trx_proposal_delete/00002.png and b/tests/snapshots/stax/test_trx_proposal_delete/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_proposal_delete/00003.png b/tests/snapshots/stax/test_trx_proposal_delete/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_proposal_delete/00003.png and b/tests/snapshots/stax/test_trx_proposal_delete/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_send/00002.png b/tests/snapshots/stax/test_trx_send/00002.png
index 2a3f717c..aa1d2ef2 100644
Binary files a/tests/snapshots/stax/test_trx_send/00002.png and b/tests/snapshots/stax/test_trx_send/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_send/00003.png b/tests/snapshots/stax/test_trx_send/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_send/00003.png and b/tests/snapshots/stax/test_trx_send/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_send_asset_with_name/00002.png b/tests/snapshots/stax/test_trx_send_asset_with_name/00002.png
index 2a3f717c..aa1d2ef2 100644
Binary files a/tests/snapshots/stax/test_trx_send_asset_with_name/00002.png and b/tests/snapshots/stax/test_trx_send_asset_with_name/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_send_asset_with_name/00003.png b/tests/snapshots/stax/test_trx_send_asset_with_name/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_send_asset_with_name/00003.png and b/tests/snapshots/stax/test_trx_send_asset_with_name/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_send_asset_without_name/00002.png b/tests/snapshots/stax/test_trx_send_asset_without_name/00002.png
index 2a3f717c..aa1d2ef2 100644
Binary files a/tests/snapshots/stax/test_trx_send_asset_without_name/00002.png and b/tests/snapshots/stax/test_trx_send_asset_without_name/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_send_asset_without_name/00003.png b/tests/snapshots/stax/test_trx_send_asset_without_name/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_send_asset_without_name/00003.png and b/tests/snapshots/stax/test_trx_send_asset_without_name/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_send_permissioned/00002.png b/tests/snapshots/stax/test_trx_send_permissioned/00002.png
index 2a3f717c..aa1d2ef2 100644
Binary files a/tests/snapshots/stax/test_trx_send_permissioned/00002.png and b/tests/snapshots/stax/test_trx_send_permissioned/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_send_permissioned/00003.png b/tests/snapshots/stax/test_trx_send_permissioned/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_send_permissioned/00003.png and b/tests/snapshots/stax/test_trx_send_permissioned/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_send_with_data_field/part2/00002.png b/tests/snapshots/stax/test_trx_send_with_data_field/part2/00002.png
index 2a3f717c..aa1d2ef2 100644
Binary files a/tests/snapshots/stax/test_trx_send_with_data_field/part2/00002.png and b/tests/snapshots/stax/test_trx_send_with_data_field/part2/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_send_with_data_field/part2/00003.png b/tests/snapshots/stax/test_trx_send_with_data_field/part2/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_send_with_data_field/part2/00003.png and b/tests/snapshots/stax/test_trx_send_with_data_field/part2/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_send_wrong_path/00002.png b/tests/snapshots/stax/test_trx_send_wrong_path/00002.png
index 2a3f717c..aa1d2ef2 100644
Binary files a/tests/snapshots/stax/test_trx_send_wrong_path/00002.png and b/tests/snapshots/stax/test_trx_send_wrong_path/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_send_wrong_path/00003.png b/tests/snapshots/stax/test_trx_send_wrong_path/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_send_wrong_path/00003.png and b/tests/snapshots/stax/test_trx_send_wrong_path/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_sign_hash/00002.png b/tests/snapshots/stax/test_trx_sign_hash/00002.png
index 2be69205..7946355d 100644
Binary files a/tests/snapshots/stax/test_trx_sign_hash/00002.png and b/tests/snapshots/stax/test_trx_sign_hash/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_sign_hash/00003.png b/tests/snapshots/stax/test_trx_sign_hash/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_sign_hash/00003.png and b/tests/snapshots/stax/test_trx_sign_hash/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_sign_message/00002.png b/tests/snapshots/stax/test_trx_sign_message/00002.png
index e298bf24..b1d82659 100644
Binary files a/tests/snapshots/stax/test_trx_sign_message/00002.png and b/tests/snapshots/stax/test_trx_sign_message/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_sign_message/00003.png b/tests/snapshots/stax/test_trx_sign_message/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_sign_message/00003.png and b/tests/snapshots/stax/test_trx_sign_message/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_sign_tip712/00002.png b/tests/snapshots/stax/test_trx_sign_tip712/00002.png
index e298bf24..b1d82659 100644
Binary files a/tests/snapshots/stax/test_trx_sign_tip712/00002.png and b/tests/snapshots/stax/test_trx_sign_tip712/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_sign_tip712/00003.png b/tests/snapshots/stax/test_trx_sign_tip712/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_sign_tip712/00003.png and b/tests/snapshots/stax/test_trx_sign_tip712/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_approve/00001.png b/tests/snapshots/stax/test_trx_trc20_approve/00001.png
index 94994e34..38fbe8c8 100644
Binary files a/tests/snapshots/stax/test_trx_trc20_approve/00001.png and b/tests/snapshots/stax/test_trx_trc20_approve/00001.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_approve/00002.png b/tests/snapshots/stax/test_trx_trc20_approve/00002.png
index 2a3f717c..aa1d2ef2 100644
Binary files a/tests/snapshots/stax/test_trx_trc20_approve/00002.png and b/tests/snapshots/stax/test_trx_trc20_approve/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_approve/00003.png b/tests/snapshots/stax/test_trx_trc20_approve/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_trc20_approve/00003.png and b/tests/snapshots/stax/test_trx_trc20_approve/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send/00002.png b/tests/snapshots/stax/test_trx_trc20_send/00002.png
index 2a3f717c..aa1d2ef2 100644
Binary files a/tests/snapshots/stax/test_trx_trc20_send/00002.png and b/tests/snapshots/stax/test_trx_trc20_send/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send/00003.png b/tests/snapshots/stax/test_trx_trc20_send/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_trc20_send/00003.png and b/tests/snapshots/stax/test_trx_trc20_send/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00000.png b/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00000.png
new file mode 100644
index 00000000..b5306c98
Binary files /dev/null and b/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00000.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00001.png b/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00001.png
new file mode 100644
index 00000000..9d0b91a5
Binary files /dev/null and b/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00001.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00002.png b/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00002.png
new file mode 100644
index 00000000..aa1d2ef2
Binary files /dev/null and b/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00003.png b/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00003.png
new file mode 100644
index 00000000..ceda6a87
Binary files /dev/null and b/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00004.png b/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00004.png
new file mode 100644
index 00000000..5acaf79d
Binary files /dev/null and b/tests/snapshots/stax/test_trx_trc20_send_e20_amount/00004.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00000.png b/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00000.png
new file mode 100644
index 00000000..b5306c98
Binary files /dev/null and b/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00000.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00001.png b/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00001.png
new file mode 100644
index 00000000..d841103b
Binary files /dev/null and b/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00001.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00002.png b/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00002.png
new file mode 100644
index 00000000..aa1d2ef2
Binary files /dev/null and b/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00003.png b/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00003.png
new file mode 100644
index 00000000..ceda6a87
Binary files /dev/null and b/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00004.png b/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00004.png
new file mode 100644
index 00000000..5acaf79d
Binary files /dev/null and b/tests/snapshots/stax/test_trx_trc20_send_zero_amount/00004.png differ
diff --git a/tests/snapshots/stax/test_trx_undelegate_resource/00002.png b/tests/snapshots/stax/test_trx_undelegate_resource/00002.png
index 9876736d..4ec0a5f1 100644
Binary files a/tests/snapshots/stax/test_trx_undelegate_resource/00002.png and b/tests/snapshots/stax/test_trx_undelegate_resource/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_undelegate_resource/00003.png b/tests/snapshots/stax/test_trx_undelegate_resource/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_undelegate_resource/00003.png and b/tests/snapshots/stax/test_trx_undelegate_resource/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_unfreezeV2_balance/00002.png b/tests/snapshots/stax/test_trx_unfreezeV2_balance/00002.png
index 79623bb8..17c51e83 100644
Binary files a/tests/snapshots/stax/test_trx_unfreezeV2_balance/00002.png and b/tests/snapshots/stax/test_trx_unfreezeV2_balance/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_unfreezeV2_balance/00003.png b/tests/snapshots/stax/test_trx_unfreezeV2_balance/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_unfreezeV2_balance/00003.png and b/tests/snapshots/stax/test_trx_unfreezeV2_balance/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_unfreeze_balance_bw/00002.png b/tests/snapshots/stax/test_trx_unfreeze_balance_bw/00002.png
index 01f0e8e7..d443f5a8 100644
Binary files a/tests/snapshots/stax/test_trx_unfreeze_balance_bw/00002.png and b/tests/snapshots/stax/test_trx_unfreeze_balance_bw/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_unfreeze_balance_bw/00003.png b/tests/snapshots/stax/test_trx_unfreeze_balance_bw/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_unfreeze_balance_bw/00003.png and b/tests/snapshots/stax/test_trx_unfreeze_balance_bw/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_unfreeze_balance_delegate_energy/00002.png b/tests/snapshots/stax/test_trx_unfreeze_balance_delegate_energy/00002.png
index 01f0e8e7..d443f5a8 100644
Binary files a/tests/snapshots/stax/test_trx_unfreeze_balance_delegate_energy/00002.png and b/tests/snapshots/stax/test_trx_unfreeze_balance_delegate_energy/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_unfreeze_balance_delegate_energy/00003.png b/tests/snapshots/stax/test_trx_unfreeze_balance_delegate_energy/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_unfreeze_balance_delegate_energy/00003.png and b/tests/snapshots/stax/test_trx_unfreeze_balance_delegate_energy/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_unknown_trc20_send/part2/00002.png b/tests/snapshots/stax/test_trx_unknown_trc20_send/part2/00002.png
index 2be69205..7946355d 100644
Binary files a/tests/snapshots/stax/test_trx_unknown_trc20_send/part2/00002.png and b/tests/snapshots/stax/test_trx_unknown_trc20_send/part2/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_unknown_trc20_send/part2/00003.png b/tests/snapshots/stax/test_trx_unknown_trc20_send/part2/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_unknown_trc20_send/part2/00003.png and b/tests/snapshots/stax/test_trx_unknown_trc20_send/part2/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_vote_witness/00003.png b/tests/snapshots/stax/test_trx_vote_witness/00003.png
index 26442b38..21c14086 100644
Binary files a/tests/snapshots/stax/test_trx_vote_witness/00003.png and b/tests/snapshots/stax/test_trx_vote_witness/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_vote_witness/00004.png b/tests/snapshots/stax/test_trx_vote_witness/00004.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_vote_witness/00004.png and b/tests/snapshots/stax/test_trx_vote_witness/00004.png differ
diff --git a/tests/snapshots/stax/test_trx_withdraw_balance/00002.png b/tests/snapshots/stax/test_trx_withdraw_balance/00002.png
index 0e91dc7d..8d446f2a 100644
Binary files a/tests/snapshots/stax/test_trx_withdraw_balance/00002.png and b/tests/snapshots/stax/test_trx_withdraw_balance/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_withdraw_balance/00003.png b/tests/snapshots/stax/test_trx_withdraw_balance/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_withdraw_balance/00003.png and b/tests/snapshots/stax/test_trx_withdraw_balance/00003.png differ
diff --git a/tests/snapshots/stax/test_trx_withdraw_unfreeze/00002.png b/tests/snapshots/stax/test_trx_withdraw_unfreeze/00002.png
index 9008f85e..e89f552b 100644
Binary files a/tests/snapshots/stax/test_trx_withdraw_unfreeze/00002.png and b/tests/snapshots/stax/test_trx_withdraw_unfreeze/00002.png differ
diff --git a/tests/snapshots/stax/test_trx_withdraw_unfreeze/00003.png b/tests/snapshots/stax/test_trx_withdraw_unfreeze/00003.png
index 392165d4..ceda6a87 100644
Binary files a/tests/snapshots/stax/test_trx_withdraw_unfreeze/00003.png and b/tests/snapshots/stax/test_trx_withdraw_unfreeze/00003.png differ
diff --git a/tests/test_trx.py b/tests/test_trx.py
index 8db27e1d..47a56690 100644
--- a/tests/test_trx.py
+++ b/tests/test_trx.py
@@ -2,6 +2,8 @@
 '''
 Usage: pytest -v -s ./tests/test_trx.py
 '''
+from decimal import Decimal
+
 import pytest
 import sys
 import struct
@@ -15,7 +17,7 @@
 from inspect import currentframe
 from tron import TronClient, Errors, CLA, InsType
 from ragger.bip import pack_derivation_path
-from utils import check_tx_signature, check_hash_signature
+from utils import check_tx_signature, check_hash_signature, build_trc20_calldata
 from eth_keys import KeyAPI
 '''
 Tron Protobuf
@@ -436,6 +438,8 @@ def test_trx_account_update(self, backend, firmware, navigator):
 
     def test_trx_trc20_send(self, backend, firmware, navigator):
         client = TronClient(backend, firmware, navigator)
+        tx_calldata = build_trc20_calldata(
+            "364b03e0815687edaf90b81ff58e496dea7383d7", Decimal(1000000))
         tx = client.packContract(
             tron.Transaction.Contract.TriggerSmartContract,
             contract.TriggerSmartContract(
@@ -443,13 +447,43 @@ def test_trx_trc20_send(self, backend, firmware, navigator):
                     client.getAccount(0)['addressHex']),
                 contract_address=bytes.fromhex(
                     client.address_hex("TBoTZcARzWVgnNuB9SyE3S5g1RwsXoQL16")),
-                data=bytes.fromhex(
-                    "a9059cbb000000000000000000000000364b03e0815687edaf90b81ff58e496dea7383d700000000000000000000000000000000000000000000000000000000000f4240"
-                )))
+                data=tx_calldata))
+        self.sign_and_validate(client, firmware, 0, tx)
+
+    def test_trx_trc20_send_zero_amount(self, backend, firmware, navigator):
+        client = TronClient(backend, firmware, navigator)
+        tx_calldata = build_trc20_calldata(
+            "364b03e0815687edaf90b81ff58e496dea7383d7", Decimal(0))
+        print(tx_calldata)
+        tx = client.packContract(
+            tron.Transaction.Contract.TriggerSmartContract,
+            contract.TriggerSmartContract(
+                owner_address=bytes.fromhex(
+                    client.getAccount(0)['addressHex']),
+                contract_address=bytes.fromhex(
+                    client.address_hex("TKkeiboTkxXKJpbmVFbv4a8ov5rAfRDMf9")),
+                data=tx_calldata))
+        self.sign_and_validate(client, firmware, 0, tx)
+
+    def test_trx_trc20_send_e20_amount(self, backend, firmware, navigator):
+        client = TronClient(backend, firmware, navigator)
+        tx_calldata = build_trc20_calldata(
+            "364b03e0815687edaf90b81ff58e496dea7383d7",
+            Decimal(3.1415 * 10**21))
+        tx = client.packContract(
+            tron.Transaction.Contract.TriggerSmartContract,
+            contract.TriggerSmartContract(
+                owner_address=bytes.fromhex(
+                    client.getAccount(0)['addressHex']),
+                contract_address=bytes.fromhex(
+                    client.address_hex("TKkeiboTkxXKJpbmVFbv4a8ov5rAfRDMf9")),
+                data=tx_calldata))
         self.sign_and_validate(client, firmware, 0, tx)
 
     def test_trx_trc20_approve(self, backend, firmware, navigator):
         client = TronClient(backend, firmware, navigator)
+        tx_calldata = build_trc20_calldata(
+            "364b03e0815687edaf90b81ff58e496dea7383d7", Decimal(1000000))
         tx = client.packContract(
             tron.Transaction.Contract.TriggerSmartContract,
             contract.TriggerSmartContract(
@@ -457,9 +491,7 @@ def test_trx_trc20_approve(self, backend, firmware, navigator):
                     client.getAccount(0)['addressHex']),
                 contract_address=bytes.fromhex(
                     client.address_hex("TBoTZcARzWVgnNuB9SyE3S5g1RwsXoQL16")),
-                data=bytes.fromhex(
-                    "095ea7b3000000000000000000000000364b03e0815687edaf90b81ff58e496dea7383d700000000000000000000000000000000000000000000000000000000000f4240"
-                )))
+                data=tx_calldata))
         self.sign_and_validate(client, firmware, 0, tx)
 
     def test_trx_sign_message(self, backend, firmware, navigator):
diff --git a/tests/utils.py b/tests/utils.py
index 75116cc5..599f46ad 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,7 +1,9 @@
+import hashlib
+from decimal import Decimal
+
 from eth_keys import KeyAPI
-from eth_keys.datatypes import Signature
 from eth_keys.datatypes import PublicKey
-import hashlib
+from eth_keys.datatypes import Signature
 
 
 def check_hash_signature(txID, signature, public_key):
@@ -14,3 +16,19 @@ def check_hash_signature(txID, signature, public_key):
 def check_tx_signature(transaction, signature, public_key):
     txID = hashlib.sha256(transaction).digest()
     return check_hash_signature(txID, signature, public_key)
+
+
+def build_trc20_calldata(to_address_hex: str, amount: Decimal):
+    # Function selector for transfer(address,uint256)
+    selector = bytes.fromhex("a9059cbb")
+
+    # Remove '41' prefix if present, then pad to 32 bytes
+    clean_address = to_address_hex[2:] if to_address_hex.startswith(
+        "41") else to_address_hex
+    address_bytes = bytes.fromhex(clean_address).rjust(32, b'\x00')
+
+    # Convert Decimal to integer, then to 32-byte big-endian
+    amount_int = int(amount)
+    amount_bytes = amount_int.to_bytes(32, 'big')
+
+    return selector + address_bytes + amount_bytes