diff --git a/.github/workflows/codeql_checks.yml b/.github/workflows/codeql_checks.yml
index 00282cca..de434edf 100644
--- a/.github/workflows/codeql_checks.yml
+++ b/.github/workflows/codeql_checks.yml
@@ -16,8 +16,9 @@ jobs:
   analyse:
     name: Analyse
     strategy:
+      fail-fast: false
       matrix:
-        sdk: ["$NANOS_SDK", "$NANOX_SDK", "$NANOSP_SDK", "$STAX_SDK"]
+        sdk: ["$NANOS_SDK", "$NANOX_SDK", "$NANOSP_SDK", "$STAX_SDK", "$FLEX_SDK"]
         #'cpp' covers C and C++
         language: ["cpp"]
     runs-on: ubuntu-latest
@@ -26,12 +27,12 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: security-and-quality
@@ -42,4 +43,4 @@ jobs:
           make BOLOS_SDK=${{ matrix.sdk }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/misspellings_checks.yml b/.github/workflows/misspellings_checks.yml
index b23be219..360eb461 100644
--- a/.github/workflows/misspellings_checks.yml
+++ b/.github/workflows/misspellings_checks.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Check misspellings
         uses: codespell-project/actions-codespell@v2
diff --git a/.github/workflows/python_client_checks.yml b/.github/workflows/python_client_checks.yml
index 6b5138cd..243c4f1e 100644
--- a/.github/workflows/python_client_checks.yml
+++ b/.github/workflows/python_client_checks.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Installing PIP dependencies
         run: |
           pip install pylint
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Installing PIP dependencies
         run: |
           pip install mypy
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index e17c2fd5..9f4e47f0 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
diff --git a/.gitignore b/.gitignore
index fb689905..69559820 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ __pycache__/
 tests/build/
 build/
 tests/snapshots-tmp
+venv/
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 1bab6f70..02a71c27 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -1,7 +1,6 @@
 {
   "env": {
-    "BOLOS_SDK": "/opt/nanos-secure-sdk",
-    "BOLOS_ENV": "/opt/bolos-devenv"
+    "BOLOS_SDK": "/opt/nanos-secure-sdk"
   },
   "configurations": [
     {
@@ -35,10 +34,8 @@
         "HAVE_PRINTF",
         "PRINTF=screen_printf"
       ],
-      "compilerPath": "${env:BOLOS_ENV}/gcc-arm-none-eabi-5_3-2016q1/bin/arm-none-eabi-gcc",
       "cStandard": "c11",
       "cppStandard": "c++17",
-      "intelliSenseMode": "gcc-arm",
       "browse": {
         "limitSymbolsToIncludedHeaders": true,
         "databaseFilename": ""
diff --git a/Makefile b/Makefile
index 273bad49..7d69c056 100755
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,8 @@ include $(BOLOS_SDK)/Makefile.defines
 APPNAME = XRP
 
 APPVERSION_M=2
-APPVERSION_N=3
-APPVERSION_P=2
+APPVERSION_N=4
+APPVERSION_P=0
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 
 # Application source files
@@ -43,6 +43,7 @@ ICON_NANOS = img/nanos_app_xrp.gif
 ICON_NANOX = img/nanox_app_xrp.gif
 ICON_NANOSP = img/nanox_app_xrp.gif
 ICON_STAX = img/stax_app_xrp.gif
+ICON_FLEX = img/flex_app_xrp.gif
 
 # Application allowed derivation curves.
 # Possibles curves are: secp256k1, secp256r1, ed25519 and bls12381g1
diff --git a/img/flex_app_xrp.gif b/img/flex_app_xrp.gif
new file mode 100644
index 00000000..6fa19283
Binary files /dev/null and b/img/flex_app_xrp.gif differ
diff --git a/ledger_app.toml b/ledger_app.toml
index 25a4edc2..396eee1c 100644
--- a/ledger_app.toml
+++ b/ledger_app.toml
@@ -1,7 +1,7 @@
 [app]
 build_directory = "./"
 sdk = "C"
-devices = ["nanos", "nanox", "nanos+", "stax"]
+devices = ["nanos", "nanox", "nanos+", "stax", "flex"]
 
 [tests]
 unit_directory = "./tests/"
diff --git a/src/limitations.h b/src/limitations.h
index 4fde5d29..9cae0774 100644
--- a/src/limitations.h
+++ b/src/limitations.h
@@ -32,20 +32,20 @@
 // Hardware dependent limits
 //   Ledger Nano X has 30K RAM
 //   Ledger Nano S has 4K RAM
-#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX)
-
-#define MAX_FIELD_COUNT        60
-#define MAX_FIELD_LEN          1024
-#define MAX_RAW_TX             10000
-#define DISPLAY_SEGMENTED_ADDR false
-
-#elif defined(TARGET_NANOS)
+#if defined(TARGET_NANOS)
 
 #define MAX_FIELD_COUNT        24
 #define MAX_FIELD_LEN          128
 #define MAX_RAW_TX             800
 #define DISPLAY_SEGMENTED_ADDR true
 
+#else
+
+#define MAX_FIELD_COUNT        60
+#define MAX_FIELD_LEN          1024
+#define MAX_RAW_TX             10000
+#define DISPLAY_SEGMENTED_ADDR false
+
 #endif
 
 #endif  // LEDGER_APP_XRP_LIMITATIONS_H
diff --git a/src/ui/address/address_ui_nbgl.c b/src/ui/address/address_ui_nbgl.c
index e3814a94..34cbd40e 100644
--- a/src/ui/address/address_ui_nbgl.c
+++ b/src/ui/address/address_ui_nbgl.c
@@ -30,10 +30,10 @@ static action_t rejection_action;
 static void confirmationChoiceClbk(bool confirm) {
     if (confirm) {
         approval_action();
-        nbgl_useCaseStatus("ADDRESS\nVERIFIED", true, display_idle_menu);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_ADDRESS_VERIFIED, display_idle_menu);
     } else {
         rejection_action();
-        nbgl_useCaseStatus("Address verification\ncancelled", false, display_idle_menu);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_ADDRESS_REJECTED, display_idle_menu);
     }
 }
 
@@ -42,6 +42,11 @@ void display_address_confirmation_ui(char* address, action_t on_approve, action_
     rejection_action = on_reject;
     memset(full_address, 0, sizeof(full_address));
     strncpy(full_address, address, sizeof(full_address));
-    nbgl_useCaseAddressConfirmation((char*) full_address, confirmationChoiceClbk);
+    nbgl_useCaseAddressReview((char*) full_address,
+                              NULL,
+                              &C_icon_XRP_64px,
+                              "Verify XRP Address",
+                              NULL,
+                              confirmationChoiceClbk);
 }
 #endif  // HAVE_NBGL
diff --git a/src/ui/main/idle_menu_nbgl.c b/src/ui/main/idle_menu_nbgl.c
index 84a1f854..cfa6e8dd 100644
--- a/src/ui/main/idle_menu_nbgl.c
+++ b/src/ui/main/idle_menu_nbgl.c
@@ -25,31 +25,23 @@
 static const char* const infoTypes[] = {"Version", "Developer"};
 static const char* const infoContents[] = {APPVERSION, "Ledger"};
 
-static void display_about_menu();
-static bool about_nav_clbk(uint8_t page, nbgl_pageContent_t* content);
-static void on_quit_clbk(void);
-
-static bool about_nav_clbk(uint8_t page, nbgl_pageContent_t* content) {
-    if (page == 0) {
-        content->type = INFOS_LIST;
-        content->infosList.nbInfos = NB_INFO_FIELDS;
-        content->infosList.infoTypes = (const char**) infoTypes;
-        content->infosList.infoContents = (const char**) infoContents;
-    } else {
-        return false;
-    }
-    return true;
-}
-
-static void display_about_menu(void) {
-    nbgl_useCaseSettings(APPNAME, 0, 1, false, display_idle_menu, about_nav_clbk, NULL);
-}
-
 static void on_quit_clbk(void) {
     os_sched_exit(-1);
 }
 
 void display_idle_menu() {
-    nbgl_useCaseHome(APPNAME, &C_icon_XRP_64px, NULL, true, display_about_menu, on_quit_clbk);
+    static nbgl_contentInfoList_t infosList = {0};
+
+    infosList.nbInfos = NB_INFO_FIELDS;
+    infosList.infoTypes = (const char**) infoTypes;
+    infosList.infoContents = (const char**) infoContents;
+    nbgl_useCaseHomeAndSettings(APPNAME,
+                                &C_icon_XRP_64px,
+                                NULL,
+                                INIT_HOME_PAGE,
+                                NULL,
+                                &infosList,
+                                NULL,
+                                on_quit_clbk);
 }
 #endif  // HAVE_NBGL
diff --git a/src/ui/transaction/review_menu_nbgl.c b/src/ui/transaction/review_menu_nbgl.c
index 2371d692..fe3b48b7 100644
--- a/src/ui/transaction/review_menu_nbgl.c
+++ b/src/ui/transaction/review_menu_nbgl.c
@@ -15,11 +15,7 @@
  *  limitations under the License.
  ********************************************************************************/
 #ifdef HAVE_NBGL
-#include <os.h>
-#include <string.h>
 #include <ux.h>
-#include "global.h"
-#include "transaction.h"
 #include "fmt.h"
 #include "idle_menu.h"
 #include "review_menu.h"
@@ -29,45 +25,11 @@
 
 // Globals
 static field_value_t txFieldValueStrings[MAX_FIELDS_PER_PAGE];
-static nbgl_layoutTagValue_t pair;
-static nbgl_layoutTagValueList_t pairList;
-static nbgl_pageInfoLongPress_t infoLongPress;
+static nbgl_contentTagValue_t pair;
+static nbgl_contentTagValueList_t pairList;
 static parseResult_t *transaction;
 static resultAction_t approval_menu_callback;
 
-// Static functions declarations
-static nbgl_layoutTagValue_t *getPair(uint8_t index);
-static void reviewStart(void);
-static void displayTransaction(void);
-static void reviewChoice(bool confirm);
-static void rejectConfirmation(void);
-static void rejectChoice(void);
-
-// Static functions definitions
-static void reviewStart(void) {
-    // Reset globals
-    memset(&infoLongPress, 0, sizeof(infoLongPress));
-    memset(&txFieldValueStrings, 0, sizeof(txFieldValueStrings));
-    memset(&pair, 0, sizeof(pair));
-
-    infoLongPress.text = "Confirm Transaction";
-    infoLongPress.longPressText = "Hold to confirm";
-    infoLongPress.icon = &C_icon_XRP_64px;
-
-    pairList.pairs = NULL;
-    pairList.nbPairs = transaction->num_fields;
-    pairList.nbMaxLinesForValue = 0;
-    pairList.callback = getPair;
-    pairList.startIndex = 0;
-
-    nbgl_useCaseReviewStart(&C_icon_XRP_64px,
-                            "Review transaction",
-                            NULL,
-                            "Reject",
-                            displayTransaction,
-                            rejectChoice);
-}
-
 // function called by NBGL to get the pair indexed by "index"
 static nbgl_layoutTagValue_t *getPair(uint8_t index) {
     uint8_t arr_idx = index % MAX_FIELDS_PER_PAGE;
@@ -86,36 +48,36 @@ static nbgl_layoutTagValue_t *getPair(uint8_t index) {
     return &pair;
 }
 
-static void displayTransaction(void) {
-    nbgl_useCaseStaticReview(&pairList, &infoLongPress, "Reject", reviewChoice);
-}
-
 static void reviewChoice(bool confirm) {
     if (confirm) {
-        nbgl_useCaseStatus("TRANSACTION\nCONFIRMED", true, display_idle_menu);
         approval_menu_callback(OPTION_SIGN);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_TRANSACTION_SIGNED, display_idle_menu);
     } else {
-        rejectChoice();
+        approval_menu_callback(OPTION_REJECT);
+        nbgl_useCaseReviewStatus(STATUS_TYPE_TRANSACTION_REJECTED, display_idle_menu);
     }
 }
 
-static void rejectConfirmation(void) {
-    nbgl_useCaseStatus("Transaction rejected", false, display_idle_menu);
-    approval_menu_callback(OPTION_REJECT);
-}
-
-static void rejectChoice(void) {
-    nbgl_useCaseConfirm("Reject transaction?",
-                        NULL,
-                        "Yes, Reject",
-                        "Go back to transaction",
-                        rejectConfirmation);
-}
-
 void display_review_menu(parseResult_t *transaction_param, resultAction_t callback) {
     transaction = transaction_param;
     approval_menu_callback = callback;
-    // Prepare and display transaction
-    reviewStart();
+
+    // Reset globals
+    memset(&txFieldValueStrings, 0, sizeof(txFieldValueStrings));
+    memset(&pair, 0, sizeof(pair));
+
+    pairList.pairs = NULL;
+    pairList.nbPairs = transaction->num_fields;
+    pairList.nbMaxLinesForValue = 0;
+    pairList.callback = getPair;
+    pairList.startIndex = 0;
+
+    nbgl_useCaseReview(TYPE_TRANSACTION,
+                       &pairList,
+                       &C_icon_XRP_64px,
+                       "Review transaction",
+                       NULL,
+                       "Sign transaction",
+                       reviewChoice);
 }
 #endif  // HAVE_NBGL
diff --git a/tests/functional_test.py b/tests/functional_test.py
index f7997214..7438a9ff 100755
--- a/tests/functional_test.py
+++ b/tests/functional_test.py
@@ -7,21 +7,27 @@
 from pathlib import Path
 import pytest
 from ledgerwallet.params import Bip32Path  # type: ignore [import]
-from ragger.backend import RaisePolicy
+from ragger.backend import BackendInterface, RaisePolicy
+from ragger.firmware import Firmware
+from ragger.navigator import Navigator
+from ragger.navigator.navigation_scenario import NavigateWithScenario
 from ragger.bip import calculate_public_key_and_chaincode, CurveChoice
 from ragger.error import ExceptionRAPDU
 from .xrp import XRPClient, Errors
-from .utils import DEFAULT_PATH, DEFAULT_BIP32_PATH, util_navigate
+from .utils import DEFAULT_PATH, DEFAULT_BIP32_PATH
 from .utils import verify_ecdsa_secp256k1, verify_version
 
 
-def test_app_configuration(backend, firmware, navigator):
+def test_app_configuration(backend: BackendInterface,
+                           firmware: Firmware,
+                           navigator: Navigator,
+                           default_screenshot_path: Path):
     xrp = XRPClient(backend, firmware, navigator)
     version = xrp.get_configuration()
-    verify_version(version)
+    verify_version(default_screenshot_path, version)
 
 
-def test_sign_too_large(backend, firmware, navigator):
+def test_sign_too_large(backend: BackendInterface, firmware: Firmware, navigator: Navigator):
     xrp = XRPClient(backend, firmware, navigator)
     max_size = 10001
     payload = DEFAULT_BIP32_PATH + b"a" * (max_size - 4)
@@ -32,7 +38,7 @@ def test_sign_too_large(backend, firmware, navigator):
         assert rapdu.status in [Errors.SW_WRONG_LENGTH, Errors.SW_INTERNAL_3]
 
 
-def test_sign_invalid_tx(backend, firmware, navigator):
+def test_sign_invalid_tx(backend: BackendInterface, firmware: Firmware, navigator: Navigator):
     xrp = XRPClient(backend, firmware, navigator)
     payload = DEFAULT_BIP32_PATH + b"a" * (40)
     try:
@@ -42,7 +48,7 @@ def test_sign_invalid_tx(backend, firmware, navigator):
         assert rapdu.status in [Errors.SW_INTERNAL_1, Errors.SW_INTERNAL_2]
 
 
-def test_path_too_long(backend, firmware, navigator):
+def test_path_too_long(backend: BackendInterface, firmware: Firmware, navigator: Navigator):
     xrp = XRPClient(backend, firmware, navigator)
     path = Bip32Path.build(DEFAULT_PATH + "/0/0/0/0/0/0")
     try:
@@ -51,7 +57,9 @@ def test_path_too_long(backend, firmware, navigator):
         assert rapdu.status == Errors.SW_INVALID_PATH
 
 
-def test_get_public_key_no_confirm(backend, firmware, navigator):
+def test_get_public_key_no_confirm(backend: BackendInterface,
+                                   firmware: Firmware,
+                                   navigator: Navigator):
     xrp = XRPClient(backend, firmware, navigator)
     key_len, key_data, chain_len, chain_data = xrp.get_pubkey_no_confirm(chain_code=True)
     ref_public_key, ref_chain_code = calculate_public_key_and_chaincode(
@@ -62,29 +70,38 @@ def test_get_public_key_no_confirm(backend, firmware, navigator):
     print(f"Chain code[{chain_len}]: {ref_chain_code}")
 
 
-def test_get_public_key_confirm(backend, firmware, navigator, test_name):
+def test_get_public_key_confirm(backend: BackendInterface,
+                                firmware: Firmware,
+                                navigator: Navigator,
+                                scenario_navigator: NavigateWithScenario):
     xrp = XRPClient(backend, firmware, navigator)
     with xrp.get_pubkey_confirm():
-        util_navigate(firmware,navigator, test_name, "Approve")
+        scenario_navigator.address_review_approve()
 
     # Check the status (Asynchronous)
     reply = xrp.get_async_response()
-    assert reply.status == Errors.SW_SUCCESS
+    assert reply and reply.status == Errors.SW_SUCCESS
 
 
-def test_get_public_key_reject(backend, firmware, navigator, test_name):
+def test_get_public_key_reject(backend: BackendInterface,
+                               firmware: Firmware,
+                               navigator: Navigator,
+                               scenario_navigator: NavigateWithScenario):
     xrp = XRPClient(backend, firmware, navigator)
 
     with pytest.raises(ExceptionRAPDU) as err:
         with xrp.get_pubkey_confirm():
-            util_navigate(firmware, navigator, test_name, "Reject_pubkey")
+            scenario_navigator.address_review_reject()
 
     # Assert we have received a refusal
     assert err.value.status == Errors.SW_WRONG_ADDRESS
     assert len(err.value.data) == 0
 
 
-def test_sign_reject(backend, firmware, navigator, test_name):
+def test_sign_reject(backend: BackendInterface,
+                     firmware: Firmware,
+                     navigator: Navigator,
+                     scenario_navigator: NavigateWithScenario):
     xrp = XRPClient(backend, firmware, navigator)
 
     # pragma pylint: disable=line-too-long
@@ -98,14 +115,18 @@ def test_sign_reject(backend, firmware, navigator, test_name):
     # Send the APDU (Asynchronous)
     with pytest.raises(ExceptionRAPDU) as err:
         with xrp.sign(DEFAULT_BIP32_PATH + message):
-            util_navigate(firmware, navigator, test_name, "Reject_sign")
+            scenario_navigator.review_reject()
 
     # Assert we have received a refusal
     assert err.value.status == Errors.SW_WRONG_ADDRESS
     assert len(err.value.data) == 0
 
 
-def test_sign_valid_tx(backend, raw_tx_path, firmware, navigator):
+def test_sign_valid_tx(backend: BackendInterface,
+                       firmware: Firmware,
+                       navigator: Navigator,
+                       scenario_navigator: NavigateWithScenario,
+                       raw_tx_path: str):
     if raw_tx_path.endswith("19-really-stupid-tx.raw"):
         pytest.skip(f"skip invalid tx {raw_tx_path}")
 
@@ -115,14 +136,18 @@ def test_sign_valid_tx(backend, raw_tx_path, firmware, navigator):
         tx = fp.read()
 
     index = raw_tx_path.index("/testcases/") + len("/testcases/")
-    snapdir = Path(raw_tx_path[index :]).with_suffix("")
+    snapdir = str(Path(raw_tx_path[index :]).with_suffix(""))
 
     backend.wait_for_home_screen()
+    if firmware.device.startswith("nano"):
+        text = "^Sign transaction$"
+    else:
+        text = "^Hold to sign$"
     with xrp.sign(DEFAULT_BIP32_PATH + tx):
-        util_navigate(firmware, navigator, snapdir, "Sign transaction", False)
+        scenario_navigator.review_approve(test_name=snapdir, custom_screen_text=text)
 
     reply = xrp.get_async_response()
-    assert reply.status == Errors.SW_SUCCESS
+    assert reply and reply.status == Errors.SW_SUCCESS
 
     # Verify signature
     verify_ecdsa_secp256k1(tx, reply.data, raw_tx_path)
diff --git a/tests/snapshots/flex/01-payment/01-basic/00000.png b/tests/snapshots/flex/01-payment/01-basic/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/01-payment/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/01-basic/00001.png b/tests/snapshots/flex/01-payment/01-basic/00001.png
new file mode 100644
index 00000000..109b6826
Binary files /dev/null and b/tests/snapshots/flex/01-payment/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/01-basic/00002.png b/tests/snapshots/flex/01-payment/01-basic/00002.png
new file mode 100644
index 00000000..b2459a71
Binary files /dev/null and b/tests/snapshots/flex/01-payment/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/01-basic/00003.png b/tests/snapshots/flex/01-payment/01-basic/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/01-payment/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/01-basic/00004.png b/tests/snapshots/flex/01-payment/01-basic/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/01-basic/00005.png b/tests/snapshots/flex/01-payment/01-basic/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/02-destination-tag/00000.png b/tests/snapshots/flex/01-payment/02-destination-tag/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/01-payment/02-destination-tag/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/02-destination-tag/00001.png b/tests/snapshots/flex/01-payment/02-destination-tag/00001.png
new file mode 100644
index 00000000..eeba8d8d
Binary files /dev/null and b/tests/snapshots/flex/01-payment/02-destination-tag/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/02-destination-tag/00002.png b/tests/snapshots/flex/01-payment/02-destination-tag/00002.png
new file mode 100644
index 00000000..a2513f9b
Binary files /dev/null and b/tests/snapshots/flex/01-payment/02-destination-tag/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/02-destination-tag/00003.png b/tests/snapshots/flex/01-payment/02-destination-tag/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/01-payment/02-destination-tag/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/02-destination-tag/00004.png b/tests/snapshots/flex/01-payment/02-destination-tag/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/02-destination-tag/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/02-destination-tag/00005.png b/tests/snapshots/flex/01-payment/02-destination-tag/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/02-destination-tag/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/03-source-tag/00000.png b/tests/snapshots/flex/01-payment/03-source-tag/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/01-payment/03-source-tag/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/03-source-tag/00001.png b/tests/snapshots/flex/01-payment/03-source-tag/00001.png
new file mode 100644
index 00000000..c09af355
Binary files /dev/null and b/tests/snapshots/flex/01-payment/03-source-tag/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/03-source-tag/00002.png b/tests/snapshots/flex/01-payment/03-source-tag/00002.png
new file mode 100644
index 00000000..a2513f9b
Binary files /dev/null and b/tests/snapshots/flex/01-payment/03-source-tag/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/03-source-tag/00003.png b/tests/snapshots/flex/01-payment/03-source-tag/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/01-payment/03-source-tag/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/03-source-tag/00004.png b/tests/snapshots/flex/01-payment/03-source-tag/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/03-source-tag/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/03-source-tag/00005.png b/tests/snapshots/flex/01-payment/03-source-tag/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/03-source-tag/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/04-both-tags/00000.png b/tests/snapshots/flex/01-payment/04-both-tags/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/01-payment/04-both-tags/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/04-both-tags/00001.png b/tests/snapshots/flex/01-payment/04-both-tags/00001.png
new file mode 100644
index 00000000..13e1f277
Binary files /dev/null and b/tests/snapshots/flex/01-payment/04-both-tags/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/04-both-tags/00002.png b/tests/snapshots/flex/01-payment/04-both-tags/00002.png
new file mode 100644
index 00000000..6a711560
Binary files /dev/null and b/tests/snapshots/flex/01-payment/04-both-tags/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/04-both-tags/00003.png b/tests/snapshots/flex/01-payment/04-both-tags/00003.png
new file mode 100644
index 00000000..8fc5c7b7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/04-both-tags/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/04-both-tags/00004.png b/tests/snapshots/flex/01-payment/04-both-tags/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/04-both-tags/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/04-both-tags/00005.png b/tests/snapshots/flex/01-payment/04-both-tags/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/04-both-tags/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/04-both-tags/00006.png b/tests/snapshots/flex/01-payment/04-both-tags/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/04-both-tags/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/05-invoice-id/00000.png b/tests/snapshots/flex/01-payment/05-invoice-id/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/01-payment/05-invoice-id/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/05-invoice-id/00001.png b/tests/snapshots/flex/01-payment/05-invoice-id/00001.png
new file mode 100644
index 00000000..35fa076b
Binary files /dev/null and b/tests/snapshots/flex/01-payment/05-invoice-id/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/05-invoice-id/00002.png b/tests/snapshots/flex/01-payment/05-invoice-id/00002.png
new file mode 100644
index 00000000..215f993b
Binary files /dev/null and b/tests/snapshots/flex/01-payment/05-invoice-id/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/05-invoice-id/00003.png b/tests/snapshots/flex/01-payment/05-invoice-id/00003.png
new file mode 100644
index 00000000..8fc5c7b7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/05-invoice-id/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/05-invoice-id/00004.png b/tests/snapshots/flex/01-payment/05-invoice-id/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/05-invoice-id/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/05-invoice-id/00005.png b/tests/snapshots/flex/01-payment/05-invoice-id/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/05-invoice-id/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/05-invoice-id/00006.png b/tests/snapshots/flex/01-payment/05-invoice-id/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/05-invoice-id/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00000.png b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00000.png
new file mode 100644
index 00000000..1a63e9a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00001.png b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00001.png
new file mode 100644
index 00000000..4b4c94ed
Binary files /dev/null and b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00002.png b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00002.png
new file mode 100644
index 00000000..8da026ea
Binary files /dev/null and b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00003.png b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00003.png
new file mode 100644
index 00000000..d9c5c58a
Binary files /dev/null and b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00004.png b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00004.png
new file mode 100644
index 00000000..c6480850
Binary files /dev/null and b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00005.png b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00005.png
new file mode 100644
index 00000000..ff21daf7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00006.png b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00006.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00007.png b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00007.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/06-invoice-txn-ids-tags/00007.png differ
diff --git a/tests/snapshots/flex/01-payment/07-issued-currency/00000.png b/tests/snapshots/flex/01-payment/07-issued-currency/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/01-payment/07-issued-currency/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/07-issued-currency/00001.png b/tests/snapshots/flex/01-payment/07-issued-currency/00001.png
new file mode 100644
index 00000000..8d79807e
Binary files /dev/null and b/tests/snapshots/flex/01-payment/07-issued-currency/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/07-issued-currency/00002.png b/tests/snapshots/flex/01-payment/07-issued-currency/00002.png
new file mode 100644
index 00000000..ba6af995
Binary files /dev/null and b/tests/snapshots/flex/01-payment/07-issued-currency/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/07-issued-currency/00003.png b/tests/snapshots/flex/01-payment/07-issued-currency/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/01-payment/07-issued-currency/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/07-issued-currency/00004.png b/tests/snapshots/flex/01-payment/07-issued-currency/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/07-issued-currency/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/07-issued-currency/00005.png b/tests/snapshots/flex/01-payment/07-issued-currency/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/07-issued-currency/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/08-issued-currency-max/00000.png b/tests/snapshots/flex/01-payment/08-issued-currency-max/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/01-payment/08-issued-currency-max/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/08-issued-currency-max/00001.png b/tests/snapshots/flex/01-payment/08-issued-currency-max/00001.png
new file mode 100644
index 00000000..d085517b
Binary files /dev/null and b/tests/snapshots/flex/01-payment/08-issued-currency-max/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/08-issued-currency-max/00002.png b/tests/snapshots/flex/01-payment/08-issued-currency-max/00002.png
new file mode 100644
index 00000000..0b88788d
Binary files /dev/null and b/tests/snapshots/flex/01-payment/08-issued-currency-max/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/08-issued-currency-max/00003.png b/tests/snapshots/flex/01-payment/08-issued-currency-max/00003.png
new file mode 100644
index 00000000..8fc5c7b7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/08-issued-currency-max/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/08-issued-currency-max/00004.png b/tests/snapshots/flex/01-payment/08-issued-currency-max/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/08-issued-currency-max/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/08-issued-currency-max/00005.png b/tests/snapshots/flex/01-payment/08-issued-currency-max/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/08-issued-currency-max/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/08-issued-currency-max/00006.png b/tests/snapshots/flex/01-payment/08-issued-currency-max/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/08-issued-currency-max/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00000.png b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00001.png b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00001.png
new file mode 100644
index 00000000..8c3ab4d8
Binary files /dev/null and b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00002.png b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00002.png
new file mode 100644
index 00000000..379f021a
Binary files /dev/null and b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00003.png b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00003.png
new file mode 100644
index 00000000..6bf5a4a7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00004.png b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00005.png b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00006.png b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/09-issued-currency-min-partial/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00000.png b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00000.png
new file mode 100644
index 00000000..1a63e9a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00001.png b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00001.png
new file mode 100644
index 00000000..fd5aa1af
Binary files /dev/null and b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00002.png b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00002.png
new file mode 100644
index 00000000..afed0440
Binary files /dev/null and b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00003.png b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00003.png
new file mode 100644
index 00000000..008e8444
Binary files /dev/null and b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00004.png b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00004.png
new file mode 100644
index 00000000..c6480850
Binary files /dev/null and b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00005.png b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00005.png
new file mode 100644
index 00000000..ff21daf7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00006.png b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00006.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00007.png b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00007.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/10-issued-currency-quality-partial/00007.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00000.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00000.png
new file mode 100644
index 00000000..19aa9788
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00001.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00001.png
new file mode 100644
index 00000000..5b60fe3a
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00002.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00002.png
new file mode 100644
index 00000000..6a63c76b
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00003.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00003.png
new file mode 100644
index 00000000..3cbc43a8
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00004.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00004.png
new file mode 100644
index 00000000..1738ad6e
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00005.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00005.png
new file mode 100644
index 00000000..e115a0f5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00006.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00006.png
new file mode 100644
index 00000000..18c0ed6f
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00007.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00007.png
new file mode 100644
index 00000000..0952fd7d
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00007.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00008.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00008.png
new file mode 100644
index 00000000..36cccf0d
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00008.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00009.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00009.png
new file mode 100644
index 00000000..56fb2ad5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00009.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00010.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00010.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00010.png differ
diff --git a/tests/snapshots/flex/01-payment/11-issued-currency-paths/00011.png b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00011.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/11-issued-currency-paths/00011.png differ
diff --git a/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00000.png b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00000.png
new file mode 100644
index 00000000..5ede72d8
Binary files /dev/null and b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00001.png b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00001.png
new file mode 100644
index 00000000..3837ac89
Binary files /dev/null and b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00002.png b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00002.png
new file mode 100644
index 00000000..d6e0b727
Binary files /dev/null and b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00003.png b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00003.png
new file mode 100644
index 00000000..7d126e47
Binary files /dev/null and b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00004.png b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00004.png
new file mode 100644
index 00000000..e045fc77
Binary files /dev/null and b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00005.png b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00005.png
new file mode 100644
index 00000000..9ac290e0
Binary files /dev/null and b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00006.png b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00006.png
new file mode 100644
index 00000000..337ad89c
Binary files /dev/null and b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00007.png b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00007.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00007.png differ
diff --git a/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00008.png b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00008.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/12-issued-currency-conversion/00008.png differ
diff --git a/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00000.png b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00001.png b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00001.png
new file mode 100644
index 00000000..827b769a
Binary files /dev/null and b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00002.png b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00002.png
new file mode 100644
index 00000000..c844028a
Binary files /dev/null and b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00003.png b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00003.png
new file mode 100644
index 00000000..8fc5c7b7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00004.png b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00005.png b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00006.png b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/13-issued-currency-e-notation/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00000.png b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00001.png b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00001.png
new file mode 100644
index 00000000..a4bf62e4
Binary files /dev/null and b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00002.png b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00002.png
new file mode 100644
index 00000000..b3566ee8
Binary files /dev/null and b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00003.png b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00003.png
new file mode 100644
index 00000000..708bfe4e
Binary files /dev/null and b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00004.png b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00005.png b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00006.png b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/14-issued-currency-non-standard/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/15-issue-abc-currency/00000.png b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/15-issue-abc-currency/00001.png b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00001.png
new file mode 100644
index 00000000..75aecc79
Binary files /dev/null and b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/15-issue-abc-currency/00002.png b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00002.png
new file mode 100644
index 00000000..f8cd3d0d
Binary files /dev/null and b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/15-issue-abc-currency/00003.png b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/15-issue-abc-currency/00004.png b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/15-issue-abc-currency/00005.png b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/15-issue-abc-currency/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/16-memos/00000.png b/tests/snapshots/flex/01-payment/16-memos/00000.png
new file mode 100644
index 00000000..ed3fe0f9
Binary files /dev/null and b/tests/snapshots/flex/01-payment/16-memos/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/16-memos/00001.png b/tests/snapshots/flex/01-payment/16-memos/00001.png
new file mode 100644
index 00000000..c980a7f5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/16-memos/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/16-memos/00002.png b/tests/snapshots/flex/01-payment/16-memos/00002.png
new file mode 100644
index 00000000..d61d3d4a
Binary files /dev/null and b/tests/snapshots/flex/01-payment/16-memos/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/16-memos/00003.png b/tests/snapshots/flex/01-payment/16-memos/00003.png
new file mode 100644
index 00000000..8da92973
Binary files /dev/null and b/tests/snapshots/flex/01-payment/16-memos/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/16-memos/00004.png b/tests/snapshots/flex/01-payment/16-memos/00004.png
new file mode 100644
index 00000000..a90fb99f
Binary files /dev/null and b/tests/snapshots/flex/01-payment/16-memos/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/16-memos/00005.png b/tests/snapshots/flex/01-payment/16-memos/00005.png
new file mode 100644
index 00000000..87b9c859
Binary files /dev/null and b/tests/snapshots/flex/01-payment/16-memos/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/16-memos/00006.png b/tests/snapshots/flex/01-payment/16-memos/00006.png
new file mode 100644
index 00000000..9ac60e2f
Binary files /dev/null and b/tests/snapshots/flex/01-payment/16-memos/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/16-memos/00007.png b/tests/snapshots/flex/01-payment/16-memos/00007.png
new file mode 100644
index 00000000..a66c38dc
Binary files /dev/null and b/tests/snapshots/flex/01-payment/16-memos/00007.png differ
diff --git a/tests/snapshots/flex/01-payment/16-memos/00008.png b/tests/snapshots/flex/01-payment/16-memos/00008.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/16-memos/00008.png differ
diff --git a/tests/snapshots/flex/01-payment/16-memos/00009.png b/tests/snapshots/flex/01-payment/16-memos/00009.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/16-memos/00009.png differ
diff --git a/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00000.png b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00001.png b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00001.png
new file mode 100644
index 00000000..109b6826
Binary files /dev/null and b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00002.png b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00002.png
new file mode 100644
index 00000000..c9b19240
Binary files /dev/null and b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00003.png b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00004.png b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00005.png b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/17-multi-sign-parallel/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00000.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00000.png
new file mode 100644
index 00000000..f3c5d905
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00000.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00001.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00001.png
new file mode 100644
index 00000000..56771631
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00001.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00002.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00002.png
new file mode 100644
index 00000000..a4b69b75
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00002.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00003.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00003.png
new file mode 100644
index 00000000..743e1f7a
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00003.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00004.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00004.png
new file mode 100644
index 00000000..4de6d418
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00004.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00005.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00005.png
new file mode 100644
index 00000000..f3554962
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00005.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00006.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00006.png
new file mode 100644
index 00000000..67db59f1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00006.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00007.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00007.png
new file mode 100644
index 00000000..97d5f5f4
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00007.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00008.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00008.png
new file mode 100644
index 00000000..25d6754e
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00008.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00009.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00009.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00009.png differ
diff --git a/tests/snapshots/flex/01-payment/18-multi-sign-serial/00010.png b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00010.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/01-payment/18-multi-sign-serial/00010.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/01-basic/00000.png b/tests/snapshots/flex/02-set-regular-key/01-basic/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/01-basic/00001.png b/tests/snapshots/flex/02-set-regular-key/01-basic/00001.png
new file mode 100644
index 00000000..aa4389cd
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/01-basic/00002.png b/tests/snapshots/flex/02-set-regular-key/01-basic/00002.png
new file mode 100644
index 00000000..7f472df5
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/01-basic/00003.png b/tests/snapshots/flex/02-set-regular-key/01-basic/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/01-basic/00004.png b/tests/snapshots/flex/02-set-regular-key/01-basic/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/01-basic/00005.png b/tests/snapshots/flex/02-set-regular-key/01-basic/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/02-delete/00000.png b/tests/snapshots/flex/02-set-regular-key/02-delete/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/02-delete/00000.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/02-delete/00001.png b/tests/snapshots/flex/02-set-regular-key/02-delete/00001.png
new file mode 100644
index 00000000..aa4389cd
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/02-delete/00001.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/02-delete/00002.png b/tests/snapshots/flex/02-set-regular-key/02-delete/00002.png
new file mode 100644
index 00000000..187e2d04
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/02-delete/00002.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/02-delete/00003.png b/tests/snapshots/flex/02-set-regular-key/02-delete/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/02-delete/00003.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/02-delete/00004.png b/tests/snapshots/flex/02-set-regular-key/02-delete/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/02-delete/00004.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/02-delete/00005.png b/tests/snapshots/flex/02-set-regular-key/02-delete/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/02-delete/00005.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00000.png b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00000.png
new file mode 100644
index 00000000..5ede72d8
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00000.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00001.png b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00001.png
new file mode 100644
index 00000000..da667fa3
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00001.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00002.png b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00002.png
new file mode 100644
index 00000000..2f57f3ab
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00002.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00003.png b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00003.png
new file mode 100644
index 00000000..b35a05bb
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00003.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00004.png b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00004.png
new file mode 100644
index 00000000..3fed1a2b
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00004.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00005.png b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00005.png
new file mode 100644
index 00000000..ede1c18d
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00005.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00006.png b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00006.png
new file mode 100644
index 00000000..337ad89c
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00006.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00007.png b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00007.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00007.png differ
diff --git a/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00008.png b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00008.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/02-set-regular-key/03-all-common-fields/00008.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/01-finish-after/00000.png b/tests/snapshots/flex/03-escrow-create/01-finish-after/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/01-finish-after/00000.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/01-finish-after/00001.png b/tests/snapshots/flex/03-escrow-create/01-finish-after/00001.png
new file mode 100644
index 00000000..0f743a4d
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/01-finish-after/00001.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/01-finish-after/00002.png b/tests/snapshots/flex/03-escrow-create/01-finish-after/00002.png
new file mode 100644
index 00000000..5f8c9ed6
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/01-finish-after/00002.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/01-finish-after/00003.png b/tests/snapshots/flex/03-escrow-create/01-finish-after/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/01-finish-after/00003.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/01-finish-after/00004.png b/tests/snapshots/flex/03-escrow-create/01-finish-after/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/01-finish-after/00004.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/01-finish-after/00005.png b/tests/snapshots/flex/03-escrow-create/01-finish-after/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/01-finish-after/00005.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/02-cancel-after/00000.png b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00000.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/02-cancel-after/00001.png b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00001.png
new file mode 100644
index 00000000..05d98f3a
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00001.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/02-cancel-after/00002.png b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00002.png
new file mode 100644
index 00000000..5f8c9ed6
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00002.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/02-cancel-after/00003.png b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00003.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/02-cancel-after/00004.png b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00004.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/02-cancel-after/00005.png b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/02-cancel-after/00005.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/03-both/00000.png b/tests/snapshots/flex/03-escrow-create/03-both/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/03-both/00000.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/03-both/00001.png b/tests/snapshots/flex/03-escrow-create/03-both/00001.png
new file mode 100644
index 00000000..84bc0f52
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/03-both/00001.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/03-both/00002.png b/tests/snapshots/flex/03-escrow-create/03-both/00002.png
new file mode 100644
index 00000000..4be16738
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/03-both/00002.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/03-both/00003.png b/tests/snapshots/flex/03-escrow-create/03-both/00003.png
new file mode 100644
index 00000000..8fc5c7b7
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/03-both/00003.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/03-both/00004.png b/tests/snapshots/flex/03-escrow-create/03-both/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/03-both/00004.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/03-both/00005.png b/tests/snapshots/flex/03-escrow-create/03-both/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/03-both/00005.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/03-both/00006.png b/tests/snapshots/flex/03-escrow-create/03-both/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/03-both/00006.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/04-both-condition/00000.png b/tests/snapshots/flex/03-escrow-create/04-both-condition/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/04-both-condition/00000.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/04-both-condition/00001.png b/tests/snapshots/flex/03-escrow-create/04-both-condition/00001.png
new file mode 100644
index 00000000..84bc0f52
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/04-both-condition/00001.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/04-both-condition/00002.png b/tests/snapshots/flex/03-escrow-create/04-both-condition/00002.png
new file mode 100644
index 00000000..4be16738
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/04-both-condition/00002.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/04-both-condition/00003.png b/tests/snapshots/flex/03-escrow-create/04-both-condition/00003.png
new file mode 100644
index 00000000..24a4a702
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/04-both-condition/00003.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/04-both-condition/00004.png b/tests/snapshots/flex/03-escrow-create/04-both-condition/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/04-both-condition/00004.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/04-both-condition/00005.png b/tests/snapshots/flex/03-escrow-create/04-both-condition/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/04-both-condition/00005.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/04-both-condition/00006.png b/tests/snapshots/flex/03-escrow-create/04-both-condition/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/04-both-condition/00006.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00000.png b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00000.png
new file mode 100644
index 00000000..1a63e9a1
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00000.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00001.png b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00001.png
new file mode 100644
index 00000000..55528875
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00001.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00002.png b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00002.png
new file mode 100644
index 00000000..a2ec92c0
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00002.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00003.png b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00003.png
new file mode 100644
index 00000000..71e1715b
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00003.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00004.png b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00004.png
new file mode 100644
index 00000000..c6480850
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00004.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00005.png b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00005.png
new file mode 100644
index 00000000..ff21daf7
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00005.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00006.png b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00006.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00006.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00007.png b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00007.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/05-both-condition-destination/00007.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00000.png b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00000.png
new file mode 100644
index 00000000..ed3fe0f9
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00000.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00001.png b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00001.png
new file mode 100644
index 00000000..4a8a406c
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00001.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00002.png b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00002.png
new file mode 100644
index 00000000..3ce47259
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00002.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00003.png b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00003.png
new file mode 100644
index 00000000..82d9f86f
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00003.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00004.png b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00004.png
new file mode 100644
index 00000000..68a47fd0
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00004.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00005.png b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00005.png
new file mode 100644
index 00000000..52f05837
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00005.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00006.png b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00006.png
new file mode 100644
index 00000000..72afd46c
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00006.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00007.png b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00007.png
new file mode 100644
index 00000000..a66c38dc
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00007.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00008.png b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00008.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00008.png differ
diff --git a/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00009.png b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00009.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/03-escrow-create/06-all-common-fields/00009.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/01-time-based/00000.png b/tests/snapshots/flex/04-escrow-finish/01-time-based/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/01-time-based/00000.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/01-time-based/00001.png b/tests/snapshots/flex/04-escrow-finish/01-time-based/00001.png
new file mode 100644
index 00000000..c8ce3074
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/01-time-based/00001.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/01-time-based/00002.png b/tests/snapshots/flex/04-escrow-finish/01-time-based/00002.png
new file mode 100644
index 00000000..247ee041
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/01-time-based/00002.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/01-time-based/00003.png b/tests/snapshots/flex/04-escrow-finish/01-time-based/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/01-time-based/00003.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/01-time-based/00004.png b/tests/snapshots/flex/04-escrow-finish/01-time-based/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/01-time-based/00004.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/01-time-based/00005.png b/tests/snapshots/flex/04-escrow-finish/01-time-based/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/01-time-based/00005.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/02-condition-based/00000.png b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00000.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/02-condition-based/00001.png b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00001.png
new file mode 100644
index 00000000..13201ced
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00001.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/02-condition-based/00002.png b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00002.png
new file mode 100644
index 00000000..e1fae293
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00002.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/02-condition-based/00003.png b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00003.png
new file mode 100644
index 00000000..4c42dc05
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00003.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/02-condition-based/00004.png b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00004.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/02-condition-based/00005.png b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00005.png differ
diff --git a/tests/snapshots/flex/04-escrow-finish/02-condition-based/00006.png b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/04-escrow-finish/02-condition-based/00006.png differ
diff --git a/tests/snapshots/flex/05-escrow-cancel/01-basic/00000.png b/tests/snapshots/flex/05-escrow-cancel/01-basic/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/05-escrow-cancel/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/05-escrow-cancel/01-basic/00001.png b/tests/snapshots/flex/05-escrow-cancel/01-basic/00001.png
new file mode 100644
index 00000000..e074e845
Binary files /dev/null and b/tests/snapshots/flex/05-escrow-cancel/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/05-escrow-cancel/01-basic/00002.png b/tests/snapshots/flex/05-escrow-cancel/01-basic/00002.png
new file mode 100644
index 00000000..247ee041
Binary files /dev/null and b/tests/snapshots/flex/05-escrow-cancel/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/05-escrow-cancel/01-basic/00003.png b/tests/snapshots/flex/05-escrow-cancel/01-basic/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/05-escrow-cancel/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/05-escrow-cancel/01-basic/00004.png b/tests/snapshots/flex/05-escrow-cancel/01-basic/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/05-escrow-cancel/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/05-escrow-cancel/01-basic/00005.png b/tests/snapshots/flex/05-escrow-cancel/01-basic/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/05-escrow-cancel/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/06-account-set/01-basic/00000.png b/tests/snapshots/flex/06-account-set/01-basic/00000.png
new file mode 100644
index 00000000..1a63e9a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/06-account-set/01-basic/00001.png b/tests/snapshots/flex/06-account-set/01-basic/00001.png
new file mode 100644
index 00000000..54567821
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/06-account-set/01-basic/00002.png b/tests/snapshots/flex/06-account-set/01-basic/00002.png
new file mode 100644
index 00000000..54c9529b
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/06-account-set/01-basic/00003.png b/tests/snapshots/flex/06-account-set/01-basic/00003.png
new file mode 100644
index 00000000..21d91a75
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/06-account-set/01-basic/00004.png b/tests/snapshots/flex/06-account-set/01-basic/00004.png
new file mode 100644
index 00000000..321134cb
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/06-account-set/01-basic/00005.png b/tests/snapshots/flex/06-account-set/01-basic/00005.png
new file mode 100644
index 00000000..ff21daf7
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/06-account-set/01-basic/00006.png b/tests/snapshots/flex/06-account-set/01-basic/00006.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/01-basic/00006.png differ
diff --git a/tests/snapshots/flex/06-account-set/01-basic/00007.png b/tests/snapshots/flex/06-account-set/01-basic/00007.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/01-basic/00007.png differ
diff --git a/tests/snapshots/flex/06-account-set/02-default-ripple/00000.png b/tests/snapshots/flex/06-account-set/02-default-ripple/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/02-default-ripple/00000.png differ
diff --git a/tests/snapshots/flex/06-account-set/02-default-ripple/00001.png b/tests/snapshots/flex/06-account-set/02-default-ripple/00001.png
new file mode 100644
index 00000000..62cede5c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/02-default-ripple/00001.png differ
diff --git a/tests/snapshots/flex/06-account-set/02-default-ripple/00002.png b/tests/snapshots/flex/06-account-set/02-default-ripple/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/02-default-ripple/00002.png differ
diff --git a/tests/snapshots/flex/06-account-set/02-default-ripple/00003.png b/tests/snapshots/flex/06-account-set/02-default-ripple/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/02-default-ripple/00003.png differ
diff --git a/tests/snapshots/flex/06-account-set/02-default-ripple/00004.png b/tests/snapshots/flex/06-account-set/02-default-ripple/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/02-default-ripple/00004.png differ
diff --git a/tests/snapshots/flex/06-account-set/02-default-ripple/00005.png b/tests/snapshots/flex/06-account-set/02-default-ripple/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/02-default-ripple/00005.png differ
diff --git a/tests/snapshots/flex/06-account-set/03-deposit-auth/00000.png b/tests/snapshots/flex/06-account-set/03-deposit-auth/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/03-deposit-auth/00000.png differ
diff --git a/tests/snapshots/flex/06-account-set/03-deposit-auth/00001.png b/tests/snapshots/flex/06-account-set/03-deposit-auth/00001.png
new file mode 100644
index 00000000..2cd5568f
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/03-deposit-auth/00001.png differ
diff --git a/tests/snapshots/flex/06-account-set/03-deposit-auth/00002.png b/tests/snapshots/flex/06-account-set/03-deposit-auth/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/03-deposit-auth/00002.png differ
diff --git a/tests/snapshots/flex/06-account-set/03-deposit-auth/00003.png b/tests/snapshots/flex/06-account-set/03-deposit-auth/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/03-deposit-auth/00003.png differ
diff --git a/tests/snapshots/flex/06-account-set/03-deposit-auth/00004.png b/tests/snapshots/flex/06-account-set/03-deposit-auth/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/03-deposit-auth/00004.png differ
diff --git a/tests/snapshots/flex/06-account-set/03-deposit-auth/00005.png b/tests/snapshots/flex/06-account-set/03-deposit-auth/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/03-deposit-auth/00005.png differ
diff --git a/tests/snapshots/flex/06-account-set/04-disable-master/00000.png b/tests/snapshots/flex/06-account-set/04-disable-master/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/04-disable-master/00000.png differ
diff --git a/tests/snapshots/flex/06-account-set/04-disable-master/00001.png b/tests/snapshots/flex/06-account-set/04-disable-master/00001.png
new file mode 100644
index 00000000..a27aad00
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/04-disable-master/00001.png differ
diff --git a/tests/snapshots/flex/06-account-set/04-disable-master/00002.png b/tests/snapshots/flex/06-account-set/04-disable-master/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/04-disable-master/00002.png differ
diff --git a/tests/snapshots/flex/06-account-set/04-disable-master/00003.png b/tests/snapshots/flex/06-account-set/04-disable-master/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/04-disable-master/00003.png differ
diff --git a/tests/snapshots/flex/06-account-set/04-disable-master/00004.png b/tests/snapshots/flex/06-account-set/04-disable-master/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/04-disable-master/00004.png differ
diff --git a/tests/snapshots/flex/06-account-set/04-disable-master/00005.png b/tests/snapshots/flex/06-account-set/04-disable-master/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/04-disable-master/00005.png differ
diff --git a/tests/snapshots/flex/06-account-set/05-disallow-xrp/00000.png b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00000.png differ
diff --git a/tests/snapshots/flex/06-account-set/05-disallow-xrp/00001.png b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00001.png
new file mode 100644
index 00000000..626f2bae
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00001.png differ
diff --git a/tests/snapshots/flex/06-account-set/05-disallow-xrp/00002.png b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00002.png differ
diff --git a/tests/snapshots/flex/06-account-set/05-disallow-xrp/00003.png b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00003.png differ
diff --git a/tests/snapshots/flex/06-account-set/05-disallow-xrp/00004.png b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00004.png differ
diff --git a/tests/snapshots/flex/06-account-set/05-disallow-xrp/00005.png b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/05-disallow-xrp/00005.png differ
diff --git a/tests/snapshots/flex/06-account-set/06-global-freeze/00000.png b/tests/snapshots/flex/06-account-set/06-global-freeze/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/06-global-freeze/00000.png differ
diff --git a/tests/snapshots/flex/06-account-set/06-global-freeze/00001.png b/tests/snapshots/flex/06-account-set/06-global-freeze/00001.png
new file mode 100644
index 00000000..e079d72c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/06-global-freeze/00001.png differ
diff --git a/tests/snapshots/flex/06-account-set/06-global-freeze/00002.png b/tests/snapshots/flex/06-account-set/06-global-freeze/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/06-global-freeze/00002.png differ
diff --git a/tests/snapshots/flex/06-account-set/06-global-freeze/00003.png b/tests/snapshots/flex/06-account-set/06-global-freeze/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/06-global-freeze/00003.png differ
diff --git a/tests/snapshots/flex/06-account-set/06-global-freeze/00004.png b/tests/snapshots/flex/06-account-set/06-global-freeze/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/06-global-freeze/00004.png differ
diff --git a/tests/snapshots/flex/06-account-set/06-global-freeze/00005.png b/tests/snapshots/flex/06-account-set/06-global-freeze/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/06-global-freeze/00005.png differ
diff --git a/tests/snapshots/flex/06-account-set/07-no-freeze/00000.png b/tests/snapshots/flex/06-account-set/07-no-freeze/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/07-no-freeze/00000.png differ
diff --git a/tests/snapshots/flex/06-account-set/07-no-freeze/00001.png b/tests/snapshots/flex/06-account-set/07-no-freeze/00001.png
new file mode 100644
index 00000000..00b67b8e
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/07-no-freeze/00001.png differ
diff --git a/tests/snapshots/flex/06-account-set/07-no-freeze/00002.png b/tests/snapshots/flex/06-account-set/07-no-freeze/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/07-no-freeze/00002.png differ
diff --git a/tests/snapshots/flex/06-account-set/07-no-freeze/00003.png b/tests/snapshots/flex/06-account-set/07-no-freeze/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/07-no-freeze/00003.png differ
diff --git a/tests/snapshots/flex/06-account-set/07-no-freeze/00004.png b/tests/snapshots/flex/06-account-set/07-no-freeze/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/07-no-freeze/00004.png differ
diff --git a/tests/snapshots/flex/06-account-set/07-no-freeze/00005.png b/tests/snapshots/flex/06-account-set/07-no-freeze/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/07-no-freeze/00005.png differ
diff --git a/tests/snapshots/flex/06-account-set/08-require-auth/00000.png b/tests/snapshots/flex/06-account-set/08-require-auth/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/08-require-auth/00000.png differ
diff --git a/tests/snapshots/flex/06-account-set/08-require-auth/00001.png b/tests/snapshots/flex/06-account-set/08-require-auth/00001.png
new file mode 100644
index 00000000..13efe49a
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/08-require-auth/00001.png differ
diff --git a/tests/snapshots/flex/06-account-set/08-require-auth/00002.png b/tests/snapshots/flex/06-account-set/08-require-auth/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/08-require-auth/00002.png differ
diff --git a/tests/snapshots/flex/06-account-set/08-require-auth/00003.png b/tests/snapshots/flex/06-account-set/08-require-auth/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/08-require-auth/00003.png differ
diff --git a/tests/snapshots/flex/06-account-set/08-require-auth/00004.png b/tests/snapshots/flex/06-account-set/08-require-auth/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/08-require-auth/00004.png differ
diff --git a/tests/snapshots/flex/06-account-set/08-require-auth/00005.png b/tests/snapshots/flex/06-account-set/08-require-auth/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/08-require-auth/00005.png differ
diff --git a/tests/snapshots/flex/06-account-set/09-require-tag/00000.png b/tests/snapshots/flex/06-account-set/09-require-tag/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/09-require-tag/00000.png differ
diff --git a/tests/snapshots/flex/06-account-set/09-require-tag/00001.png b/tests/snapshots/flex/06-account-set/09-require-tag/00001.png
new file mode 100644
index 00000000..937fe438
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/09-require-tag/00001.png differ
diff --git a/tests/snapshots/flex/06-account-set/09-require-tag/00002.png b/tests/snapshots/flex/06-account-set/09-require-tag/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/09-require-tag/00002.png differ
diff --git a/tests/snapshots/flex/06-account-set/09-require-tag/00003.png b/tests/snapshots/flex/06-account-set/09-require-tag/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/09-require-tag/00003.png differ
diff --git a/tests/snapshots/flex/06-account-set/09-require-tag/00004.png b/tests/snapshots/flex/06-account-set/09-require-tag/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/09-require-tag/00004.png differ
diff --git a/tests/snapshots/flex/06-account-set/09-require-tag/00005.png b/tests/snapshots/flex/06-account-set/09-require-tag/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/09-require-tag/00005.png differ
diff --git a/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00000.png b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00000.png differ
diff --git a/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00001.png b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00001.png
new file mode 100644
index 00000000..8ff99f49
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00001.png differ
diff --git a/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00002.png b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00002.png differ
diff --git a/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00003.png b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00003.png differ
diff --git a/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00004.png b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00004.png differ
diff --git a/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00005.png b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/06-account-set/10-clear-account-txn-id/00005.png differ
diff --git a/tests/snapshots/flex/07-check-cancel/01-basic/00000.png b/tests/snapshots/flex/07-check-cancel/01-basic/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/07-check-cancel/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/07-check-cancel/01-basic/00001.png b/tests/snapshots/flex/07-check-cancel/01-basic/00001.png
new file mode 100644
index 00000000..95d20a2a
Binary files /dev/null and b/tests/snapshots/flex/07-check-cancel/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/07-check-cancel/01-basic/00002.png b/tests/snapshots/flex/07-check-cancel/01-basic/00002.png
new file mode 100644
index 00000000..77d5a245
Binary files /dev/null and b/tests/snapshots/flex/07-check-cancel/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/07-check-cancel/01-basic/00003.png b/tests/snapshots/flex/07-check-cancel/01-basic/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/07-check-cancel/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/07-check-cancel/01-basic/00004.png b/tests/snapshots/flex/07-check-cancel/01-basic/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/07-check-cancel/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/07-check-cancel/01-basic/00005.png b/tests/snapshots/flex/07-check-cancel/01-basic/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/07-check-cancel/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/08-check-cash/01-basic/00000.png b/tests/snapshots/flex/08-check-cash/01-basic/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/08-check-cash/01-basic/00001.png b/tests/snapshots/flex/08-check-cash/01-basic/00001.png
new file mode 100644
index 00000000..fd8fb51d
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/08-check-cash/01-basic/00002.png b/tests/snapshots/flex/08-check-cash/01-basic/00002.png
new file mode 100644
index 00000000..2ac652c1
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/08-check-cash/01-basic/00003.png b/tests/snapshots/flex/08-check-cash/01-basic/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/08-check-cash/01-basic/00004.png b/tests/snapshots/flex/08-check-cash/01-basic/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/08-check-cash/01-basic/00005.png b/tests/snapshots/flex/08-check-cash/01-basic/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/08-check-cash/02-amount/00000.png b/tests/snapshots/flex/08-check-cash/02-amount/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/02-amount/00000.png differ
diff --git a/tests/snapshots/flex/08-check-cash/02-amount/00001.png b/tests/snapshots/flex/08-check-cash/02-amount/00001.png
new file mode 100644
index 00000000..fd8fb51d
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/02-amount/00001.png differ
diff --git a/tests/snapshots/flex/08-check-cash/02-amount/00002.png b/tests/snapshots/flex/08-check-cash/02-amount/00002.png
new file mode 100644
index 00000000..511e3af4
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/02-amount/00002.png differ
diff --git a/tests/snapshots/flex/08-check-cash/02-amount/00003.png b/tests/snapshots/flex/08-check-cash/02-amount/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/02-amount/00003.png differ
diff --git a/tests/snapshots/flex/08-check-cash/02-amount/00004.png b/tests/snapshots/flex/08-check-cash/02-amount/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/02-amount/00004.png differ
diff --git a/tests/snapshots/flex/08-check-cash/02-amount/00005.png b/tests/snapshots/flex/08-check-cash/02-amount/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/02-amount/00005.png differ
diff --git a/tests/snapshots/flex/08-check-cash/03-issued/00000.png b/tests/snapshots/flex/08-check-cash/03-issued/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/03-issued/00000.png differ
diff --git a/tests/snapshots/flex/08-check-cash/03-issued/00001.png b/tests/snapshots/flex/08-check-cash/03-issued/00001.png
new file mode 100644
index 00000000..5edeeb3d
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/03-issued/00001.png differ
diff --git a/tests/snapshots/flex/08-check-cash/03-issued/00002.png b/tests/snapshots/flex/08-check-cash/03-issued/00002.png
new file mode 100644
index 00000000..f860af28
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/03-issued/00002.png differ
diff --git a/tests/snapshots/flex/08-check-cash/03-issued/00003.png b/tests/snapshots/flex/08-check-cash/03-issued/00003.png
new file mode 100644
index 00000000..8c5e3d10
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/03-issued/00003.png differ
diff --git a/tests/snapshots/flex/08-check-cash/03-issued/00004.png b/tests/snapshots/flex/08-check-cash/03-issued/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/03-issued/00004.png differ
diff --git a/tests/snapshots/flex/08-check-cash/03-issued/00005.png b/tests/snapshots/flex/08-check-cash/03-issued/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/03-issued/00005.png differ
diff --git a/tests/snapshots/flex/08-check-cash/03-issued/00006.png b/tests/snapshots/flex/08-check-cash/03-issued/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/03-issued/00006.png differ
diff --git a/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00000.png b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00000.png differ
diff --git a/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00001.png b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00001.png
new file mode 100644
index 00000000..5edeeb3d
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00001.png differ
diff --git a/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00002.png b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00002.png
new file mode 100644
index 00000000..2065b3e9
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00002.png differ
diff --git a/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00003.png b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00003.png
new file mode 100644
index 00000000..c6735b4b
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00003.png differ
diff --git a/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00004.png b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00004.png differ
diff --git a/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00005.png b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00005.png differ
diff --git a/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00006.png b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/08-check-cash/04-issued-delivery-min/00006.png differ
diff --git a/tests/snapshots/flex/09-check-create/01-basic/00000.png b/tests/snapshots/flex/09-check-create/01-basic/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/09-check-create/01-basic/00001.png b/tests/snapshots/flex/09-check-create/01-basic/00001.png
new file mode 100644
index 00000000..7ec839ac
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/09-check-create/01-basic/00002.png b/tests/snapshots/flex/09-check-create/01-basic/00002.png
new file mode 100644
index 00000000..71781ef2
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/09-check-create/01-basic/00003.png b/tests/snapshots/flex/09-check-create/01-basic/00003.png
new file mode 100644
index 00000000..1d34f892
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/09-check-create/01-basic/00004.png b/tests/snapshots/flex/09-check-create/01-basic/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/09-check-create/01-basic/00005.png b/tests/snapshots/flex/09-check-create/01-basic/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/09-check-create/01-basic/00006.png b/tests/snapshots/flex/09-check-create/01-basic/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/01-basic/00006.png differ
diff --git a/tests/snapshots/flex/09-check-create/02-issued/00000.png b/tests/snapshots/flex/09-check-create/02-issued/00000.png
new file mode 100644
index 00000000..1a63e9a1
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/02-issued/00000.png differ
diff --git a/tests/snapshots/flex/09-check-create/02-issued/00001.png b/tests/snapshots/flex/09-check-create/02-issued/00001.png
new file mode 100644
index 00000000..791473f1
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/02-issued/00001.png differ
diff --git a/tests/snapshots/flex/09-check-create/02-issued/00002.png b/tests/snapshots/flex/09-check-create/02-issued/00002.png
new file mode 100644
index 00000000..6b95a220
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/02-issued/00002.png differ
diff --git a/tests/snapshots/flex/09-check-create/02-issued/00003.png b/tests/snapshots/flex/09-check-create/02-issued/00003.png
new file mode 100644
index 00000000..83aed9f9
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/02-issued/00003.png differ
diff --git a/tests/snapshots/flex/09-check-create/02-issued/00004.png b/tests/snapshots/flex/09-check-create/02-issued/00004.png
new file mode 100644
index 00000000..d3e03810
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/02-issued/00004.png differ
diff --git a/tests/snapshots/flex/09-check-create/02-issued/00005.png b/tests/snapshots/flex/09-check-create/02-issued/00005.png
new file mode 100644
index 00000000..ff21daf7
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/02-issued/00005.png differ
diff --git a/tests/snapshots/flex/09-check-create/02-issued/00006.png b/tests/snapshots/flex/09-check-create/02-issued/00006.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/02-issued/00006.png differ
diff --git a/tests/snapshots/flex/09-check-create/02-issued/00007.png b/tests/snapshots/flex/09-check-create/02-issued/00007.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/09-check-create/02-issued/00007.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/01-basic/00000.png b/tests/snapshots/flex/10-deposit-preauth/01-basic/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/01-basic/00001.png b/tests/snapshots/flex/10-deposit-preauth/01-basic/00001.png
new file mode 100644
index 00000000..0617b8e3
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/01-basic/00002.png b/tests/snapshots/flex/10-deposit-preauth/01-basic/00002.png
new file mode 100644
index 00000000..465aac43
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/01-basic/00003.png b/tests/snapshots/flex/10-deposit-preauth/01-basic/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/01-basic/00004.png b/tests/snapshots/flex/10-deposit-preauth/01-basic/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/01-basic/00005.png b/tests/snapshots/flex/10-deposit-preauth/01-basic/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00000.png b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00000.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00001.png b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00001.png
new file mode 100644
index 00000000..0617b8e3
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00001.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00002.png b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00002.png
new file mode 100644
index 00000000..a8140bb9
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00002.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00003.png b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00003.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00004.png b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00004.png differ
diff --git a/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00005.png b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/10-deposit-preauth/02-unauthorize/00005.png differ
diff --git a/tests/snapshots/flex/11-offer-cancel/01-basic/00000.png b/tests/snapshots/flex/11-offer-cancel/01-basic/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/11-offer-cancel/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/11-offer-cancel/01-basic/00001.png b/tests/snapshots/flex/11-offer-cancel/01-basic/00001.png
new file mode 100644
index 00000000..a3420ae9
Binary files /dev/null and b/tests/snapshots/flex/11-offer-cancel/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/11-offer-cancel/01-basic/00002.png b/tests/snapshots/flex/11-offer-cancel/01-basic/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/11-offer-cancel/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/11-offer-cancel/01-basic/00003.png b/tests/snapshots/flex/11-offer-cancel/01-basic/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/11-offer-cancel/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/11-offer-cancel/01-basic/00004.png b/tests/snapshots/flex/11-offer-cancel/01-basic/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/11-offer-cancel/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/11-offer-cancel/01-basic/00005.png b/tests/snapshots/flex/11-offer-cancel/01-basic/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/11-offer-cancel/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/12-offer-create/01-basic/00000.png b/tests/snapshots/flex/12-offer-create/01-basic/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/12-offer-create/01-basic/00001.png b/tests/snapshots/flex/12-offer-create/01-basic/00001.png
new file mode 100644
index 00000000..5b21205f
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/12-offer-create/01-basic/00002.png b/tests/snapshots/flex/12-offer-create/01-basic/00002.png
new file mode 100644
index 00000000..d73f7277
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/12-offer-create/01-basic/00003.png b/tests/snapshots/flex/12-offer-create/01-basic/00003.png
new file mode 100644
index 00000000..664715b4
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/12-offer-create/01-basic/00004.png b/tests/snapshots/flex/12-offer-create/01-basic/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/12-offer-create/01-basic/00005.png b/tests/snapshots/flex/12-offer-create/01-basic/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/12-offer-create/01-basic/00006.png b/tests/snapshots/flex/12-offer-create/01-basic/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/01-basic/00006.png differ
diff --git a/tests/snapshots/flex/12-offer-create/02-passive/00000.png b/tests/snapshots/flex/12-offer-create/02-passive/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/02-passive/00000.png differ
diff --git a/tests/snapshots/flex/12-offer-create/02-passive/00001.png b/tests/snapshots/flex/12-offer-create/02-passive/00001.png
new file mode 100644
index 00000000..9a2f6306
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/02-passive/00001.png differ
diff --git a/tests/snapshots/flex/12-offer-create/02-passive/00002.png b/tests/snapshots/flex/12-offer-create/02-passive/00002.png
new file mode 100644
index 00000000..536b59a9
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/02-passive/00002.png differ
diff --git a/tests/snapshots/flex/12-offer-create/02-passive/00003.png b/tests/snapshots/flex/12-offer-create/02-passive/00003.png
new file mode 100644
index 00000000..8d6a44f2
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/02-passive/00003.png differ
diff --git a/tests/snapshots/flex/12-offer-create/02-passive/00004.png b/tests/snapshots/flex/12-offer-create/02-passive/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/02-passive/00004.png differ
diff --git a/tests/snapshots/flex/12-offer-create/02-passive/00005.png b/tests/snapshots/flex/12-offer-create/02-passive/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/02-passive/00005.png differ
diff --git a/tests/snapshots/flex/12-offer-create/02-passive/00006.png b/tests/snapshots/flex/12-offer-create/02-passive/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/02-passive/00006.png differ
diff --git a/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00000.png b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00000.png differ
diff --git a/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00001.png b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00001.png
new file mode 100644
index 00000000..c1f62b45
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00001.png differ
diff --git a/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00002.png b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00002.png
new file mode 100644
index 00000000..536b59a9
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00002.png differ
diff --git a/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00003.png b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00003.png
new file mode 100644
index 00000000..8d6a44f2
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00003.png differ
diff --git a/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00004.png b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00004.png differ
diff --git a/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00005.png b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00005.png differ
diff --git a/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00006.png b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/03-immediate-or-cancel/00006.png differ
diff --git a/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00000.png b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00000.png differ
diff --git a/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00001.png b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00001.png
new file mode 100644
index 00000000..f5005b0b
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00001.png differ
diff --git a/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00002.png b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00002.png
new file mode 100644
index 00000000..536b59a9
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00002.png differ
diff --git a/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00003.png b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00003.png
new file mode 100644
index 00000000..8d6a44f2
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00003.png differ
diff --git a/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00004.png b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00004.png differ
diff --git a/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00005.png b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00005.png differ
diff --git a/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00006.png b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/04-fill-or-kill/00006.png differ
diff --git a/tests/snapshots/flex/12-offer-create/05-sell/00000.png b/tests/snapshots/flex/12-offer-create/05-sell/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/05-sell/00000.png differ
diff --git a/tests/snapshots/flex/12-offer-create/05-sell/00001.png b/tests/snapshots/flex/12-offer-create/05-sell/00001.png
new file mode 100644
index 00000000..29157f5f
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/05-sell/00001.png differ
diff --git a/tests/snapshots/flex/12-offer-create/05-sell/00002.png b/tests/snapshots/flex/12-offer-create/05-sell/00002.png
new file mode 100644
index 00000000..536b59a9
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/05-sell/00002.png differ
diff --git a/tests/snapshots/flex/12-offer-create/05-sell/00003.png b/tests/snapshots/flex/12-offer-create/05-sell/00003.png
new file mode 100644
index 00000000..8d6a44f2
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/05-sell/00003.png differ
diff --git a/tests/snapshots/flex/12-offer-create/05-sell/00004.png b/tests/snapshots/flex/12-offer-create/05-sell/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/05-sell/00004.png differ
diff --git a/tests/snapshots/flex/12-offer-create/05-sell/00005.png b/tests/snapshots/flex/12-offer-create/05-sell/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/05-sell/00005.png differ
diff --git a/tests/snapshots/flex/12-offer-create/05-sell/00006.png b/tests/snapshots/flex/12-offer-create/05-sell/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/05-sell/00006.png differ
diff --git a/tests/snapshots/flex/12-offer-create/06-combo/00000.png b/tests/snapshots/flex/12-offer-create/06-combo/00000.png
new file mode 100644
index 00000000..1a63e9a1
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/06-combo/00000.png differ
diff --git a/tests/snapshots/flex/12-offer-create/06-combo/00001.png b/tests/snapshots/flex/12-offer-create/06-combo/00001.png
new file mode 100644
index 00000000..e1159344
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/06-combo/00001.png differ
diff --git a/tests/snapshots/flex/12-offer-create/06-combo/00002.png b/tests/snapshots/flex/12-offer-create/06-combo/00002.png
new file mode 100644
index 00000000..bc9dd918
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/06-combo/00002.png differ
diff --git a/tests/snapshots/flex/12-offer-create/06-combo/00003.png b/tests/snapshots/flex/12-offer-create/06-combo/00003.png
new file mode 100644
index 00000000..79a31f74
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/06-combo/00003.png differ
diff --git a/tests/snapshots/flex/12-offer-create/06-combo/00004.png b/tests/snapshots/flex/12-offer-create/06-combo/00004.png
new file mode 100644
index 00000000..2d563b69
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/06-combo/00004.png differ
diff --git a/tests/snapshots/flex/12-offer-create/06-combo/00005.png b/tests/snapshots/flex/12-offer-create/06-combo/00005.png
new file mode 100644
index 00000000..ff21daf7
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/06-combo/00005.png differ
diff --git a/tests/snapshots/flex/12-offer-create/06-combo/00006.png b/tests/snapshots/flex/12-offer-create/06-combo/00006.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/06-combo/00006.png differ
diff --git a/tests/snapshots/flex/12-offer-create/06-combo/00007.png b/tests/snapshots/flex/12-offer-create/06-combo/00007.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/12-offer-create/06-combo/00007.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/01-basic/00000.png b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00000.png
new file mode 100644
index 00000000..1a63e9a1
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/01-basic/00001.png b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00001.png
new file mode 100644
index 00000000..33d2b9f8
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/01-basic/00002.png b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00002.png
new file mode 100644
index 00000000..957df1ae
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/01-basic/00003.png b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00003.png
new file mode 100644
index 00000000..59187c8f
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/01-basic/00004.png b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00004.png
new file mode 100644
index 00000000..ab819984
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/01-basic/00005.png b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00005.png
new file mode 100644
index 00000000..ff21daf7
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/01-basic/00006.png b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00006.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00006.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/01-basic/00007.png b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00007.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/01-basic/00007.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/02-renew/00000.png b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00000.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/02-renew/00001.png b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00001.png
new file mode 100644
index 00000000..768d0d35
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00001.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/02-renew/00002.png b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00002.png
new file mode 100644
index 00000000..f6b36ffd
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00002.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/02-renew/00003.png b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00003.png
new file mode 100644
index 00000000..ac4c8b52
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00003.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/02-renew/00004.png b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00004.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/02-renew/00005.png b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00005.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/02-renew/00006.png b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/02-renew/00006.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/03-close/00000.png b/tests/snapshots/flex/13-payment-channel-claim/03-close/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/03-close/00000.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/03-close/00001.png b/tests/snapshots/flex/13-payment-channel-claim/03-close/00001.png
new file mode 100644
index 00000000..f2beca49
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/03-close/00001.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/03-close/00002.png b/tests/snapshots/flex/13-payment-channel-claim/03-close/00002.png
new file mode 100644
index 00000000..10ca03fe
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/03-close/00002.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/03-close/00003.png b/tests/snapshots/flex/13-payment-channel-claim/03-close/00003.png
new file mode 100644
index 00000000..ac4c8b52
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/03-close/00003.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/03-close/00004.png b/tests/snapshots/flex/13-payment-channel-claim/03-close/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/03-close/00004.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/03-close/00005.png b/tests/snapshots/flex/13-payment-channel-claim/03-close/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/03-close/00005.png differ
diff --git a/tests/snapshots/flex/13-payment-channel-claim/03-close/00006.png b/tests/snapshots/flex/13-payment-channel-claim/03-close/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/13-payment-channel-claim/03-close/00006.png differ
diff --git a/tests/snapshots/flex/14-payment-channel-create/01-basic/00000.png b/tests/snapshots/flex/14-payment-channel-create/01-basic/00000.png
new file mode 100644
index 00000000..1a63e9a1
Binary files /dev/null and b/tests/snapshots/flex/14-payment-channel-create/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/14-payment-channel-create/01-basic/00001.png b/tests/snapshots/flex/14-payment-channel-create/01-basic/00001.png
new file mode 100644
index 00000000..320c673c
Binary files /dev/null and b/tests/snapshots/flex/14-payment-channel-create/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/14-payment-channel-create/01-basic/00002.png b/tests/snapshots/flex/14-payment-channel-create/01-basic/00002.png
new file mode 100644
index 00000000..6a039265
Binary files /dev/null and b/tests/snapshots/flex/14-payment-channel-create/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/14-payment-channel-create/01-basic/00003.png b/tests/snapshots/flex/14-payment-channel-create/01-basic/00003.png
new file mode 100644
index 00000000..59187c8f
Binary files /dev/null and b/tests/snapshots/flex/14-payment-channel-create/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/14-payment-channel-create/01-basic/00004.png b/tests/snapshots/flex/14-payment-channel-create/01-basic/00004.png
new file mode 100644
index 00000000..d8ac87d7
Binary files /dev/null and b/tests/snapshots/flex/14-payment-channel-create/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/14-payment-channel-create/01-basic/00005.png b/tests/snapshots/flex/14-payment-channel-create/01-basic/00005.png
new file mode 100644
index 00000000..ff21daf7
Binary files /dev/null and b/tests/snapshots/flex/14-payment-channel-create/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/14-payment-channel-create/01-basic/00006.png b/tests/snapshots/flex/14-payment-channel-create/01-basic/00006.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/14-payment-channel-create/01-basic/00006.png differ
diff --git a/tests/snapshots/flex/14-payment-channel-create/01-basic/00007.png b/tests/snapshots/flex/14-payment-channel-create/01-basic/00007.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/14-payment-channel-create/01-basic/00007.png differ
diff --git a/tests/snapshots/flex/15-payment-channel-fund/01-basic/00000.png b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/15-payment-channel-fund/01-basic/00001.png b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00001.png
new file mode 100644
index 00000000..48a6e28a
Binary files /dev/null and b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/15-payment-channel-fund/01-basic/00002.png b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00002.png
new file mode 100644
index 00000000..edf197ba
Binary files /dev/null and b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/15-payment-channel-fund/01-basic/00003.png b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/15-payment-channel-fund/01-basic/00004.png b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/15-payment-channel-fund/01-basic/00005.png b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/15-payment-channel-fund/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00000.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00000.png
new file mode 100644
index 00000000..f3c5d905
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00001.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00001.png
new file mode 100644
index 00000000..0e3ae980
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00002.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00002.png
new file mode 100644
index 00000000..488a4deb
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00003.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00003.png
new file mode 100644
index 00000000..311524e8
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00004.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00004.png
new file mode 100644
index 00000000..d9074e31
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00005.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00005.png
new file mode 100644
index 00000000..99b3d627
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00006.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00006.png
new file mode 100644
index 00000000..7b39288b
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00006.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00007.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00007.png
new file mode 100644
index 00000000..c738f404
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00007.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00008.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00008.png
new file mode 100644
index 00000000..25d6754e
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00008.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00009.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00009.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00009.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/01-basic/00010.png b/tests/snapshots/flex/16-signer-list-set/01-basic/00010.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/01-basic/00010.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/02-delete/00000.png b/tests/snapshots/flex/16-signer-list-set/02-delete/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/02-delete/00000.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/02-delete/00001.png b/tests/snapshots/flex/16-signer-list-set/02-delete/00001.png
new file mode 100644
index 00000000..3844fd6e
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/02-delete/00001.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/02-delete/00002.png b/tests/snapshots/flex/16-signer-list-set/02-delete/00002.png
new file mode 100644
index 00000000..659caea4
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/02-delete/00002.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/02-delete/00003.png b/tests/snapshots/flex/16-signer-list-set/02-delete/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/02-delete/00003.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/02-delete/00004.png b/tests/snapshots/flex/16-signer-list-set/02-delete/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/02-delete/00004.png differ
diff --git a/tests/snapshots/flex/16-signer-list-set/02-delete/00005.png b/tests/snapshots/flex/16-signer-list-set/02-delete/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/16-signer-list-set/02-delete/00005.png differ
diff --git a/tests/snapshots/flex/17-trust-set/01-basic/00000.png b/tests/snapshots/flex/17-trust-set/01-basic/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/17-trust-set/01-basic/00001.png b/tests/snapshots/flex/17-trust-set/01-basic/00001.png
new file mode 100644
index 00000000..737f0444
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/17-trust-set/01-basic/00002.png b/tests/snapshots/flex/17-trust-set/01-basic/00002.png
new file mode 100644
index 00000000..754e837c
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/17-trust-set/01-basic/00003.png b/tests/snapshots/flex/17-trust-set/01-basic/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/17-trust-set/01-basic/00004.png b/tests/snapshots/flex/17-trust-set/01-basic/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/17-trust-set/01-basic/00005.png b/tests/snapshots/flex/17-trust-set/01-basic/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/17-trust-set/02-quality/00000.png b/tests/snapshots/flex/17-trust-set/02-quality/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/02-quality/00000.png differ
diff --git a/tests/snapshots/flex/17-trust-set/02-quality/00001.png b/tests/snapshots/flex/17-trust-set/02-quality/00001.png
new file mode 100644
index 00000000..8fdd2452
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/02-quality/00001.png differ
diff --git a/tests/snapshots/flex/17-trust-set/02-quality/00002.png b/tests/snapshots/flex/17-trust-set/02-quality/00002.png
new file mode 100644
index 00000000..bd29ea7a
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/02-quality/00002.png differ
diff --git a/tests/snapshots/flex/17-trust-set/02-quality/00003.png b/tests/snapshots/flex/17-trust-set/02-quality/00003.png
new file mode 100644
index 00000000..ac4c8b52
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/02-quality/00003.png differ
diff --git a/tests/snapshots/flex/17-trust-set/02-quality/00004.png b/tests/snapshots/flex/17-trust-set/02-quality/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/02-quality/00004.png differ
diff --git a/tests/snapshots/flex/17-trust-set/02-quality/00005.png b/tests/snapshots/flex/17-trust-set/02-quality/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/02-quality/00005.png differ
diff --git a/tests/snapshots/flex/17-trust-set/02-quality/00006.png b/tests/snapshots/flex/17-trust-set/02-quality/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/02-quality/00006.png differ
diff --git a/tests/snapshots/flex/17-trust-set/03-authorize/00000.png b/tests/snapshots/flex/17-trust-set/03-authorize/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/03-authorize/00000.png differ
diff --git a/tests/snapshots/flex/17-trust-set/03-authorize/00001.png b/tests/snapshots/flex/17-trust-set/03-authorize/00001.png
new file mode 100644
index 00000000..693a43b9
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/03-authorize/00001.png differ
diff --git a/tests/snapshots/flex/17-trust-set/03-authorize/00002.png b/tests/snapshots/flex/17-trust-set/03-authorize/00002.png
new file mode 100644
index 00000000..4cdb7ff0
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/03-authorize/00002.png differ
diff --git a/tests/snapshots/flex/17-trust-set/03-authorize/00003.png b/tests/snapshots/flex/17-trust-set/03-authorize/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/03-authorize/00003.png differ
diff --git a/tests/snapshots/flex/17-trust-set/03-authorize/00004.png b/tests/snapshots/flex/17-trust-set/03-authorize/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/03-authorize/00004.png differ
diff --git a/tests/snapshots/flex/17-trust-set/03-authorize/00005.png b/tests/snapshots/flex/17-trust-set/03-authorize/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/03-authorize/00005.png differ
diff --git a/tests/snapshots/flex/17-trust-set/04-no-rippling/00000.png b/tests/snapshots/flex/17-trust-set/04-no-rippling/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/04-no-rippling/00000.png differ
diff --git a/tests/snapshots/flex/17-trust-set/04-no-rippling/00001.png b/tests/snapshots/flex/17-trust-set/04-no-rippling/00001.png
new file mode 100644
index 00000000..a65b7ef1
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/04-no-rippling/00001.png differ
diff --git a/tests/snapshots/flex/17-trust-set/04-no-rippling/00002.png b/tests/snapshots/flex/17-trust-set/04-no-rippling/00002.png
new file mode 100644
index 00000000..87ecb5af
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/04-no-rippling/00002.png differ
diff --git a/tests/snapshots/flex/17-trust-set/04-no-rippling/00003.png b/tests/snapshots/flex/17-trust-set/04-no-rippling/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/04-no-rippling/00003.png differ
diff --git a/tests/snapshots/flex/17-trust-set/04-no-rippling/00004.png b/tests/snapshots/flex/17-trust-set/04-no-rippling/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/04-no-rippling/00004.png differ
diff --git a/tests/snapshots/flex/17-trust-set/04-no-rippling/00005.png b/tests/snapshots/flex/17-trust-set/04-no-rippling/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/04-no-rippling/00005.png differ
diff --git a/tests/snapshots/flex/17-trust-set/05-rippling/00000.png b/tests/snapshots/flex/17-trust-set/05-rippling/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/05-rippling/00000.png differ
diff --git a/tests/snapshots/flex/17-trust-set/05-rippling/00001.png b/tests/snapshots/flex/17-trust-set/05-rippling/00001.png
new file mode 100644
index 00000000..5f145f9c
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/05-rippling/00001.png differ
diff --git a/tests/snapshots/flex/17-trust-set/05-rippling/00002.png b/tests/snapshots/flex/17-trust-set/05-rippling/00002.png
new file mode 100644
index 00000000..4708a0e6
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/05-rippling/00002.png differ
diff --git a/tests/snapshots/flex/17-trust-set/05-rippling/00003.png b/tests/snapshots/flex/17-trust-set/05-rippling/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/05-rippling/00003.png differ
diff --git a/tests/snapshots/flex/17-trust-set/05-rippling/00004.png b/tests/snapshots/flex/17-trust-set/05-rippling/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/05-rippling/00004.png differ
diff --git a/tests/snapshots/flex/17-trust-set/05-rippling/00005.png b/tests/snapshots/flex/17-trust-set/05-rippling/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/05-rippling/00005.png differ
diff --git a/tests/snapshots/flex/17-trust-set/06-freeze/00000.png b/tests/snapshots/flex/17-trust-set/06-freeze/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/06-freeze/00000.png differ
diff --git a/tests/snapshots/flex/17-trust-set/06-freeze/00001.png b/tests/snapshots/flex/17-trust-set/06-freeze/00001.png
new file mode 100644
index 00000000..89d2f9ff
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/06-freeze/00001.png differ
diff --git a/tests/snapshots/flex/17-trust-set/06-freeze/00002.png b/tests/snapshots/flex/17-trust-set/06-freeze/00002.png
new file mode 100644
index 00000000..0370fa52
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/06-freeze/00002.png differ
diff --git a/tests/snapshots/flex/17-trust-set/06-freeze/00003.png b/tests/snapshots/flex/17-trust-set/06-freeze/00003.png
new file mode 100644
index 00000000..ac4c8b52
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/06-freeze/00003.png differ
diff --git a/tests/snapshots/flex/17-trust-set/06-freeze/00004.png b/tests/snapshots/flex/17-trust-set/06-freeze/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/06-freeze/00004.png differ
diff --git a/tests/snapshots/flex/17-trust-set/06-freeze/00005.png b/tests/snapshots/flex/17-trust-set/06-freeze/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/06-freeze/00005.png differ
diff --git a/tests/snapshots/flex/17-trust-set/06-freeze/00006.png b/tests/snapshots/flex/17-trust-set/06-freeze/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/06-freeze/00006.png differ
diff --git a/tests/snapshots/flex/17-trust-set/07-unfreeze/00000.png b/tests/snapshots/flex/17-trust-set/07-unfreeze/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/07-unfreeze/00000.png differ
diff --git a/tests/snapshots/flex/17-trust-set/07-unfreeze/00001.png b/tests/snapshots/flex/17-trust-set/07-unfreeze/00001.png
new file mode 100644
index 00000000..54553f60
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/07-unfreeze/00001.png differ
diff --git a/tests/snapshots/flex/17-trust-set/07-unfreeze/00002.png b/tests/snapshots/flex/17-trust-set/07-unfreeze/00002.png
new file mode 100644
index 00000000..79028423
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/07-unfreeze/00002.png differ
diff --git a/tests/snapshots/flex/17-trust-set/07-unfreeze/00003.png b/tests/snapshots/flex/17-trust-set/07-unfreeze/00003.png
new file mode 100644
index 00000000..92fa18b7
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/07-unfreeze/00003.png differ
diff --git a/tests/snapshots/flex/17-trust-set/07-unfreeze/00004.png b/tests/snapshots/flex/17-trust-set/07-unfreeze/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/07-unfreeze/00004.png differ
diff --git a/tests/snapshots/flex/17-trust-set/07-unfreeze/00005.png b/tests/snapshots/flex/17-trust-set/07-unfreeze/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/07-unfreeze/00005.png differ
diff --git a/tests/snapshots/flex/17-trust-set/07-unfreeze/00006.png b/tests/snapshots/flex/17-trust-set/07-unfreeze/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/07-unfreeze/00006.png differ
diff --git a/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00000.png b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00000.png differ
diff --git a/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00001.png b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00001.png
new file mode 100644
index 00000000..02da26f9
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00001.png differ
diff --git a/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00002.png b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00002.png
new file mode 100644
index 00000000..00a0b841
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00002.png differ
diff --git a/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00003.png b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00003.png differ
diff --git a/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00004.png b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00004.png differ
diff --git a/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00005.png b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/08-non-standard-currency/00005.png differ
diff --git a/tests/snapshots/flex/17-trust-set/09-remove/00000.png b/tests/snapshots/flex/17-trust-set/09-remove/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/09-remove/00000.png differ
diff --git a/tests/snapshots/flex/17-trust-set/09-remove/00001.png b/tests/snapshots/flex/17-trust-set/09-remove/00001.png
new file mode 100644
index 00000000..f3be4428
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/09-remove/00001.png differ
diff --git a/tests/snapshots/flex/17-trust-set/09-remove/00002.png b/tests/snapshots/flex/17-trust-set/09-remove/00002.png
new file mode 100644
index 00000000..00a0b841
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/09-remove/00002.png differ
diff --git a/tests/snapshots/flex/17-trust-set/09-remove/00003.png b/tests/snapshots/flex/17-trust-set/09-remove/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/09-remove/00003.png differ
diff --git a/tests/snapshots/flex/17-trust-set/09-remove/00004.png b/tests/snapshots/flex/17-trust-set/09-remove/00004.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/09-remove/00004.png differ
diff --git a/tests/snapshots/flex/17-trust-set/09-remove/00005.png b/tests/snapshots/flex/17-trust-set/09-remove/00005.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/17-trust-set/09-remove/00005.png differ
diff --git a/tests/snapshots/flex/18-arrays/01-basic/00000.png b/tests/snapshots/flex/18-arrays/01-basic/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/01-basic/00000.png differ
diff --git a/tests/snapshots/flex/18-arrays/01-basic/00001.png b/tests/snapshots/flex/18-arrays/01-basic/00001.png
new file mode 100644
index 00000000..04d9c2e1
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/01-basic/00001.png differ
diff --git a/tests/snapshots/flex/18-arrays/01-basic/00002.png b/tests/snapshots/flex/18-arrays/01-basic/00002.png
new file mode 100644
index 00000000..640ac810
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/01-basic/00002.png differ
diff --git a/tests/snapshots/flex/18-arrays/01-basic/00003.png b/tests/snapshots/flex/18-arrays/01-basic/00003.png
new file mode 100644
index 00000000..774a9593
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/01-basic/00003.png differ
diff --git a/tests/snapshots/flex/18-arrays/01-basic/00004.png b/tests/snapshots/flex/18-arrays/01-basic/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/01-basic/00004.png differ
diff --git a/tests/snapshots/flex/18-arrays/01-basic/00005.png b/tests/snapshots/flex/18-arrays/01-basic/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/01-basic/00005.png differ
diff --git a/tests/snapshots/flex/18-arrays/01-basic/00006.png b/tests/snapshots/flex/18-arrays/01-basic/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/01-basic/00006.png differ
diff --git a/tests/snapshots/flex/18-arrays/02-multiple/00000.png b/tests/snapshots/flex/18-arrays/02-multiple/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/02-multiple/00000.png differ
diff --git a/tests/snapshots/flex/18-arrays/02-multiple/00001.png b/tests/snapshots/flex/18-arrays/02-multiple/00001.png
new file mode 100644
index 00000000..04d9c2e1
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/02-multiple/00001.png differ
diff --git a/tests/snapshots/flex/18-arrays/02-multiple/00002.png b/tests/snapshots/flex/18-arrays/02-multiple/00002.png
new file mode 100644
index 00000000..640ac810
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/02-multiple/00002.png differ
diff --git a/tests/snapshots/flex/18-arrays/02-multiple/00003.png b/tests/snapshots/flex/18-arrays/02-multiple/00003.png
new file mode 100644
index 00000000..c5d0537e
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/02-multiple/00003.png differ
diff --git a/tests/snapshots/flex/18-arrays/02-multiple/00004.png b/tests/snapshots/flex/18-arrays/02-multiple/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/02-multiple/00004.png differ
diff --git a/tests/snapshots/flex/18-arrays/02-multiple/00005.png b/tests/snapshots/flex/18-arrays/02-multiple/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/02-multiple/00005.png differ
diff --git a/tests/snapshots/flex/18-arrays/02-multiple/00006.png b/tests/snapshots/flex/18-arrays/02-multiple/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/02-multiple/00006.png differ
diff --git a/tests/snapshots/flex/18-arrays/03-not-last/00000.png b/tests/snapshots/flex/18-arrays/03-not-last/00000.png
new file mode 100644
index 00000000..818274c0
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/03-not-last/00000.png differ
diff --git a/tests/snapshots/flex/18-arrays/03-not-last/00001.png b/tests/snapshots/flex/18-arrays/03-not-last/00001.png
new file mode 100644
index 00000000..04d9c2e1
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/03-not-last/00001.png differ
diff --git a/tests/snapshots/flex/18-arrays/03-not-last/00002.png b/tests/snapshots/flex/18-arrays/03-not-last/00002.png
new file mode 100644
index 00000000..640ac810
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/03-not-last/00002.png differ
diff --git a/tests/snapshots/flex/18-arrays/03-not-last/00003.png b/tests/snapshots/flex/18-arrays/03-not-last/00003.png
new file mode 100644
index 00000000..8bd439e8
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/03-not-last/00003.png differ
diff --git a/tests/snapshots/flex/18-arrays/03-not-last/00004.png b/tests/snapshots/flex/18-arrays/03-not-last/00004.png
new file mode 100644
index 00000000..c7f0f6e7
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/03-not-last/00004.png differ
diff --git a/tests/snapshots/flex/18-arrays/03-not-last/00005.png b/tests/snapshots/flex/18-arrays/03-not-last/00005.png
new file mode 100644
index 00000000..be51a9d5
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/03-not-last/00005.png differ
diff --git a/tests/snapshots/flex/18-arrays/03-not-last/00006.png b/tests/snapshots/flex/18-arrays/03-not-last/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/18-arrays/03-not-last/00006.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm/00000.png b/tests/snapshots/flex/test_get_public_key_confirm/00000.png
new file mode 100644
index 00000000..823a381b
Binary files /dev/null and b/tests/snapshots/flex/test_get_public_key_confirm/00000.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm/00001.png b/tests/snapshots/flex/test_get_public_key_confirm/00001.png
new file mode 100644
index 00000000..1fb01450
Binary files /dev/null and b/tests/snapshots/flex/test_get_public_key_confirm/00001.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm/00002.png b/tests/snapshots/flex/test_get_public_key_confirm/00002.png
new file mode 100644
index 00000000..4321e601
Binary files /dev/null and b/tests/snapshots/flex/test_get_public_key_confirm/00002.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_confirm/00003.png b/tests/snapshots/flex/test_get_public_key_confirm/00003.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/test_get_public_key_confirm/00003.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_reject/00000.png b/tests/snapshots/flex/test_get_public_key_reject/00000.png
new file mode 100644
index 00000000..823a381b
Binary files /dev/null and b/tests/snapshots/flex/test_get_public_key_reject/00000.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_reject/00001.png b/tests/snapshots/flex/test_get_public_key_reject/00001.png
new file mode 100644
index 00000000..1fb01450
Binary files /dev/null and b/tests/snapshots/flex/test_get_public_key_reject/00001.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_reject/00002.png b/tests/snapshots/flex/test_get_public_key_reject/00002.png
new file mode 100644
index 00000000..45c08d4e
Binary files /dev/null and b/tests/snapshots/flex/test_get_public_key_reject/00002.png differ
diff --git a/tests/snapshots/flex/test_get_public_key_reject/00003.png b/tests/snapshots/flex/test_get_public_key_reject/00003.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/test_get_public_key_reject/00003.png differ
diff --git a/tests/snapshots/flex/test_sign_reject/00000.png b/tests/snapshots/flex/test_sign_reject/00000.png
new file mode 100644
index 00000000..137ad663
Binary files /dev/null and b/tests/snapshots/flex/test_sign_reject/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_reject/00001.png b/tests/snapshots/flex/test_sign_reject/00001.png
new file mode 100644
index 00000000..109b6826
Binary files /dev/null and b/tests/snapshots/flex/test_sign_reject/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_reject/00002.png b/tests/snapshots/flex/test_sign_reject/00002.png
new file mode 100644
index 00000000..b2459a71
Binary files /dev/null and b/tests/snapshots/flex/test_sign_reject/00002.png differ
diff --git a/tests/snapshots/flex/test_sign_reject/00003.png b/tests/snapshots/flex/test_sign_reject/00003.png
new file mode 100644
index 00000000..bd4ae34c
Binary files /dev/null and b/tests/snapshots/flex/test_sign_reject/00003.png differ
diff --git a/tests/snapshots/flex/test_sign_reject/00004.png b/tests/snapshots/flex/test_sign_reject/00004.png
new file mode 100644
index 00000000..08bca223
Binary files /dev/null and b/tests/snapshots/flex/test_sign_reject/00004.png differ
diff --git a/tests/snapshots/flex/test_sign_reject/00005.png b/tests/snapshots/flex/test_sign_reject/00005.png
new file mode 100644
index 00000000..6bbdf2ff
Binary files /dev/null and b/tests/snapshots/flex/test_sign_reject/00005.png differ
diff --git a/tests/snapshots/flex/test_sign_reject/00006.png b/tests/snapshots/flex/test_sign_reject/00006.png
new file mode 100644
index 00000000..df7bc4a1
Binary files /dev/null and b/tests/snapshots/flex/test_sign_reject/00006.png differ
diff --git a/tests/snapshots/nanos/01-payment/01-basic/00010.png b/tests/snapshots/nanos/01-payment/01-basic/00010.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/01-basic/00010.png differ
diff --git a/tests/snapshots/nanos/01-payment/02-destination-tag/00011.png b/tests/snapshots/nanos/01-payment/02-destination-tag/00011.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/02-destination-tag/00011.png differ
diff --git a/tests/snapshots/nanos/01-payment/03-source-tag/00011.png b/tests/snapshots/nanos/01-payment/03-source-tag/00011.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/03-source-tag/00011.png differ
diff --git a/tests/snapshots/nanos/01-payment/04-both-tags/00012.png b/tests/snapshots/nanos/01-payment/04-both-tags/00012.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/04-both-tags/00012.png differ
diff --git a/tests/snapshots/nanos/01-payment/05-invoice-id/00014.png b/tests/snapshots/nanos/01-payment/05-invoice-id/00014.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/05-invoice-id/00014.png differ
diff --git a/tests/snapshots/nanos/01-payment/06-invoice-txn-ids-tags/00020.png b/tests/snapshots/nanos/01-payment/06-invoice-txn-ids-tags/00020.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/06-invoice-txn-ids-tags/00020.png differ
diff --git a/tests/snapshots/nanos/01-payment/07-issued-currency/00013.png b/tests/snapshots/nanos/01-payment/07-issued-currency/00013.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/07-issued-currency/00013.png differ
diff --git a/tests/snapshots/nanos/01-payment/08-issued-currency-max/00014.png b/tests/snapshots/nanos/01-payment/08-issued-currency-max/00014.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/08-issued-currency-max/00014.png differ
diff --git a/tests/snapshots/nanos/01-payment/09-issued-currency-min-partial/00015.png b/tests/snapshots/nanos/01-payment/09-issued-currency-min-partial/00015.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/09-issued-currency-min-partial/00015.png differ
diff --git a/tests/snapshots/nanos/01-payment/10-issued-currency-quality-partial/00020.png b/tests/snapshots/nanos/01-payment/10-issued-currency-quality-partial/00020.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/10-issued-currency-quality-partial/00020.png differ
diff --git a/tests/snapshots/nanos/01-payment/11-issued-currency-paths/00047.png b/tests/snapshots/nanos/01-payment/11-issued-currency-paths/00047.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/11-issued-currency-paths/00047.png differ
diff --git a/tests/snapshots/nanos/01-payment/12-issued-currency-conversion/00028.png b/tests/snapshots/nanos/01-payment/12-issued-currency-conversion/00028.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/12-issued-currency-conversion/00028.png differ
diff --git a/tests/snapshots/nanos/01-payment/13-issued-currency-e-notation/00014.png b/tests/snapshots/nanos/01-payment/13-issued-currency-e-notation/00014.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/13-issued-currency-e-notation/00014.png differ
diff --git a/tests/snapshots/nanos/01-payment/14-issued-currency-non-standard/00017.png b/tests/snapshots/nanos/01-payment/14-issued-currency-non-standard/00017.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/14-issued-currency-non-standard/00017.png differ
diff --git a/tests/snapshots/nanos/01-payment/15-issue-abc-currency/00013.png b/tests/snapshots/nanos/01-payment/15-issue-abc-currency/00013.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/15-issue-abc-currency/00013.png differ
diff --git a/tests/snapshots/nanos/01-payment/16-memos/00032.png b/tests/snapshots/nanos/01-payment/16-memos/00032.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/16-memos/00032.png differ
diff --git a/tests/snapshots/nanos/01-payment/17-multi-sign-parallel/00010.png b/tests/snapshots/nanos/01-payment/17-multi-sign-parallel/00010.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/17-multi-sign-parallel/00010.png differ
diff --git a/tests/snapshots/nanos/01-payment/18-multi-sign-serial/00038.png b/tests/snapshots/nanos/01-payment/18-multi-sign-serial/00038.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/01-payment/18-multi-sign-serial/00038.png differ
diff --git a/tests/snapshots/nanos/02-set-regular-key/01-basic/00009.png b/tests/snapshots/nanos/02-set-regular-key/01-basic/00009.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/02-set-regular-key/01-basic/00009.png differ
diff --git a/tests/snapshots/nanos/02-set-regular-key/02-delete/00007.png b/tests/snapshots/nanos/02-set-regular-key/02-delete/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/02-set-regular-key/02-delete/00007.png differ
diff --git a/tests/snapshots/nanos/02-set-regular-key/03-all-common-fields/00026.png b/tests/snapshots/nanos/02-set-regular-key/03-all-common-fields/00026.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/02-set-regular-key/03-all-common-fields/00026.png differ
diff --git a/tests/snapshots/nanos/03-escrow-create/01-finish-after/00012.png b/tests/snapshots/nanos/03-escrow-create/01-finish-after/00012.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/03-escrow-create/01-finish-after/00012.png differ
diff --git a/tests/snapshots/nanos/03-escrow-create/02-cancel-after/00012.png b/tests/snapshots/nanos/03-escrow-create/02-cancel-after/00012.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/03-escrow-create/02-cancel-after/00012.png differ
diff --git a/tests/snapshots/nanos/03-escrow-create/03-both/00014.png b/tests/snapshots/nanos/03-escrow-create/03-both/00014.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/03-escrow-create/03-both/00014.png differ
diff --git a/tests/snapshots/nanos/03-escrow-create/04-both-condition/00019.png b/tests/snapshots/nanos/03-escrow-create/04-both-condition/00019.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/03-escrow-create/04-both-condition/00019.png differ
diff --git a/tests/snapshots/nanos/03-escrow-create/05-both-condition-destination/00020.png b/tests/snapshots/nanos/03-escrow-create/05-both-condition-destination/00020.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/03-escrow-create/05-both-condition-destination/00020.png differ
diff --git a/tests/snapshots/nanos/03-escrow-create/06-all-common-fields/00037.png b/tests/snapshots/nanos/03-escrow-create/06-all-common-fields/00037.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/03-escrow-create/06-all-common-fields/00037.png differ
diff --git a/tests/snapshots/nanos/04-escrow-finish/01-time-based/00010.png b/tests/snapshots/nanos/04-escrow-finish/01-time-based/00010.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/04-escrow-finish/01-time-based/00010.png differ
diff --git a/tests/snapshots/nanos/04-escrow-finish/02-condition-based/00016.png b/tests/snapshots/nanos/04-escrow-finish/02-condition-based/00016.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/04-escrow-finish/02-condition-based/00016.png differ
diff --git a/tests/snapshots/nanos/05-escrow-cancel/01-basic/00010.png b/tests/snapshots/nanos/05-escrow-cancel/01-basic/00010.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/05-escrow-cancel/01-basic/00010.png differ
diff --git a/tests/snapshots/nanos/06-account-set/01-basic/00020.png b/tests/snapshots/nanos/06-account-set/01-basic/00020.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/06-account-set/01-basic/00020.png differ
diff --git a/tests/snapshots/nanos/06-account-set/02-default-ripple/00007.png b/tests/snapshots/nanos/06-account-set/02-default-ripple/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/06-account-set/02-default-ripple/00007.png differ
diff --git a/tests/snapshots/nanos/06-account-set/03-deposit-auth/00007.png b/tests/snapshots/nanos/06-account-set/03-deposit-auth/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/06-account-set/03-deposit-auth/00007.png differ
diff --git a/tests/snapshots/nanos/06-account-set/04-disable-master/00007.png b/tests/snapshots/nanos/06-account-set/04-disable-master/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/06-account-set/04-disable-master/00007.png differ
diff --git a/tests/snapshots/nanos/06-account-set/05-disallow-xrp/00007.png b/tests/snapshots/nanos/06-account-set/05-disallow-xrp/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/06-account-set/05-disallow-xrp/00007.png differ
diff --git a/tests/snapshots/nanos/06-account-set/06-global-freeze/00007.png b/tests/snapshots/nanos/06-account-set/06-global-freeze/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/06-account-set/06-global-freeze/00007.png differ
diff --git a/tests/snapshots/nanos/06-account-set/07-no-freeze/00007.png b/tests/snapshots/nanos/06-account-set/07-no-freeze/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/06-account-set/07-no-freeze/00007.png differ
diff --git a/tests/snapshots/nanos/06-account-set/08-require-auth/00007.png b/tests/snapshots/nanos/06-account-set/08-require-auth/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/06-account-set/08-require-auth/00007.png differ
diff --git a/tests/snapshots/nanos/06-account-set/09-require-tag/00007.png b/tests/snapshots/nanos/06-account-set/09-require-tag/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/06-account-set/09-require-tag/00007.png differ
diff --git a/tests/snapshots/nanos/06-account-set/10-clear-account-txn-id/00007.png b/tests/snapshots/nanos/06-account-set/10-clear-account-txn-id/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/06-account-set/10-clear-account-txn-id/00007.png differ
diff --git a/tests/snapshots/nanos/07-check-cancel/01-basic/00010.png b/tests/snapshots/nanos/07-check-cancel/01-basic/00010.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/07-check-cancel/01-basic/00010.png differ
diff --git a/tests/snapshots/nanos/08-check-cash/01-basic/00011.png b/tests/snapshots/nanos/08-check-cash/01-basic/00011.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/08-check-cash/01-basic/00011.png differ
diff --git a/tests/snapshots/nanos/08-check-cash/02-amount/00011.png b/tests/snapshots/nanos/08-check-cash/02-amount/00011.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/08-check-cash/02-amount/00011.png differ
diff --git a/tests/snapshots/nanos/08-check-cash/03-issued/00014.png b/tests/snapshots/nanos/08-check-cash/03-issued/00014.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/08-check-cash/03-issued/00014.png differ
diff --git a/tests/snapshots/nanos/08-check-cash/04-issued-delivery-min/00017.png b/tests/snapshots/nanos/08-check-cash/04-issued-delivery-min/00017.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/08-check-cash/04-issued-delivery-min/00017.png differ
diff --git a/tests/snapshots/nanos/09-check-create/01-basic/00016.png b/tests/snapshots/nanos/09-check-create/01-basic/00016.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/09-check-create/01-basic/00016.png differ
diff --git a/tests/snapshots/nanos/09-check-create/02-issued/00023.png b/tests/snapshots/nanos/09-check-create/02-issued/00023.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/09-check-create/02-issued/00023.png differ
diff --git a/tests/snapshots/nanos/10-deposit-preauth/01-basic/00009.png b/tests/snapshots/nanos/10-deposit-preauth/01-basic/00009.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/10-deposit-preauth/01-basic/00009.png differ
diff --git a/tests/snapshots/nanos/10-deposit-preauth/02-unauthorize/00009.png b/tests/snapshots/nanos/10-deposit-preauth/02-unauthorize/00009.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/10-deposit-preauth/02-unauthorize/00009.png differ
diff --git a/tests/snapshots/nanos/11-offer-cancel/01-basic/00007.png b/tests/snapshots/nanos/11-offer-cancel/01-basic/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/11-offer-cancel/01-basic/00007.png differ
diff --git a/tests/snapshots/nanos/12-offer-create/01-basic/00014.png b/tests/snapshots/nanos/12-offer-create/01-basic/00014.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/12-offer-create/01-basic/00014.png differ
diff --git a/tests/snapshots/nanos/12-offer-create/02-passive/00015.png b/tests/snapshots/nanos/12-offer-create/02-passive/00015.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/12-offer-create/02-passive/00015.png differ
diff --git a/tests/snapshots/nanos/12-offer-create/03-immediate-or-cancel/00015.png b/tests/snapshots/nanos/12-offer-create/03-immediate-or-cancel/00015.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/12-offer-create/03-immediate-or-cancel/00015.png differ
diff --git a/tests/snapshots/nanos/12-offer-create/04-fill-or-kill/00015.png b/tests/snapshots/nanos/12-offer-create/04-fill-or-kill/00015.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/12-offer-create/04-fill-or-kill/00015.png differ
diff --git a/tests/snapshots/nanos/12-offer-create/05-sell/00015.png b/tests/snapshots/nanos/12-offer-create/05-sell/00015.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/12-offer-create/05-sell/00015.png differ
diff --git a/tests/snapshots/nanos/12-offer-create/06-combo/00019.png b/tests/snapshots/nanos/12-offer-create/06-combo/00019.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/12-offer-create/06-combo/00019.png differ
diff --git a/tests/snapshots/nanos/13-payment-channel-claim/01-basic/00023.png b/tests/snapshots/nanos/13-payment-channel-claim/01-basic/00023.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/13-payment-channel-claim/01-basic/00023.png differ
diff --git a/tests/snapshots/nanos/13-payment-channel-claim/02-renew/00013.png b/tests/snapshots/nanos/13-payment-channel-claim/02-renew/00013.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/13-payment-channel-claim/02-renew/00013.png differ
diff --git a/tests/snapshots/nanos/13-payment-channel-claim/03-close/00013.png b/tests/snapshots/nanos/13-payment-channel-claim/03-close/00013.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/13-payment-channel-claim/03-close/00013.png differ
diff --git a/tests/snapshots/nanos/14-payment-channel-create/01-basic/00018.png b/tests/snapshots/nanos/14-payment-channel-create/01-basic/00018.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/14-payment-channel-create/01-basic/00018.png differ
diff --git a/tests/snapshots/nanos/15-payment-channel-fund/01-basic/00013.png b/tests/snapshots/nanos/15-payment-channel-fund/01-basic/00013.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/15-payment-channel-fund/01-basic/00013.png differ
diff --git a/tests/snapshots/nanos/16-signer-list-set/01-basic/00039.png b/tests/snapshots/nanos/16-signer-list-set/01-basic/00039.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/16-signer-list-set/01-basic/00039.png differ
diff --git a/tests/snapshots/nanos/16-signer-list-set/02-delete/00007.png b/tests/snapshots/nanos/16-signer-list-set/02-delete/00007.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/16-signer-list-set/02-delete/00007.png differ
diff --git a/tests/snapshots/nanos/17-trust-set/01-basic/00010.png b/tests/snapshots/nanos/17-trust-set/01-basic/00010.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/17-trust-set/01-basic/00010.png differ
diff --git a/tests/snapshots/nanos/17-trust-set/02-quality/00012.png b/tests/snapshots/nanos/17-trust-set/02-quality/00012.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/17-trust-set/02-quality/00012.png differ
diff --git a/tests/snapshots/nanos/17-trust-set/03-authorize/00011.png b/tests/snapshots/nanos/17-trust-set/03-authorize/00011.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/17-trust-set/03-authorize/00011.png differ
diff --git a/tests/snapshots/nanos/17-trust-set/04-no-rippling/00011.png b/tests/snapshots/nanos/17-trust-set/04-no-rippling/00011.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/17-trust-set/04-no-rippling/00011.png differ
diff --git a/tests/snapshots/nanos/17-trust-set/05-rippling/00011.png b/tests/snapshots/nanos/17-trust-set/05-rippling/00011.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/17-trust-set/05-rippling/00011.png differ
diff --git a/tests/snapshots/nanos/17-trust-set/06-freeze/00016.png b/tests/snapshots/nanos/17-trust-set/06-freeze/00016.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/17-trust-set/06-freeze/00016.png differ
diff --git a/tests/snapshots/nanos/17-trust-set/07-unfreeze/00017.png b/tests/snapshots/nanos/17-trust-set/07-unfreeze/00017.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/17-trust-set/07-unfreeze/00017.png differ
diff --git a/tests/snapshots/nanos/17-trust-set/08-non-standard-currency/00013.png b/tests/snapshots/nanos/17-trust-set/08-non-standard-currency/00013.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/17-trust-set/08-non-standard-currency/00013.png differ
diff --git a/tests/snapshots/nanos/17-trust-set/09-remove/00013.png b/tests/snapshots/nanos/17-trust-set/09-remove/00013.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/17-trust-set/09-remove/00013.png differ
diff --git a/tests/snapshots/nanos/18-arrays/01-basic/00012.png b/tests/snapshots/nanos/18-arrays/01-basic/00012.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/18-arrays/01-basic/00012.png differ
diff --git a/tests/snapshots/nanos/18-arrays/02-multiple/00014.png b/tests/snapshots/nanos/18-arrays/02-multiple/00014.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/18-arrays/02-multiple/00014.png differ
diff --git a/tests/snapshots/nanos/18-arrays/03-not-last/00016.png b/tests/snapshots/nanos/18-arrays/03-not-last/00016.png
new file mode 100644
index 00000000..9dee8ca0
Binary files /dev/null and b/tests/snapshots/nanos/18-arrays/03-not-last/00016.png differ
diff --git a/tests/snapshots/nanosp/01-payment/01-basic/00006.png b/tests/snapshots/nanosp/01-payment/01-basic/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/01-basic/00006.png differ
diff --git a/tests/snapshots/nanosp/01-payment/02-destination-tag/00007.png b/tests/snapshots/nanosp/01-payment/02-destination-tag/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/02-destination-tag/00007.png differ
diff --git a/tests/snapshots/nanosp/01-payment/03-source-tag/00007.png b/tests/snapshots/nanosp/01-payment/03-source-tag/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/03-source-tag/00007.png differ
diff --git a/tests/snapshots/nanosp/01-payment/04-both-tags/00008.png b/tests/snapshots/nanosp/01-payment/04-both-tags/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/04-both-tags/00008.png differ
diff --git a/tests/snapshots/nanosp/01-payment/05-invoice-id/00008.png b/tests/snapshots/nanosp/01-payment/05-invoice-id/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/05-invoice-id/00008.png differ
diff --git a/tests/snapshots/nanosp/01-payment/06-invoice-txn-ids-tags/00012.png b/tests/snapshots/nanosp/01-payment/06-invoice-txn-ids-tags/00012.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/06-invoice-txn-ids-tags/00012.png differ
diff --git a/tests/snapshots/nanosp/01-payment/07-issued-currency/00007.png b/tests/snapshots/nanosp/01-payment/07-issued-currency/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/07-issued-currency/00007.png differ
diff --git a/tests/snapshots/nanosp/01-payment/08-issued-currency-max/00008.png b/tests/snapshots/nanosp/01-payment/08-issued-currency-max/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/08-issued-currency-max/00008.png differ
diff --git a/tests/snapshots/nanosp/01-payment/09-issued-currency-min-partial/00009.png b/tests/snapshots/nanosp/01-payment/09-issued-currency-min-partial/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/09-issued-currency-min-partial/00009.png differ
diff --git a/tests/snapshots/nanosp/01-payment/10-issued-currency-quality-partial/00011.png b/tests/snapshots/nanosp/01-payment/10-issued-currency-quality-partial/00011.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/10-issued-currency-quality-partial/00011.png differ
diff --git a/tests/snapshots/nanosp/01-payment/11-issued-currency-paths/00023.png b/tests/snapshots/nanosp/01-payment/11-issued-currency-paths/00023.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/11-issued-currency-paths/00023.png differ
diff --git a/tests/snapshots/nanosp/01-payment/12-issued-currency-conversion/00014.png b/tests/snapshots/nanosp/01-payment/12-issued-currency-conversion/00014.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/12-issued-currency-conversion/00014.png differ
diff --git a/tests/snapshots/nanosp/01-payment/13-issued-currency-e-notation/00008.png b/tests/snapshots/nanosp/01-payment/13-issued-currency-e-notation/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/13-issued-currency-e-notation/00008.png differ
diff --git a/tests/snapshots/nanosp/01-payment/14-issued-currency-non-standard/00009.png b/tests/snapshots/nanosp/01-payment/14-issued-currency-non-standard/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/14-issued-currency-non-standard/00009.png differ
diff --git a/tests/snapshots/nanosp/01-payment/15-issue-abc-currency/00007.png b/tests/snapshots/nanosp/01-payment/15-issue-abc-currency/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/15-issue-abc-currency/00007.png differ
diff --git a/tests/snapshots/nanosp/01-payment/16-memos/00021.png b/tests/snapshots/nanosp/01-payment/16-memos/00021.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/16-memos/00021.png differ
diff --git a/tests/snapshots/nanosp/01-payment/17-multi-sign-parallel/00006.png b/tests/snapshots/nanosp/01-payment/17-multi-sign-parallel/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/17-multi-sign-parallel/00006.png differ
diff --git a/tests/snapshots/nanosp/01-payment/18-multi-sign-serial/00018.png b/tests/snapshots/nanosp/01-payment/18-multi-sign-serial/00018.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/01-payment/18-multi-sign-serial/00018.png differ
diff --git a/tests/snapshots/nanosp/02-set-regular-key/01-basic/00005.png b/tests/snapshots/nanosp/02-set-regular-key/01-basic/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/02-set-regular-key/01-basic/00005.png differ
diff --git a/tests/snapshots/nanosp/02-set-regular-key/02-delete/00005.png b/tests/snapshots/nanosp/02-set-regular-key/02-delete/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/02-set-regular-key/02-delete/00005.png differ
diff --git a/tests/snapshots/nanosp/02-set-regular-key/03-all-common-fields/00014.png b/tests/snapshots/nanosp/02-set-regular-key/03-all-common-fields/00014.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/02-set-regular-key/03-all-common-fields/00014.png differ
diff --git a/tests/snapshots/nanosp/03-escrow-create/01-finish-after/00007.png b/tests/snapshots/nanosp/03-escrow-create/01-finish-after/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/03-escrow-create/01-finish-after/00007.png differ
diff --git a/tests/snapshots/nanosp/03-escrow-create/02-cancel-after/00007.png b/tests/snapshots/nanosp/03-escrow-create/02-cancel-after/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/03-escrow-create/02-cancel-after/00007.png differ
diff --git a/tests/snapshots/nanosp/03-escrow-create/03-both/00008.png b/tests/snapshots/nanosp/03-escrow-create/03-both/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/03-escrow-create/03-both/00008.png differ
diff --git a/tests/snapshots/nanosp/03-escrow-create/04-both-condition/00010.png b/tests/snapshots/nanosp/03-escrow-create/04-both-condition/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/03-escrow-create/04-both-condition/00010.png differ
diff --git a/tests/snapshots/nanosp/03-escrow-create/05-both-condition-destination/00011.png b/tests/snapshots/nanosp/03-escrow-create/05-both-condition-destination/00011.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/03-escrow-create/05-both-condition-destination/00011.png differ
diff --git a/tests/snapshots/nanosp/03-escrow-create/06-all-common-fields/00020.png b/tests/snapshots/nanosp/03-escrow-create/06-all-common-fields/00020.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/03-escrow-create/06-all-common-fields/00020.png differ
diff --git a/tests/snapshots/nanosp/04-escrow-finish/01-time-based/00006.png b/tests/snapshots/nanosp/04-escrow-finish/01-time-based/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/04-escrow-finish/01-time-based/00006.png differ
diff --git a/tests/snapshots/nanosp/04-escrow-finish/02-condition-based/00009.png b/tests/snapshots/nanosp/04-escrow-finish/02-condition-based/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/04-escrow-finish/02-condition-based/00009.png differ
diff --git a/tests/snapshots/nanosp/05-escrow-cancel/01-basic/00006.png b/tests/snapshots/nanosp/05-escrow-cancel/01-basic/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/05-escrow-cancel/01-basic/00006.png differ
diff --git a/tests/snapshots/nanosp/06-account-set/01-basic/00013.png b/tests/snapshots/nanosp/06-account-set/01-basic/00013.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/06-account-set/01-basic/00013.png differ
diff --git a/tests/snapshots/nanosp/06-account-set/02-default-ripple/00005.png b/tests/snapshots/nanosp/06-account-set/02-default-ripple/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/06-account-set/02-default-ripple/00005.png differ
diff --git a/tests/snapshots/nanosp/06-account-set/03-deposit-auth/00005.png b/tests/snapshots/nanosp/06-account-set/03-deposit-auth/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/06-account-set/03-deposit-auth/00005.png differ
diff --git a/tests/snapshots/nanosp/06-account-set/04-disable-master/00005.png b/tests/snapshots/nanosp/06-account-set/04-disable-master/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/06-account-set/04-disable-master/00005.png differ
diff --git a/tests/snapshots/nanosp/06-account-set/05-disallow-xrp/00005.png b/tests/snapshots/nanosp/06-account-set/05-disallow-xrp/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/06-account-set/05-disallow-xrp/00005.png differ
diff --git a/tests/snapshots/nanosp/06-account-set/06-global-freeze/00005.png b/tests/snapshots/nanosp/06-account-set/06-global-freeze/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/06-account-set/06-global-freeze/00005.png differ
diff --git a/tests/snapshots/nanosp/06-account-set/07-no-freeze/00005.png b/tests/snapshots/nanosp/06-account-set/07-no-freeze/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/06-account-set/07-no-freeze/00005.png differ
diff --git a/tests/snapshots/nanosp/06-account-set/08-require-auth/00005.png b/tests/snapshots/nanosp/06-account-set/08-require-auth/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/06-account-set/08-require-auth/00005.png differ
diff --git a/tests/snapshots/nanosp/06-account-set/09-require-tag/00005.png b/tests/snapshots/nanosp/06-account-set/09-require-tag/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/06-account-set/09-require-tag/00005.png differ
diff --git a/tests/snapshots/nanosp/06-account-set/10-clear-account-txn-id/00005.png b/tests/snapshots/nanosp/06-account-set/10-clear-account-txn-id/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/06-account-set/10-clear-account-txn-id/00005.png differ
diff --git a/tests/snapshots/nanosp/07-check-cancel/01-basic/00006.png b/tests/snapshots/nanosp/07-check-cancel/01-basic/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/07-check-cancel/01-basic/00006.png differ
diff --git a/tests/snapshots/nanosp/08-check-cash/01-basic/00007.png b/tests/snapshots/nanosp/08-check-cash/01-basic/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/08-check-cash/01-basic/00007.png differ
diff --git a/tests/snapshots/nanosp/08-check-cash/02-amount/00007.png b/tests/snapshots/nanosp/08-check-cash/02-amount/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/08-check-cash/02-amount/00007.png differ
diff --git a/tests/snapshots/nanosp/08-check-cash/03-issued/00008.png b/tests/snapshots/nanosp/08-check-cash/03-issued/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/08-check-cash/03-issued/00008.png differ
diff --git a/tests/snapshots/nanosp/08-check-cash/04-issued-delivery-min/00009.png b/tests/snapshots/nanosp/08-check-cash/04-issued-delivery-min/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/08-check-cash/04-issued-delivery-min/00009.png differ
diff --git a/tests/snapshots/nanosp/09-check-create/01-basic/00009.png b/tests/snapshots/nanosp/09-check-create/01-basic/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/09-check-create/01-basic/00009.png differ
diff --git a/tests/snapshots/nanosp/09-check-create/02-issued/00012.png b/tests/snapshots/nanosp/09-check-create/02-issued/00012.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/09-check-create/02-issued/00012.png differ
diff --git a/tests/snapshots/nanosp/10-deposit-preauth/01-basic/00005.png b/tests/snapshots/nanosp/10-deposit-preauth/01-basic/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/10-deposit-preauth/01-basic/00005.png differ
diff --git a/tests/snapshots/nanosp/10-deposit-preauth/02-unauthorize/00005.png b/tests/snapshots/nanosp/10-deposit-preauth/02-unauthorize/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/10-deposit-preauth/02-unauthorize/00005.png differ
diff --git a/tests/snapshots/nanosp/11-offer-cancel/01-basic/00005.png b/tests/snapshots/nanosp/11-offer-cancel/01-basic/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/11-offer-cancel/01-basic/00005.png differ
diff --git a/tests/snapshots/nanosp/12-offer-create/01-basic/00009.png b/tests/snapshots/nanosp/12-offer-create/01-basic/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/12-offer-create/01-basic/00009.png differ
diff --git a/tests/snapshots/nanosp/12-offer-create/02-passive/00010.png b/tests/snapshots/nanosp/12-offer-create/02-passive/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/12-offer-create/02-passive/00010.png differ
diff --git a/tests/snapshots/nanosp/12-offer-create/03-immediate-or-cancel/00010.png b/tests/snapshots/nanosp/12-offer-create/03-immediate-or-cancel/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/12-offer-create/03-immediate-or-cancel/00010.png differ
diff --git a/tests/snapshots/nanosp/12-offer-create/04-fill-or-kill/00010.png b/tests/snapshots/nanosp/12-offer-create/04-fill-or-kill/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/12-offer-create/04-fill-or-kill/00010.png differ
diff --git a/tests/snapshots/nanosp/12-offer-create/05-sell/00010.png b/tests/snapshots/nanosp/12-offer-create/05-sell/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/12-offer-create/05-sell/00010.png differ
diff --git a/tests/snapshots/nanosp/12-offer-create/06-combo/00011.png b/tests/snapshots/nanosp/12-offer-create/06-combo/00011.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/12-offer-create/06-combo/00011.png differ
diff --git a/tests/snapshots/nanosp/13-payment-channel-claim/01-basic/00013.png b/tests/snapshots/nanosp/13-payment-channel-claim/01-basic/00013.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/13-payment-channel-claim/01-basic/00013.png differ
diff --git a/tests/snapshots/nanosp/13-payment-channel-claim/02-renew/00009.png b/tests/snapshots/nanosp/13-payment-channel-claim/02-renew/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/13-payment-channel-claim/02-renew/00009.png differ
diff --git a/tests/snapshots/nanosp/13-payment-channel-claim/03-close/00009.png b/tests/snapshots/nanosp/13-payment-channel-claim/03-close/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/13-payment-channel-claim/03-close/00009.png differ
diff --git a/tests/snapshots/nanosp/14-payment-channel-create/01-basic/00011.png b/tests/snapshots/nanosp/14-payment-channel-create/01-basic/00011.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/14-payment-channel-create/01-basic/00011.png differ
diff --git a/tests/snapshots/nanosp/15-payment-channel-fund/01-basic/00008.png b/tests/snapshots/nanosp/15-payment-channel-fund/01-basic/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/15-payment-channel-fund/01-basic/00008.png differ
diff --git a/tests/snapshots/nanosp/16-signer-list-set/01-basic/00021.png b/tests/snapshots/nanosp/16-signer-list-set/01-basic/00021.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/16-signer-list-set/01-basic/00021.png differ
diff --git a/tests/snapshots/nanosp/16-signer-list-set/02-delete/00005.png b/tests/snapshots/nanosp/16-signer-list-set/02-delete/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/16-signer-list-set/02-delete/00005.png differ
diff --git a/tests/snapshots/nanosp/17-trust-set/01-basic/00006.png b/tests/snapshots/nanosp/17-trust-set/01-basic/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/17-trust-set/01-basic/00006.png differ
diff --git a/tests/snapshots/nanosp/17-trust-set/02-quality/00008.png b/tests/snapshots/nanosp/17-trust-set/02-quality/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/17-trust-set/02-quality/00008.png differ
diff --git a/tests/snapshots/nanosp/17-trust-set/03-authorize/00007.png b/tests/snapshots/nanosp/17-trust-set/03-authorize/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/17-trust-set/03-authorize/00007.png differ
diff --git a/tests/snapshots/nanosp/17-trust-set/04-no-rippling/00007.png b/tests/snapshots/nanosp/17-trust-set/04-no-rippling/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/17-trust-set/04-no-rippling/00007.png differ
diff --git a/tests/snapshots/nanosp/17-trust-set/05-rippling/00007.png b/tests/snapshots/nanosp/17-trust-set/05-rippling/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/17-trust-set/05-rippling/00007.png differ
diff --git a/tests/snapshots/nanosp/17-trust-set/06-freeze/00008.png b/tests/snapshots/nanosp/17-trust-set/06-freeze/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/17-trust-set/06-freeze/00008.png differ
diff --git a/tests/snapshots/nanosp/17-trust-set/07-unfreeze/00009.png b/tests/snapshots/nanosp/17-trust-set/07-unfreeze/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/17-trust-set/07-unfreeze/00009.png differ
diff --git a/tests/snapshots/nanosp/17-trust-set/08-non-standard-currency/00007.png b/tests/snapshots/nanosp/17-trust-set/08-non-standard-currency/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/17-trust-set/08-non-standard-currency/00007.png differ
diff --git a/tests/snapshots/nanosp/17-trust-set/09-remove/00007.png b/tests/snapshots/nanosp/17-trust-set/09-remove/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/17-trust-set/09-remove/00007.png differ
diff --git a/tests/snapshots/nanosp/18-arrays/01-basic/00008.png b/tests/snapshots/nanosp/18-arrays/01-basic/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/18-arrays/01-basic/00008.png differ
diff --git a/tests/snapshots/nanosp/18-arrays/02-multiple/00010.png b/tests/snapshots/nanosp/18-arrays/02-multiple/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/18-arrays/02-multiple/00010.png differ
diff --git a/tests/snapshots/nanosp/18-arrays/03-not-last/00010.png b/tests/snapshots/nanosp/18-arrays/03-not-last/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanosp/18-arrays/03-not-last/00010.png differ
diff --git a/tests/snapshots/nanox/01-payment/01-basic/00006.png b/tests/snapshots/nanox/01-payment/01-basic/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/01-basic/00006.png differ
diff --git a/tests/snapshots/nanox/01-payment/02-destination-tag/00007.png b/tests/snapshots/nanox/01-payment/02-destination-tag/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/02-destination-tag/00007.png differ
diff --git a/tests/snapshots/nanox/01-payment/03-source-tag/00007.png b/tests/snapshots/nanox/01-payment/03-source-tag/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/03-source-tag/00007.png differ
diff --git a/tests/snapshots/nanox/01-payment/04-both-tags/00008.png b/tests/snapshots/nanox/01-payment/04-both-tags/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/04-both-tags/00008.png differ
diff --git a/tests/snapshots/nanox/01-payment/05-invoice-id/00008.png b/tests/snapshots/nanox/01-payment/05-invoice-id/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/05-invoice-id/00008.png differ
diff --git a/tests/snapshots/nanox/01-payment/06-invoice-txn-ids-tags/00012.png b/tests/snapshots/nanox/01-payment/06-invoice-txn-ids-tags/00012.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/06-invoice-txn-ids-tags/00012.png differ
diff --git a/tests/snapshots/nanox/01-payment/07-issued-currency/00007.png b/tests/snapshots/nanox/01-payment/07-issued-currency/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/07-issued-currency/00007.png differ
diff --git a/tests/snapshots/nanox/01-payment/08-issued-currency-max/00008.png b/tests/snapshots/nanox/01-payment/08-issued-currency-max/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/08-issued-currency-max/00008.png differ
diff --git a/tests/snapshots/nanox/01-payment/09-issued-currency-min-partial/00009.png b/tests/snapshots/nanox/01-payment/09-issued-currency-min-partial/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/09-issued-currency-min-partial/00009.png differ
diff --git a/tests/snapshots/nanox/01-payment/10-issued-currency-quality-partial/00011.png b/tests/snapshots/nanox/01-payment/10-issued-currency-quality-partial/00011.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/10-issued-currency-quality-partial/00011.png differ
diff --git a/tests/snapshots/nanox/01-payment/11-issued-currency-paths/00023.png b/tests/snapshots/nanox/01-payment/11-issued-currency-paths/00023.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/11-issued-currency-paths/00023.png differ
diff --git a/tests/snapshots/nanox/01-payment/12-issued-currency-conversion/00014.png b/tests/snapshots/nanox/01-payment/12-issued-currency-conversion/00014.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/12-issued-currency-conversion/00014.png differ
diff --git a/tests/snapshots/nanox/01-payment/13-issued-currency-e-notation/00008.png b/tests/snapshots/nanox/01-payment/13-issued-currency-e-notation/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/13-issued-currency-e-notation/00008.png differ
diff --git a/tests/snapshots/nanox/01-payment/14-issued-currency-non-standard/00009.png b/tests/snapshots/nanox/01-payment/14-issued-currency-non-standard/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/14-issued-currency-non-standard/00009.png differ
diff --git a/tests/snapshots/nanox/01-payment/15-issue-abc-currency/00007.png b/tests/snapshots/nanox/01-payment/15-issue-abc-currency/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/15-issue-abc-currency/00007.png differ
diff --git a/tests/snapshots/nanox/01-payment/16-memos/00021.png b/tests/snapshots/nanox/01-payment/16-memos/00021.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/16-memos/00021.png differ
diff --git a/tests/snapshots/nanox/01-payment/17-multi-sign-parallel/00006.png b/tests/snapshots/nanox/01-payment/17-multi-sign-parallel/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/17-multi-sign-parallel/00006.png differ
diff --git a/tests/snapshots/nanox/01-payment/18-multi-sign-serial/00018.png b/tests/snapshots/nanox/01-payment/18-multi-sign-serial/00018.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/01-payment/18-multi-sign-serial/00018.png differ
diff --git a/tests/snapshots/nanox/02-set-regular-key/01-basic/00005.png b/tests/snapshots/nanox/02-set-regular-key/01-basic/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/02-set-regular-key/01-basic/00005.png differ
diff --git a/tests/snapshots/nanox/02-set-regular-key/02-delete/00005.png b/tests/snapshots/nanox/02-set-regular-key/02-delete/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/02-set-regular-key/02-delete/00005.png differ
diff --git a/tests/snapshots/nanox/02-set-regular-key/03-all-common-fields/00014.png b/tests/snapshots/nanox/02-set-regular-key/03-all-common-fields/00014.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/02-set-regular-key/03-all-common-fields/00014.png differ
diff --git a/tests/snapshots/nanox/03-escrow-create/01-finish-after/00007.png b/tests/snapshots/nanox/03-escrow-create/01-finish-after/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/03-escrow-create/01-finish-after/00007.png differ
diff --git a/tests/snapshots/nanox/03-escrow-create/02-cancel-after/00007.png b/tests/snapshots/nanox/03-escrow-create/02-cancel-after/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/03-escrow-create/02-cancel-after/00007.png differ
diff --git a/tests/snapshots/nanox/03-escrow-create/03-both/00008.png b/tests/snapshots/nanox/03-escrow-create/03-both/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/03-escrow-create/03-both/00008.png differ
diff --git a/tests/snapshots/nanox/03-escrow-create/04-both-condition/00010.png b/tests/snapshots/nanox/03-escrow-create/04-both-condition/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/03-escrow-create/04-both-condition/00010.png differ
diff --git a/tests/snapshots/nanox/03-escrow-create/05-both-condition-destination/00011.png b/tests/snapshots/nanox/03-escrow-create/05-both-condition-destination/00011.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/03-escrow-create/05-both-condition-destination/00011.png differ
diff --git a/tests/snapshots/nanox/03-escrow-create/06-all-common-fields/00020.png b/tests/snapshots/nanox/03-escrow-create/06-all-common-fields/00020.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/03-escrow-create/06-all-common-fields/00020.png differ
diff --git a/tests/snapshots/nanox/04-escrow-finish/01-time-based/00006.png b/tests/snapshots/nanox/04-escrow-finish/01-time-based/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/04-escrow-finish/01-time-based/00006.png differ
diff --git a/tests/snapshots/nanox/04-escrow-finish/02-condition-based/00009.png b/tests/snapshots/nanox/04-escrow-finish/02-condition-based/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/04-escrow-finish/02-condition-based/00009.png differ
diff --git a/tests/snapshots/nanox/05-escrow-cancel/01-basic/00006.png b/tests/snapshots/nanox/05-escrow-cancel/01-basic/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/05-escrow-cancel/01-basic/00006.png differ
diff --git a/tests/snapshots/nanox/06-account-set/01-basic/00013.png b/tests/snapshots/nanox/06-account-set/01-basic/00013.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/06-account-set/01-basic/00013.png differ
diff --git a/tests/snapshots/nanox/06-account-set/02-default-ripple/00005.png b/tests/snapshots/nanox/06-account-set/02-default-ripple/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/06-account-set/02-default-ripple/00005.png differ
diff --git a/tests/snapshots/nanox/06-account-set/03-deposit-auth/00005.png b/tests/snapshots/nanox/06-account-set/03-deposit-auth/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/06-account-set/03-deposit-auth/00005.png differ
diff --git a/tests/snapshots/nanox/06-account-set/04-disable-master/00005.png b/tests/snapshots/nanox/06-account-set/04-disable-master/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/06-account-set/04-disable-master/00005.png differ
diff --git a/tests/snapshots/nanox/06-account-set/05-disallow-xrp/00005.png b/tests/snapshots/nanox/06-account-set/05-disallow-xrp/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/06-account-set/05-disallow-xrp/00005.png differ
diff --git a/tests/snapshots/nanox/06-account-set/06-global-freeze/00005.png b/tests/snapshots/nanox/06-account-set/06-global-freeze/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/06-account-set/06-global-freeze/00005.png differ
diff --git a/tests/snapshots/nanox/06-account-set/07-no-freeze/00005.png b/tests/snapshots/nanox/06-account-set/07-no-freeze/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/06-account-set/07-no-freeze/00005.png differ
diff --git a/tests/snapshots/nanox/06-account-set/08-require-auth/00005.png b/tests/snapshots/nanox/06-account-set/08-require-auth/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/06-account-set/08-require-auth/00005.png differ
diff --git a/tests/snapshots/nanox/06-account-set/09-require-tag/00005.png b/tests/snapshots/nanox/06-account-set/09-require-tag/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/06-account-set/09-require-tag/00005.png differ
diff --git a/tests/snapshots/nanox/06-account-set/10-clear-account-txn-id/00005.png b/tests/snapshots/nanox/06-account-set/10-clear-account-txn-id/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/06-account-set/10-clear-account-txn-id/00005.png differ
diff --git a/tests/snapshots/nanox/07-check-cancel/01-basic/00006.png b/tests/snapshots/nanox/07-check-cancel/01-basic/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/07-check-cancel/01-basic/00006.png differ
diff --git a/tests/snapshots/nanox/08-check-cash/01-basic/00007.png b/tests/snapshots/nanox/08-check-cash/01-basic/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/08-check-cash/01-basic/00007.png differ
diff --git a/tests/snapshots/nanox/08-check-cash/02-amount/00007.png b/tests/snapshots/nanox/08-check-cash/02-amount/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/08-check-cash/02-amount/00007.png differ
diff --git a/tests/snapshots/nanox/08-check-cash/03-issued/00008.png b/tests/snapshots/nanox/08-check-cash/03-issued/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/08-check-cash/03-issued/00008.png differ
diff --git a/tests/snapshots/nanox/08-check-cash/04-issued-delivery-min/00009.png b/tests/snapshots/nanox/08-check-cash/04-issued-delivery-min/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/08-check-cash/04-issued-delivery-min/00009.png differ
diff --git a/tests/snapshots/nanox/09-check-create/01-basic/00009.png b/tests/snapshots/nanox/09-check-create/01-basic/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/09-check-create/01-basic/00009.png differ
diff --git a/tests/snapshots/nanox/09-check-create/02-issued/00012.png b/tests/snapshots/nanox/09-check-create/02-issued/00012.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/09-check-create/02-issued/00012.png differ
diff --git a/tests/snapshots/nanox/10-deposit-preauth/01-basic/00005.png b/tests/snapshots/nanox/10-deposit-preauth/01-basic/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/10-deposit-preauth/01-basic/00005.png differ
diff --git a/tests/snapshots/nanox/10-deposit-preauth/02-unauthorize/00005.png b/tests/snapshots/nanox/10-deposit-preauth/02-unauthorize/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/10-deposit-preauth/02-unauthorize/00005.png differ
diff --git a/tests/snapshots/nanox/11-offer-cancel/01-basic/00005.png b/tests/snapshots/nanox/11-offer-cancel/01-basic/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/11-offer-cancel/01-basic/00005.png differ
diff --git a/tests/snapshots/nanox/12-offer-create/01-basic/00009.png b/tests/snapshots/nanox/12-offer-create/01-basic/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/12-offer-create/01-basic/00009.png differ
diff --git a/tests/snapshots/nanox/12-offer-create/02-passive/00010.png b/tests/snapshots/nanox/12-offer-create/02-passive/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/12-offer-create/02-passive/00010.png differ
diff --git a/tests/snapshots/nanox/12-offer-create/03-immediate-or-cancel/00010.png b/tests/snapshots/nanox/12-offer-create/03-immediate-or-cancel/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/12-offer-create/03-immediate-or-cancel/00010.png differ
diff --git a/tests/snapshots/nanox/12-offer-create/04-fill-or-kill/00010.png b/tests/snapshots/nanox/12-offer-create/04-fill-or-kill/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/12-offer-create/04-fill-or-kill/00010.png differ
diff --git a/tests/snapshots/nanox/12-offer-create/05-sell/00010.png b/tests/snapshots/nanox/12-offer-create/05-sell/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/12-offer-create/05-sell/00010.png differ
diff --git a/tests/snapshots/nanox/12-offer-create/06-combo/00011.png b/tests/snapshots/nanox/12-offer-create/06-combo/00011.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/12-offer-create/06-combo/00011.png differ
diff --git a/tests/snapshots/nanox/13-payment-channel-claim/01-basic/00013.png b/tests/snapshots/nanox/13-payment-channel-claim/01-basic/00013.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/13-payment-channel-claim/01-basic/00013.png differ
diff --git a/tests/snapshots/nanox/13-payment-channel-claim/02-renew/00009.png b/tests/snapshots/nanox/13-payment-channel-claim/02-renew/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/13-payment-channel-claim/02-renew/00009.png differ
diff --git a/tests/snapshots/nanox/13-payment-channel-claim/03-close/00009.png b/tests/snapshots/nanox/13-payment-channel-claim/03-close/00009.png
index 71f419b1..008914e4 100644
Binary files a/tests/snapshots/nanox/13-payment-channel-claim/03-close/00009.png and b/tests/snapshots/nanox/13-payment-channel-claim/03-close/00009.png differ
diff --git a/tests/snapshots/nanox/14-payment-channel-create/01-basic/00011.png b/tests/snapshots/nanox/14-payment-channel-create/01-basic/00011.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/14-payment-channel-create/01-basic/00011.png differ
diff --git a/tests/snapshots/nanox/15-payment-channel-fund/01-basic/00008.png b/tests/snapshots/nanox/15-payment-channel-fund/01-basic/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/15-payment-channel-fund/01-basic/00008.png differ
diff --git a/tests/snapshots/nanox/16-signer-list-set/01-basic/00021.png b/tests/snapshots/nanox/16-signer-list-set/01-basic/00021.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/16-signer-list-set/01-basic/00021.png differ
diff --git a/tests/snapshots/nanox/16-signer-list-set/02-delete/00005.png b/tests/snapshots/nanox/16-signer-list-set/02-delete/00005.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/16-signer-list-set/02-delete/00005.png differ
diff --git a/tests/snapshots/nanox/17-trust-set/01-basic/00006.png b/tests/snapshots/nanox/17-trust-set/01-basic/00006.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/17-trust-set/01-basic/00006.png differ
diff --git a/tests/snapshots/nanox/17-trust-set/02-quality/00008.png b/tests/snapshots/nanox/17-trust-set/02-quality/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/17-trust-set/02-quality/00008.png differ
diff --git a/tests/snapshots/nanox/17-trust-set/03-authorize/00007.png b/tests/snapshots/nanox/17-trust-set/03-authorize/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/17-trust-set/03-authorize/00007.png differ
diff --git a/tests/snapshots/nanox/17-trust-set/04-no-rippling/00007.png b/tests/snapshots/nanox/17-trust-set/04-no-rippling/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/17-trust-set/04-no-rippling/00007.png differ
diff --git a/tests/snapshots/nanox/17-trust-set/05-rippling/00007.png b/tests/snapshots/nanox/17-trust-set/05-rippling/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/17-trust-set/05-rippling/00007.png differ
diff --git a/tests/snapshots/nanox/17-trust-set/06-freeze/00008.png b/tests/snapshots/nanox/17-trust-set/06-freeze/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/17-trust-set/06-freeze/00008.png differ
diff --git a/tests/snapshots/nanox/17-trust-set/07-unfreeze/00009.png b/tests/snapshots/nanox/17-trust-set/07-unfreeze/00009.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/17-trust-set/07-unfreeze/00009.png differ
diff --git a/tests/snapshots/nanox/17-trust-set/08-non-standard-currency/00007.png b/tests/snapshots/nanox/17-trust-set/08-non-standard-currency/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/17-trust-set/08-non-standard-currency/00007.png differ
diff --git a/tests/snapshots/nanox/17-trust-set/09-remove/00007.png b/tests/snapshots/nanox/17-trust-set/09-remove/00007.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/17-trust-set/09-remove/00007.png differ
diff --git a/tests/snapshots/nanox/18-arrays/01-basic/00008.png b/tests/snapshots/nanox/18-arrays/01-basic/00008.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/18-arrays/01-basic/00008.png differ
diff --git a/tests/snapshots/nanox/18-arrays/02-multiple/00010.png b/tests/snapshots/nanox/18-arrays/02-multiple/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/18-arrays/02-multiple/00010.png differ
diff --git a/tests/snapshots/nanox/18-arrays/03-not-last/00010.png b/tests/snapshots/nanox/18-arrays/03-not-last/00010.png
new file mode 100644
index 00000000..008914e4
Binary files /dev/null and b/tests/snapshots/nanox/18-arrays/03-not-last/00010.png differ
diff --git a/tests/snapshots/stax/01-payment/01-basic/00000.png b/tests/snapshots/stax/01-payment/01-basic/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/01-payment/01-basic/00000.png and b/tests/snapshots/stax/01-payment/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/01-basic/00001.png b/tests/snapshots/stax/01-payment/01-basic/00001.png
index 2e742645..d300f6af 100644
Binary files a/tests/snapshots/stax/01-payment/01-basic/00001.png and b/tests/snapshots/stax/01-payment/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/01-basic/00002.png b/tests/snapshots/stax/01-payment/01-basic/00002.png
index 242d3e08..9a80ac12 100644
Binary files a/tests/snapshots/stax/01-payment/01-basic/00002.png and b/tests/snapshots/stax/01-payment/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/01-basic/00003.png b/tests/snapshots/stax/01-payment/01-basic/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/01-payment/01-basic/00003.png and b/tests/snapshots/stax/01-payment/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/01-basic/00004.png b/tests/snapshots/stax/01-payment/01-basic/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/01-basic/00004.png and b/tests/snapshots/stax/01-payment/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/01-basic/00005.png b/tests/snapshots/stax/01-payment/01-basic/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/02-destination-tag/00000.png b/tests/snapshots/stax/01-payment/02-destination-tag/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/01-payment/02-destination-tag/00000.png and b/tests/snapshots/stax/01-payment/02-destination-tag/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/02-destination-tag/00001.png b/tests/snapshots/stax/01-payment/02-destination-tag/00001.png
index b1ce4325..7ac615ea 100644
Binary files a/tests/snapshots/stax/01-payment/02-destination-tag/00001.png and b/tests/snapshots/stax/01-payment/02-destination-tag/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/02-destination-tag/00002.png b/tests/snapshots/stax/01-payment/02-destination-tag/00002.png
index 24f60984..be3692c4 100644
Binary files a/tests/snapshots/stax/01-payment/02-destination-tag/00002.png and b/tests/snapshots/stax/01-payment/02-destination-tag/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/02-destination-tag/00003.png b/tests/snapshots/stax/01-payment/02-destination-tag/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/01-payment/02-destination-tag/00003.png and b/tests/snapshots/stax/01-payment/02-destination-tag/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/02-destination-tag/00004.png b/tests/snapshots/stax/01-payment/02-destination-tag/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/02-destination-tag/00004.png and b/tests/snapshots/stax/01-payment/02-destination-tag/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/02-destination-tag/00005.png b/tests/snapshots/stax/01-payment/02-destination-tag/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/02-destination-tag/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/03-source-tag/00000.png b/tests/snapshots/stax/01-payment/03-source-tag/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/01-payment/03-source-tag/00000.png and b/tests/snapshots/stax/01-payment/03-source-tag/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/03-source-tag/00001.png b/tests/snapshots/stax/01-payment/03-source-tag/00001.png
index 072ad4b6..4feb093b 100644
Binary files a/tests/snapshots/stax/01-payment/03-source-tag/00001.png and b/tests/snapshots/stax/01-payment/03-source-tag/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/03-source-tag/00002.png b/tests/snapshots/stax/01-payment/03-source-tag/00002.png
index 24f60984..be3692c4 100644
Binary files a/tests/snapshots/stax/01-payment/03-source-tag/00002.png and b/tests/snapshots/stax/01-payment/03-source-tag/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/03-source-tag/00003.png b/tests/snapshots/stax/01-payment/03-source-tag/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/01-payment/03-source-tag/00003.png and b/tests/snapshots/stax/01-payment/03-source-tag/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/03-source-tag/00004.png b/tests/snapshots/stax/01-payment/03-source-tag/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/03-source-tag/00004.png and b/tests/snapshots/stax/01-payment/03-source-tag/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/03-source-tag/00005.png b/tests/snapshots/stax/01-payment/03-source-tag/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/03-source-tag/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/04-both-tags/00000.png b/tests/snapshots/stax/01-payment/04-both-tags/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/01-payment/04-both-tags/00000.png and b/tests/snapshots/stax/01-payment/04-both-tags/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/04-both-tags/00001.png b/tests/snapshots/stax/01-payment/04-both-tags/00001.png
index faa09569..8cee7abb 100644
Binary files a/tests/snapshots/stax/01-payment/04-both-tags/00001.png and b/tests/snapshots/stax/01-payment/04-both-tags/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/04-both-tags/00002.png b/tests/snapshots/stax/01-payment/04-both-tags/00002.png
index 0ee09b51..1e204112 100644
Binary files a/tests/snapshots/stax/01-payment/04-both-tags/00002.png and b/tests/snapshots/stax/01-payment/04-both-tags/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/04-both-tags/00003.png b/tests/snapshots/stax/01-payment/04-both-tags/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/01-payment/04-both-tags/00003.png and b/tests/snapshots/stax/01-payment/04-both-tags/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/04-both-tags/00004.png b/tests/snapshots/stax/01-payment/04-both-tags/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/04-both-tags/00004.png and b/tests/snapshots/stax/01-payment/04-both-tags/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/04-both-tags/00005.png b/tests/snapshots/stax/01-payment/04-both-tags/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/04-both-tags/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/05-invoice-id/00000.png b/tests/snapshots/stax/01-payment/05-invoice-id/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/01-payment/05-invoice-id/00000.png and b/tests/snapshots/stax/01-payment/05-invoice-id/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/05-invoice-id/00001.png b/tests/snapshots/stax/01-payment/05-invoice-id/00001.png
index 8053e666..89cde85a 100644
Binary files a/tests/snapshots/stax/01-payment/05-invoice-id/00001.png and b/tests/snapshots/stax/01-payment/05-invoice-id/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/05-invoice-id/00002.png b/tests/snapshots/stax/01-payment/05-invoice-id/00002.png
index 941e7f56..192971c5 100644
Binary files a/tests/snapshots/stax/01-payment/05-invoice-id/00002.png and b/tests/snapshots/stax/01-payment/05-invoice-id/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/05-invoice-id/00003.png b/tests/snapshots/stax/01-payment/05-invoice-id/00003.png
index e5288285..a4029ea2 100644
Binary files a/tests/snapshots/stax/01-payment/05-invoice-id/00003.png and b/tests/snapshots/stax/01-payment/05-invoice-id/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/05-invoice-id/00004.png b/tests/snapshots/stax/01-payment/05-invoice-id/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/01-payment/05-invoice-id/00004.png and b/tests/snapshots/stax/01-payment/05-invoice-id/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/05-invoice-id/00005.png b/tests/snapshots/stax/01-payment/05-invoice-id/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/05-invoice-id/00005.png and b/tests/snapshots/stax/01-payment/05-invoice-id/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/05-invoice-id/00006.png b/tests/snapshots/stax/01-payment/05-invoice-id/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/05-invoice-id/00006.png differ
diff --git a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00000.png b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00000.png
index beb25deb..42f09455 100644
Binary files a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00000.png and b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00001.png b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00001.png
index 15fdc04a..6a298a23 100644
Binary files a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00001.png and b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00002.png b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00002.png
index 2baaa2ad..3206cb73 100644
Binary files a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00002.png and b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00003.png b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00003.png
index 2ba6db5b..aac9497f 100644
Binary files a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00003.png and b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00004.png b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00004.png
index cb1da889..c13e3d8a 100644
Binary files a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00004.png and b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00005.png b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00005.png
index 95561713..2e538fa0 100644
Binary files a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00005.png and b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00006.png b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00006.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00006.png and b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00006.png differ
diff --git a/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00007.png b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00007.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/06-invoice-txn-ids-tags/00007.png differ
diff --git a/tests/snapshots/stax/01-payment/07-issued-currency/00000.png b/tests/snapshots/stax/01-payment/07-issued-currency/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/01-payment/07-issued-currency/00000.png and b/tests/snapshots/stax/01-payment/07-issued-currency/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/07-issued-currency/00001.png b/tests/snapshots/stax/01-payment/07-issued-currency/00001.png
index a324004f..1e95f775 100644
Binary files a/tests/snapshots/stax/01-payment/07-issued-currency/00001.png and b/tests/snapshots/stax/01-payment/07-issued-currency/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/07-issued-currency/00002.png b/tests/snapshots/stax/01-payment/07-issued-currency/00002.png
index 14b3e80f..78c854fb 100644
Binary files a/tests/snapshots/stax/01-payment/07-issued-currency/00002.png and b/tests/snapshots/stax/01-payment/07-issued-currency/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/07-issued-currency/00003.png b/tests/snapshots/stax/01-payment/07-issued-currency/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/01-payment/07-issued-currency/00003.png and b/tests/snapshots/stax/01-payment/07-issued-currency/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/07-issued-currency/00004.png b/tests/snapshots/stax/01-payment/07-issued-currency/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/07-issued-currency/00004.png and b/tests/snapshots/stax/01-payment/07-issued-currency/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/07-issued-currency/00005.png b/tests/snapshots/stax/01-payment/07-issued-currency/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/07-issued-currency/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/08-issued-currency-max/00000.png b/tests/snapshots/stax/01-payment/08-issued-currency-max/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/01-payment/08-issued-currency-max/00000.png and b/tests/snapshots/stax/01-payment/08-issued-currency-max/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/08-issued-currency-max/00001.png b/tests/snapshots/stax/01-payment/08-issued-currency-max/00001.png
index d841432e..5aee5dac 100644
Binary files a/tests/snapshots/stax/01-payment/08-issued-currency-max/00001.png and b/tests/snapshots/stax/01-payment/08-issued-currency-max/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/08-issued-currency-max/00002.png b/tests/snapshots/stax/01-payment/08-issued-currency-max/00002.png
index 49773d67..acd3d413 100644
Binary files a/tests/snapshots/stax/01-payment/08-issued-currency-max/00002.png and b/tests/snapshots/stax/01-payment/08-issued-currency-max/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/08-issued-currency-max/00003.png b/tests/snapshots/stax/01-payment/08-issued-currency-max/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/01-payment/08-issued-currency-max/00003.png and b/tests/snapshots/stax/01-payment/08-issued-currency-max/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/08-issued-currency-max/00004.png b/tests/snapshots/stax/01-payment/08-issued-currency-max/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/08-issued-currency-max/00004.png and b/tests/snapshots/stax/01-payment/08-issued-currency-max/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/08-issued-currency-max/00005.png b/tests/snapshots/stax/01-payment/08-issued-currency-max/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/08-issued-currency-max/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00000.png b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00000.png and b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00001.png b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00001.png
index 68bd978d..bdd3eca3 100644
Binary files a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00001.png and b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00002.png b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00002.png
index 1c2238cd..7821d450 100644
Binary files a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00002.png and b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00003.png b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00003.png
index e5288285..a4029ea2 100644
Binary files a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00003.png and b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00004.png b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00004.png and b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00005.png b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00005.png and b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00006.png b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/09-issued-currency-min-partial/00006.png differ
diff --git a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00000.png b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00000.png and b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00001.png b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00001.png
index d7f339f9..6df5fd34 100644
Binary files a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00001.png and b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00002.png b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00002.png
index db995fcc..f3879dc8 100644
Binary files a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00002.png and b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00003.png b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00003.png
index ce1be340..ba1c5b8d 100644
Binary files a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00003.png and b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00004.png b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00004.png and b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00005.png b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00005.png and b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00006.png b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/10-issued-currency-quality-partial/00006.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00000.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00000.png
index beb25deb..383aa314 100644
Binary files a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00000.png and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00001.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00001.png
index 35e550fe..dd0c6869 100644
Binary files a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00001.png and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00002.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00002.png
index 6570faeb..9d639985 100644
Binary files a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00002.png and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00003.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00003.png
index df4c6898..357cce87 100644
Binary files a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00003.png and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00004.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00004.png
index fbfb3d5e..f032615f 100644
Binary files a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00004.png and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00005.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00005.png
index 98477340..af730dcd 100644
Binary files a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00005.png and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00006.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00006.png
index 46685227..275a224b 100644
Binary files a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00006.png and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00006.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00007.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00007.png
index 6d988ece..4d398559 100644
Binary files a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00007.png and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00007.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00008.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00008.png
index e7970d67..7dae1b6b 100644
Binary files a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00008.png and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00008.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00009.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00009.png
index 2e459419..bd0eda18 100644
Binary files a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00009.png and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00009.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00010.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00010.png
new file mode 100644
index 00000000..2ba6d27d
Binary files /dev/null and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00010.png differ
diff --git a/tests/snapshots/stax/01-payment/11-issued-currency-paths/00011.png b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00011.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/11-issued-currency-paths/00011.png differ
diff --git a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00000.png b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00000.png
index beb25deb..2c69bd2f 100644
Binary files a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00000.png and b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00001.png b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00001.png
index da56fafb..b1e1394c 100644
Binary files a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00001.png and b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00002.png b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00002.png
index c7fc65f0..20b97467 100644
Binary files a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00002.png and b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00003.png b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00003.png
index a13ae15f..395bce60 100644
Binary files a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00003.png and b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00004.png b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00004.png
index 3b592f53..5504faed 100644
Binary files a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00004.png and b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00005.png b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00005.png
index c588e05a..d35967d7 100644
Binary files a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00005.png and b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00006.png b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00006.png
index 7395f0e9..f62ea79d 100644
Binary files a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00006.png and b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00006.png differ
diff --git a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00007.png b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00007.png
new file mode 100644
index 00000000..2ba6d27d
Binary files /dev/null and b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00007.png differ
diff --git a/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00008.png b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00008.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/12-issued-currency-conversion/00008.png differ
diff --git a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00000.png b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00000.png and b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00001.png b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00001.png
index 14983125..771933a6 100644
Binary files a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00001.png and b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00002.png b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00002.png
index d794e410..d3832d15 100644
Binary files a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00002.png and b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00003.png b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00003.png
index e5288285..a4029ea2 100644
Binary files a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00003.png and b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00004.png b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00004.png and b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00005.png b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00005.png and b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00006.png b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/13-issued-currency-e-notation/00006.png differ
diff --git a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00000.png b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00000.png and b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00001.png b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00001.png
index 6b77f8e6..5fa17067 100644
Binary files a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00001.png and b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00002.png b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00002.png
index 4bad18e7..cb0ca852 100644
Binary files a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00002.png and b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00003.png b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00003.png
index 9bccd78f..c8ed5afc 100644
Binary files a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00003.png and b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00004.png b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00004.png and b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00005.png b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00005.png and b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00006.png b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/14-issued-currency-non-standard/00006.png differ
diff --git a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00000.png b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00000.png and b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00001.png b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00001.png
index 373b99b5..cdb38e8e 100644
Binary files a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00001.png and b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00002.png b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00002.png
index f495d8ba..0571e032 100644
Binary files a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00002.png and b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00003.png b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00003.png and b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00004.png b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00004.png and b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/15-issue-abc-currency/00005.png b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/15-issue-abc-currency/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/16-memos/00000.png b/tests/snapshots/stax/01-payment/16-memos/00000.png
index beb25deb..288aefbc 100644
Binary files a/tests/snapshots/stax/01-payment/16-memos/00000.png and b/tests/snapshots/stax/01-payment/16-memos/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/16-memos/00001.png b/tests/snapshots/stax/01-payment/16-memos/00001.png
index 02511970..3d24fda1 100644
Binary files a/tests/snapshots/stax/01-payment/16-memos/00001.png and b/tests/snapshots/stax/01-payment/16-memos/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/16-memos/00002.png b/tests/snapshots/stax/01-payment/16-memos/00002.png
index 96a76163..21e3345d 100644
Binary files a/tests/snapshots/stax/01-payment/16-memos/00002.png and b/tests/snapshots/stax/01-payment/16-memos/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/16-memos/00003.png b/tests/snapshots/stax/01-payment/16-memos/00003.png
index 4d9536d5..f7822f1f 100644
Binary files a/tests/snapshots/stax/01-payment/16-memos/00003.png and b/tests/snapshots/stax/01-payment/16-memos/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/16-memos/00004.png b/tests/snapshots/stax/01-payment/16-memos/00004.png
index 5028fa14..a470d2f9 100644
Binary files a/tests/snapshots/stax/01-payment/16-memos/00004.png and b/tests/snapshots/stax/01-payment/16-memos/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/16-memos/00005.png b/tests/snapshots/stax/01-payment/16-memos/00005.png
index bbea44b0..28b3e97a 100644
Binary files a/tests/snapshots/stax/01-payment/16-memos/00005.png and b/tests/snapshots/stax/01-payment/16-memos/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/16-memos/00006.png b/tests/snapshots/stax/01-payment/16-memos/00006.png
index 3b9155e0..eadf8320 100644
Binary files a/tests/snapshots/stax/01-payment/16-memos/00006.png and b/tests/snapshots/stax/01-payment/16-memos/00006.png differ
diff --git a/tests/snapshots/stax/01-payment/16-memos/00007.png b/tests/snapshots/stax/01-payment/16-memos/00007.png
index 311479c7..196fc8b4 100644
Binary files a/tests/snapshots/stax/01-payment/16-memos/00007.png and b/tests/snapshots/stax/01-payment/16-memos/00007.png differ
diff --git a/tests/snapshots/stax/01-payment/16-memos/00008.png b/tests/snapshots/stax/01-payment/16-memos/00008.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/16-memos/00008.png and b/tests/snapshots/stax/01-payment/16-memos/00008.png differ
diff --git a/tests/snapshots/stax/01-payment/16-memos/00009.png b/tests/snapshots/stax/01-payment/16-memos/00009.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/16-memos/00009.png differ
diff --git a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00000.png b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00000.png and b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00001.png b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00001.png
index fc4b68e6..70f056af 100644
Binary files a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00001.png and b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00002.png b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00002.png
index 242d3e08..9a80ac12 100644
Binary files a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00002.png and b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00003.png b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00003.png and b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00004.png b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00004.png and b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00005.png b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/17-multi-sign-parallel/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00000.png b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00000.png
index beb25deb..288aefbc 100644
Binary files a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00000.png and b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00000.png differ
diff --git a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00001.png b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00001.png
index 65eea06b..22db5ea6 100644
Binary files a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00001.png and b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00001.png differ
diff --git a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00002.png b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00002.png
index b86193b1..d27bf7b6 100644
Binary files a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00002.png and b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00002.png differ
diff --git a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00003.png b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00003.png
index 424fe026..62afe86a 100644
Binary files a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00003.png and b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00003.png differ
diff --git a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00004.png b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00004.png
index 24f19e59..e6a1d17d 100644
Binary files a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00004.png and b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00004.png differ
diff --git a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00005.png b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00005.png
index 85054729..4542fda8 100644
Binary files a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00005.png and b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00005.png differ
diff --git a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00006.png b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00006.png
index bcf57b59..f4b55e9d 100644
Binary files a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00006.png and b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00006.png differ
diff --git a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00007.png b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00007.png
index 311479c7..196fc8b4 100644
Binary files a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00007.png and b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00007.png differ
diff --git a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00008.png b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00008.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00008.png and b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00008.png differ
diff --git a/tests/snapshots/stax/01-payment/18-multi-sign-serial/00009.png b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00009.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/01-payment/18-multi-sign-serial/00009.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/01-basic/00000.png b/tests/snapshots/stax/02-set-regular-key/01-basic/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/01-basic/00000.png and b/tests/snapshots/stax/02-set-regular-key/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/01-basic/00001.png b/tests/snapshots/stax/02-set-regular-key/01-basic/00001.png
index 7ab58173..cfb57553 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/01-basic/00001.png and b/tests/snapshots/stax/02-set-regular-key/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/01-basic/00002.png b/tests/snapshots/stax/02-set-regular-key/01-basic/00002.png
index 15b54343..e1439c3f 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/01-basic/00002.png and b/tests/snapshots/stax/02-set-regular-key/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/01-basic/00003.png b/tests/snapshots/stax/02-set-regular-key/01-basic/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/01-basic/00003.png and b/tests/snapshots/stax/02-set-regular-key/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/01-basic/00004.png b/tests/snapshots/stax/02-set-regular-key/01-basic/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/01-basic/00004.png and b/tests/snapshots/stax/02-set-regular-key/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/01-basic/00005.png b/tests/snapshots/stax/02-set-regular-key/01-basic/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/02-set-regular-key/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/02-delete/00000.png b/tests/snapshots/stax/02-set-regular-key/02-delete/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/02-delete/00000.png and b/tests/snapshots/stax/02-set-regular-key/02-delete/00000.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/02-delete/00001.png b/tests/snapshots/stax/02-set-regular-key/02-delete/00001.png
index 18d2ced1..e683acf1 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/02-delete/00001.png and b/tests/snapshots/stax/02-set-regular-key/02-delete/00001.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/02-delete/00002.png b/tests/snapshots/stax/02-set-regular-key/02-delete/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/02-delete/00002.png and b/tests/snapshots/stax/02-set-regular-key/02-delete/00002.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/02-delete/00003.png b/tests/snapshots/stax/02-set-regular-key/02-delete/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/02-delete/00003.png and b/tests/snapshots/stax/02-set-regular-key/02-delete/00003.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/02-delete/00004.png b/tests/snapshots/stax/02-set-regular-key/02-delete/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/02-set-regular-key/02-delete/00004.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00000.png b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00000.png
index beb25deb..2c69bd2f 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00000.png and b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00000.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00001.png b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00001.png
index 218b0476..7d66d181 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00001.png and b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00001.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00002.png b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00002.png
index ce42a729..0bf7f180 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00002.png and b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00002.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00003.png b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00003.png
index 4e391aba..a8201139 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00003.png and b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00003.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00004.png b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00004.png
index 377c3ebd..b62bfc7e 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00004.png and b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00004.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00005.png b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00005.png
index 7d75cfce..e1cee778 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00005.png and b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00005.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00006.png b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00006.png
index 7395f0e9..f62ea79d 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00006.png and b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00006.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00007.png b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00007.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00007.png and b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00007.png differ
diff --git a/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00008.png b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00008.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/02-set-regular-key/03-all-common-fields/00008.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/01-finish-after/00000.png b/tests/snapshots/stax/03-escrow-create/01-finish-after/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/03-escrow-create/01-finish-after/00000.png and b/tests/snapshots/stax/03-escrow-create/01-finish-after/00000.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/01-finish-after/00001.png b/tests/snapshots/stax/03-escrow-create/01-finish-after/00001.png
index 3d45db77..dd89bd07 100644
Binary files a/tests/snapshots/stax/03-escrow-create/01-finish-after/00001.png and b/tests/snapshots/stax/03-escrow-create/01-finish-after/00001.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/01-finish-after/00002.png b/tests/snapshots/stax/03-escrow-create/01-finish-after/00002.png
index c131b8cd..999b5875 100644
Binary files a/tests/snapshots/stax/03-escrow-create/01-finish-after/00002.png and b/tests/snapshots/stax/03-escrow-create/01-finish-after/00002.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/01-finish-after/00003.png b/tests/snapshots/stax/03-escrow-create/01-finish-after/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/03-escrow-create/01-finish-after/00003.png and b/tests/snapshots/stax/03-escrow-create/01-finish-after/00003.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/01-finish-after/00004.png b/tests/snapshots/stax/03-escrow-create/01-finish-after/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/03-escrow-create/01-finish-after/00004.png and b/tests/snapshots/stax/03-escrow-create/01-finish-after/00004.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/01-finish-after/00005.png b/tests/snapshots/stax/03-escrow-create/01-finish-after/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/03-escrow-create/01-finish-after/00005.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00000.png b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00000.png and b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00000.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00001.png b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00001.png
index 672504d5..185579cb 100644
Binary files a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00001.png and b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00001.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00002.png b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00002.png
index c131b8cd..999b5875 100644
Binary files a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00002.png and b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00002.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00003.png b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00003.png and b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00003.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00004.png b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00004.png and b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00004.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/02-cancel-after/00005.png b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/03-escrow-create/02-cancel-after/00005.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/03-both/00000.png b/tests/snapshots/stax/03-escrow-create/03-both/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/03-escrow-create/03-both/00000.png and b/tests/snapshots/stax/03-escrow-create/03-both/00000.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/03-both/00001.png b/tests/snapshots/stax/03-escrow-create/03-both/00001.png
index ce3ba9b3..9f2482eb 100644
Binary files a/tests/snapshots/stax/03-escrow-create/03-both/00001.png and b/tests/snapshots/stax/03-escrow-create/03-both/00001.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/03-both/00002.png b/tests/snapshots/stax/03-escrow-create/03-both/00002.png
index 026f2f80..9c1cb075 100644
Binary files a/tests/snapshots/stax/03-escrow-create/03-both/00002.png and b/tests/snapshots/stax/03-escrow-create/03-both/00002.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/03-both/00003.png b/tests/snapshots/stax/03-escrow-create/03-both/00003.png
index e5288285..a4029ea2 100644
Binary files a/tests/snapshots/stax/03-escrow-create/03-both/00003.png and b/tests/snapshots/stax/03-escrow-create/03-both/00003.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/03-both/00004.png b/tests/snapshots/stax/03-escrow-create/03-both/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/03-escrow-create/03-both/00004.png and b/tests/snapshots/stax/03-escrow-create/03-both/00004.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/03-both/00005.png b/tests/snapshots/stax/03-escrow-create/03-both/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/03-escrow-create/03-both/00005.png and b/tests/snapshots/stax/03-escrow-create/03-both/00005.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/03-both/00006.png b/tests/snapshots/stax/03-escrow-create/03-both/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/03-escrow-create/03-both/00006.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/04-both-condition/00000.png b/tests/snapshots/stax/03-escrow-create/04-both-condition/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/03-escrow-create/04-both-condition/00000.png and b/tests/snapshots/stax/03-escrow-create/04-both-condition/00000.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/04-both-condition/00001.png b/tests/snapshots/stax/03-escrow-create/04-both-condition/00001.png
index ce3ba9b3..9f2482eb 100644
Binary files a/tests/snapshots/stax/03-escrow-create/04-both-condition/00001.png and b/tests/snapshots/stax/03-escrow-create/04-both-condition/00001.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/04-both-condition/00002.png b/tests/snapshots/stax/03-escrow-create/04-both-condition/00002.png
index 026f2f80..9c1cb075 100644
Binary files a/tests/snapshots/stax/03-escrow-create/04-both-condition/00002.png and b/tests/snapshots/stax/03-escrow-create/04-both-condition/00002.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/04-both-condition/00003.png b/tests/snapshots/stax/03-escrow-create/04-both-condition/00003.png
index a8b5ec8e..86f64a5b 100644
Binary files a/tests/snapshots/stax/03-escrow-create/04-both-condition/00003.png and b/tests/snapshots/stax/03-escrow-create/04-both-condition/00003.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/04-both-condition/00004.png b/tests/snapshots/stax/03-escrow-create/04-both-condition/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/03-escrow-create/04-both-condition/00004.png and b/tests/snapshots/stax/03-escrow-create/04-both-condition/00004.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/04-both-condition/00005.png b/tests/snapshots/stax/03-escrow-create/04-both-condition/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/03-escrow-create/04-both-condition/00005.png and b/tests/snapshots/stax/03-escrow-create/04-both-condition/00005.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/04-both-condition/00006.png b/tests/snapshots/stax/03-escrow-create/04-both-condition/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/03-escrow-create/04-both-condition/00006.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00000.png b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00000.png
index beb25deb..42f09455 100644
Binary files a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00000.png and b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00000.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00001.png b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00001.png
index 4887a428..bc71726f 100644
Binary files a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00001.png and b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00001.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00002.png b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00002.png
index 653a4aa2..26b98c74 100644
Binary files a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00002.png and b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00002.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00003.png b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00003.png
index d5f8de4b..746b8311 100644
Binary files a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00003.png and b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00003.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00004.png b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00004.png
index cb1da889..c13e3d8a 100644
Binary files a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00004.png and b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00004.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00005.png b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00005.png
index 95561713..2e538fa0 100644
Binary files a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00005.png and b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00005.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00006.png b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00006.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00006.png and b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00006.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00007.png b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00007.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/03-escrow-create/05-both-condition-destination/00007.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00000.png b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00000.png
index beb25deb..288aefbc 100644
Binary files a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00000.png and b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00000.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00001.png b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00001.png
index 06b35456..08df911b 100644
Binary files a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00001.png and b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00001.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00002.png b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00002.png
index 01e19fa1..f17df2ed 100644
Binary files a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00002.png and b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00002.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00003.png b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00003.png
index 269cdf0b..2580559d 100644
Binary files a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00003.png and b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00003.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00004.png b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00004.png
index f915aeb3..265174c3 100644
Binary files a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00004.png and b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00004.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00005.png b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00005.png
index 271f36d3..81bcf901 100644
Binary files a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00005.png and b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00005.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00006.png b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00006.png
index d96a875b..8efd4ea8 100644
Binary files a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00006.png and b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00006.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00007.png b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00007.png
index 311479c7..196fc8b4 100644
Binary files a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00007.png and b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00007.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00008.png b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00008.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00008.png and b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00008.png differ
diff --git a/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00009.png b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00009.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/03-escrow-create/06-all-common-fields/00009.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/01-time-based/00000.png b/tests/snapshots/stax/04-escrow-finish/01-time-based/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/01-time-based/00000.png and b/tests/snapshots/stax/04-escrow-finish/01-time-based/00000.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/01-time-based/00001.png b/tests/snapshots/stax/04-escrow-finish/01-time-based/00001.png
index ecbcfe86..2155667e 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/01-time-based/00001.png and b/tests/snapshots/stax/04-escrow-finish/01-time-based/00001.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/01-time-based/00002.png b/tests/snapshots/stax/04-escrow-finish/01-time-based/00002.png
index 380197c4..eda9e74b 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/01-time-based/00002.png and b/tests/snapshots/stax/04-escrow-finish/01-time-based/00002.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/01-time-based/00003.png b/tests/snapshots/stax/04-escrow-finish/01-time-based/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/01-time-based/00003.png and b/tests/snapshots/stax/04-escrow-finish/01-time-based/00003.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/01-time-based/00004.png b/tests/snapshots/stax/04-escrow-finish/01-time-based/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/01-time-based/00004.png and b/tests/snapshots/stax/04-escrow-finish/01-time-based/00004.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/01-time-based/00005.png b/tests/snapshots/stax/04-escrow-finish/01-time-based/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/04-escrow-finish/01-time-based/00005.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00000.png b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00000.png and b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00000.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00001.png b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00001.png
index dc67a042..b072bc29 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00001.png and b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00001.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00002.png b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00002.png
index 78bb9a21..e77b3909 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00002.png and b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00002.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00003.png b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00003.png
index 167ebd6f..365c3c23 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00003.png and b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00003.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00004.png b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00004.png and b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00004.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00005.png b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00005.png and b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00005.png differ
diff --git a/tests/snapshots/stax/04-escrow-finish/02-condition-based/00006.png b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/04-escrow-finish/02-condition-based/00006.png differ
diff --git a/tests/snapshots/stax/05-escrow-cancel/01-basic/00000.png b/tests/snapshots/stax/05-escrow-cancel/01-basic/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/05-escrow-cancel/01-basic/00000.png and b/tests/snapshots/stax/05-escrow-cancel/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/05-escrow-cancel/01-basic/00001.png b/tests/snapshots/stax/05-escrow-cancel/01-basic/00001.png
index 873c235d..f1a706e1 100644
Binary files a/tests/snapshots/stax/05-escrow-cancel/01-basic/00001.png and b/tests/snapshots/stax/05-escrow-cancel/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/05-escrow-cancel/01-basic/00002.png b/tests/snapshots/stax/05-escrow-cancel/01-basic/00002.png
index 380197c4..eda9e74b 100644
Binary files a/tests/snapshots/stax/05-escrow-cancel/01-basic/00002.png and b/tests/snapshots/stax/05-escrow-cancel/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/05-escrow-cancel/01-basic/00003.png b/tests/snapshots/stax/05-escrow-cancel/01-basic/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/05-escrow-cancel/01-basic/00003.png and b/tests/snapshots/stax/05-escrow-cancel/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/05-escrow-cancel/01-basic/00004.png b/tests/snapshots/stax/05-escrow-cancel/01-basic/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/05-escrow-cancel/01-basic/00004.png and b/tests/snapshots/stax/05-escrow-cancel/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/05-escrow-cancel/01-basic/00005.png b/tests/snapshots/stax/05-escrow-cancel/01-basic/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/05-escrow-cancel/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/06-account-set/01-basic/00000.png b/tests/snapshots/stax/06-account-set/01-basic/00000.png
index beb25deb..42f09455 100644
Binary files a/tests/snapshots/stax/06-account-set/01-basic/00000.png and b/tests/snapshots/stax/06-account-set/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/06-account-set/01-basic/00001.png b/tests/snapshots/stax/06-account-set/01-basic/00001.png
index 099d49ef..eae1297c 100644
Binary files a/tests/snapshots/stax/06-account-set/01-basic/00001.png and b/tests/snapshots/stax/06-account-set/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/06-account-set/01-basic/00002.png b/tests/snapshots/stax/06-account-set/01-basic/00002.png
index 178c6b73..4b881fa5 100644
Binary files a/tests/snapshots/stax/06-account-set/01-basic/00002.png and b/tests/snapshots/stax/06-account-set/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/06-account-set/01-basic/00003.png b/tests/snapshots/stax/06-account-set/01-basic/00003.png
index 36d935d8..8a104f82 100644
Binary files a/tests/snapshots/stax/06-account-set/01-basic/00003.png and b/tests/snapshots/stax/06-account-set/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/06-account-set/01-basic/00004.png b/tests/snapshots/stax/06-account-set/01-basic/00004.png
index e5424dd9..46e7549c 100644
Binary files a/tests/snapshots/stax/06-account-set/01-basic/00004.png and b/tests/snapshots/stax/06-account-set/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/06-account-set/01-basic/00005.png b/tests/snapshots/stax/06-account-set/01-basic/00005.png
index 95561713..2e538fa0 100644
Binary files a/tests/snapshots/stax/06-account-set/01-basic/00005.png and b/tests/snapshots/stax/06-account-set/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/06-account-set/01-basic/00006.png b/tests/snapshots/stax/06-account-set/01-basic/00006.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/06-account-set/01-basic/00006.png and b/tests/snapshots/stax/06-account-set/01-basic/00006.png differ
diff --git a/tests/snapshots/stax/06-account-set/01-basic/00007.png b/tests/snapshots/stax/06-account-set/01-basic/00007.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/06-account-set/01-basic/00007.png differ
diff --git a/tests/snapshots/stax/06-account-set/02-default-ripple/00000.png b/tests/snapshots/stax/06-account-set/02-default-ripple/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/06-account-set/02-default-ripple/00000.png and b/tests/snapshots/stax/06-account-set/02-default-ripple/00000.png differ
diff --git a/tests/snapshots/stax/06-account-set/02-default-ripple/00001.png b/tests/snapshots/stax/06-account-set/02-default-ripple/00001.png
index 3a794557..a4e21c0f 100644
Binary files a/tests/snapshots/stax/06-account-set/02-default-ripple/00001.png and b/tests/snapshots/stax/06-account-set/02-default-ripple/00001.png differ
diff --git a/tests/snapshots/stax/06-account-set/02-default-ripple/00002.png b/tests/snapshots/stax/06-account-set/02-default-ripple/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/06-account-set/02-default-ripple/00002.png and b/tests/snapshots/stax/06-account-set/02-default-ripple/00002.png differ
diff --git a/tests/snapshots/stax/06-account-set/02-default-ripple/00003.png b/tests/snapshots/stax/06-account-set/02-default-ripple/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/06-account-set/02-default-ripple/00003.png and b/tests/snapshots/stax/06-account-set/02-default-ripple/00003.png differ
diff --git a/tests/snapshots/stax/06-account-set/02-default-ripple/00004.png b/tests/snapshots/stax/06-account-set/02-default-ripple/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/06-account-set/02-default-ripple/00004.png differ
diff --git a/tests/snapshots/stax/06-account-set/03-deposit-auth/00000.png b/tests/snapshots/stax/06-account-set/03-deposit-auth/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/06-account-set/03-deposit-auth/00000.png and b/tests/snapshots/stax/06-account-set/03-deposit-auth/00000.png differ
diff --git a/tests/snapshots/stax/06-account-set/03-deposit-auth/00001.png b/tests/snapshots/stax/06-account-set/03-deposit-auth/00001.png
index 3c94e709..d2ae5065 100644
Binary files a/tests/snapshots/stax/06-account-set/03-deposit-auth/00001.png and b/tests/snapshots/stax/06-account-set/03-deposit-auth/00001.png differ
diff --git a/tests/snapshots/stax/06-account-set/03-deposit-auth/00002.png b/tests/snapshots/stax/06-account-set/03-deposit-auth/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/06-account-set/03-deposit-auth/00002.png and b/tests/snapshots/stax/06-account-set/03-deposit-auth/00002.png differ
diff --git a/tests/snapshots/stax/06-account-set/03-deposit-auth/00003.png b/tests/snapshots/stax/06-account-set/03-deposit-auth/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/06-account-set/03-deposit-auth/00003.png and b/tests/snapshots/stax/06-account-set/03-deposit-auth/00003.png differ
diff --git a/tests/snapshots/stax/06-account-set/03-deposit-auth/00004.png b/tests/snapshots/stax/06-account-set/03-deposit-auth/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/06-account-set/03-deposit-auth/00004.png differ
diff --git a/tests/snapshots/stax/06-account-set/04-disable-master/00000.png b/tests/snapshots/stax/06-account-set/04-disable-master/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/06-account-set/04-disable-master/00000.png and b/tests/snapshots/stax/06-account-set/04-disable-master/00000.png differ
diff --git a/tests/snapshots/stax/06-account-set/04-disable-master/00001.png b/tests/snapshots/stax/06-account-set/04-disable-master/00001.png
index 76a243d4..64b107b2 100644
Binary files a/tests/snapshots/stax/06-account-set/04-disable-master/00001.png and b/tests/snapshots/stax/06-account-set/04-disable-master/00001.png differ
diff --git a/tests/snapshots/stax/06-account-set/04-disable-master/00002.png b/tests/snapshots/stax/06-account-set/04-disable-master/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/06-account-set/04-disable-master/00002.png and b/tests/snapshots/stax/06-account-set/04-disable-master/00002.png differ
diff --git a/tests/snapshots/stax/06-account-set/04-disable-master/00003.png b/tests/snapshots/stax/06-account-set/04-disable-master/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/06-account-set/04-disable-master/00003.png and b/tests/snapshots/stax/06-account-set/04-disable-master/00003.png differ
diff --git a/tests/snapshots/stax/06-account-set/04-disable-master/00004.png b/tests/snapshots/stax/06-account-set/04-disable-master/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/06-account-set/04-disable-master/00004.png differ
diff --git a/tests/snapshots/stax/06-account-set/05-disallow-xrp/00000.png b/tests/snapshots/stax/06-account-set/05-disallow-xrp/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/06-account-set/05-disallow-xrp/00000.png and b/tests/snapshots/stax/06-account-set/05-disallow-xrp/00000.png differ
diff --git a/tests/snapshots/stax/06-account-set/05-disallow-xrp/00001.png b/tests/snapshots/stax/06-account-set/05-disallow-xrp/00001.png
index 4858cb14..68e32fa3 100644
Binary files a/tests/snapshots/stax/06-account-set/05-disallow-xrp/00001.png and b/tests/snapshots/stax/06-account-set/05-disallow-xrp/00001.png differ
diff --git a/tests/snapshots/stax/06-account-set/05-disallow-xrp/00002.png b/tests/snapshots/stax/06-account-set/05-disallow-xrp/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/06-account-set/05-disallow-xrp/00002.png and b/tests/snapshots/stax/06-account-set/05-disallow-xrp/00002.png differ
diff --git a/tests/snapshots/stax/06-account-set/05-disallow-xrp/00003.png b/tests/snapshots/stax/06-account-set/05-disallow-xrp/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/06-account-set/05-disallow-xrp/00003.png and b/tests/snapshots/stax/06-account-set/05-disallow-xrp/00003.png differ
diff --git a/tests/snapshots/stax/06-account-set/05-disallow-xrp/00004.png b/tests/snapshots/stax/06-account-set/05-disallow-xrp/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/06-account-set/05-disallow-xrp/00004.png differ
diff --git a/tests/snapshots/stax/06-account-set/06-global-freeze/00000.png b/tests/snapshots/stax/06-account-set/06-global-freeze/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/06-account-set/06-global-freeze/00000.png and b/tests/snapshots/stax/06-account-set/06-global-freeze/00000.png differ
diff --git a/tests/snapshots/stax/06-account-set/06-global-freeze/00001.png b/tests/snapshots/stax/06-account-set/06-global-freeze/00001.png
index 562a654c..7c78cc72 100644
Binary files a/tests/snapshots/stax/06-account-set/06-global-freeze/00001.png and b/tests/snapshots/stax/06-account-set/06-global-freeze/00001.png differ
diff --git a/tests/snapshots/stax/06-account-set/06-global-freeze/00002.png b/tests/snapshots/stax/06-account-set/06-global-freeze/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/06-account-set/06-global-freeze/00002.png and b/tests/snapshots/stax/06-account-set/06-global-freeze/00002.png differ
diff --git a/tests/snapshots/stax/06-account-set/06-global-freeze/00003.png b/tests/snapshots/stax/06-account-set/06-global-freeze/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/06-account-set/06-global-freeze/00003.png and b/tests/snapshots/stax/06-account-set/06-global-freeze/00003.png differ
diff --git a/tests/snapshots/stax/06-account-set/06-global-freeze/00004.png b/tests/snapshots/stax/06-account-set/06-global-freeze/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/06-account-set/06-global-freeze/00004.png differ
diff --git a/tests/snapshots/stax/06-account-set/07-no-freeze/00000.png b/tests/snapshots/stax/06-account-set/07-no-freeze/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/06-account-set/07-no-freeze/00000.png and b/tests/snapshots/stax/06-account-set/07-no-freeze/00000.png differ
diff --git a/tests/snapshots/stax/06-account-set/07-no-freeze/00001.png b/tests/snapshots/stax/06-account-set/07-no-freeze/00001.png
index bcafb147..3578366b 100644
Binary files a/tests/snapshots/stax/06-account-set/07-no-freeze/00001.png and b/tests/snapshots/stax/06-account-set/07-no-freeze/00001.png differ
diff --git a/tests/snapshots/stax/06-account-set/07-no-freeze/00002.png b/tests/snapshots/stax/06-account-set/07-no-freeze/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/06-account-set/07-no-freeze/00002.png and b/tests/snapshots/stax/06-account-set/07-no-freeze/00002.png differ
diff --git a/tests/snapshots/stax/06-account-set/07-no-freeze/00003.png b/tests/snapshots/stax/06-account-set/07-no-freeze/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/06-account-set/07-no-freeze/00003.png and b/tests/snapshots/stax/06-account-set/07-no-freeze/00003.png differ
diff --git a/tests/snapshots/stax/06-account-set/07-no-freeze/00004.png b/tests/snapshots/stax/06-account-set/07-no-freeze/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/06-account-set/07-no-freeze/00004.png differ
diff --git a/tests/snapshots/stax/06-account-set/08-require-auth/00000.png b/tests/snapshots/stax/06-account-set/08-require-auth/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/06-account-set/08-require-auth/00000.png and b/tests/snapshots/stax/06-account-set/08-require-auth/00000.png differ
diff --git a/tests/snapshots/stax/06-account-set/08-require-auth/00001.png b/tests/snapshots/stax/06-account-set/08-require-auth/00001.png
index da6b8c24..a6a03b98 100644
Binary files a/tests/snapshots/stax/06-account-set/08-require-auth/00001.png and b/tests/snapshots/stax/06-account-set/08-require-auth/00001.png differ
diff --git a/tests/snapshots/stax/06-account-set/08-require-auth/00002.png b/tests/snapshots/stax/06-account-set/08-require-auth/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/06-account-set/08-require-auth/00002.png and b/tests/snapshots/stax/06-account-set/08-require-auth/00002.png differ
diff --git a/tests/snapshots/stax/06-account-set/08-require-auth/00003.png b/tests/snapshots/stax/06-account-set/08-require-auth/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/06-account-set/08-require-auth/00003.png and b/tests/snapshots/stax/06-account-set/08-require-auth/00003.png differ
diff --git a/tests/snapshots/stax/06-account-set/08-require-auth/00004.png b/tests/snapshots/stax/06-account-set/08-require-auth/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/06-account-set/08-require-auth/00004.png differ
diff --git a/tests/snapshots/stax/06-account-set/09-require-tag/00000.png b/tests/snapshots/stax/06-account-set/09-require-tag/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/06-account-set/09-require-tag/00000.png and b/tests/snapshots/stax/06-account-set/09-require-tag/00000.png differ
diff --git a/tests/snapshots/stax/06-account-set/09-require-tag/00001.png b/tests/snapshots/stax/06-account-set/09-require-tag/00001.png
index e04c1e94..73cc4029 100644
Binary files a/tests/snapshots/stax/06-account-set/09-require-tag/00001.png and b/tests/snapshots/stax/06-account-set/09-require-tag/00001.png differ
diff --git a/tests/snapshots/stax/06-account-set/09-require-tag/00002.png b/tests/snapshots/stax/06-account-set/09-require-tag/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/06-account-set/09-require-tag/00002.png and b/tests/snapshots/stax/06-account-set/09-require-tag/00002.png differ
diff --git a/tests/snapshots/stax/06-account-set/09-require-tag/00003.png b/tests/snapshots/stax/06-account-set/09-require-tag/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/06-account-set/09-require-tag/00003.png and b/tests/snapshots/stax/06-account-set/09-require-tag/00003.png differ
diff --git a/tests/snapshots/stax/06-account-set/09-require-tag/00004.png b/tests/snapshots/stax/06-account-set/09-require-tag/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/06-account-set/09-require-tag/00004.png differ
diff --git a/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00000.png b/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00000.png and b/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00000.png differ
diff --git a/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00001.png b/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00001.png
index c2ab88ac..ec53fc85 100644
Binary files a/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00001.png and b/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00001.png differ
diff --git a/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00002.png b/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00002.png and b/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00002.png differ
diff --git a/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00003.png b/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00003.png and b/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00003.png differ
diff --git a/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00004.png b/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/06-account-set/10-clear-account-txn-id/00004.png differ
diff --git a/tests/snapshots/stax/07-check-cancel/01-basic/00000.png b/tests/snapshots/stax/07-check-cancel/01-basic/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/07-check-cancel/01-basic/00000.png and b/tests/snapshots/stax/07-check-cancel/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/07-check-cancel/01-basic/00001.png b/tests/snapshots/stax/07-check-cancel/01-basic/00001.png
index c5b8d2a0..033b03a3 100644
Binary files a/tests/snapshots/stax/07-check-cancel/01-basic/00001.png and b/tests/snapshots/stax/07-check-cancel/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/07-check-cancel/01-basic/00002.png b/tests/snapshots/stax/07-check-cancel/01-basic/00002.png
index f1cbe00f..ddabd211 100644
Binary files a/tests/snapshots/stax/07-check-cancel/01-basic/00002.png and b/tests/snapshots/stax/07-check-cancel/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/07-check-cancel/01-basic/00003.png b/tests/snapshots/stax/07-check-cancel/01-basic/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/07-check-cancel/01-basic/00003.png and b/tests/snapshots/stax/07-check-cancel/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/07-check-cancel/01-basic/00004.png b/tests/snapshots/stax/07-check-cancel/01-basic/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/07-check-cancel/01-basic/00004.png and b/tests/snapshots/stax/07-check-cancel/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/07-check-cancel/01-basic/00005.png b/tests/snapshots/stax/07-check-cancel/01-basic/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/07-check-cancel/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/08-check-cash/01-basic/00000.png b/tests/snapshots/stax/08-check-cash/01-basic/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/08-check-cash/01-basic/00000.png and b/tests/snapshots/stax/08-check-cash/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/08-check-cash/01-basic/00001.png b/tests/snapshots/stax/08-check-cash/01-basic/00001.png
index f80f4715..9c4cdc1b 100644
Binary files a/tests/snapshots/stax/08-check-cash/01-basic/00001.png and b/tests/snapshots/stax/08-check-cash/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/08-check-cash/01-basic/00002.png b/tests/snapshots/stax/08-check-cash/01-basic/00002.png
index 509f2e79..ed8e59e1 100644
Binary files a/tests/snapshots/stax/08-check-cash/01-basic/00002.png and b/tests/snapshots/stax/08-check-cash/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/08-check-cash/01-basic/00003.png b/tests/snapshots/stax/08-check-cash/01-basic/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/08-check-cash/01-basic/00003.png and b/tests/snapshots/stax/08-check-cash/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/08-check-cash/01-basic/00004.png b/tests/snapshots/stax/08-check-cash/01-basic/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/08-check-cash/01-basic/00004.png and b/tests/snapshots/stax/08-check-cash/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/08-check-cash/01-basic/00005.png b/tests/snapshots/stax/08-check-cash/01-basic/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/08-check-cash/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/08-check-cash/02-amount/00000.png b/tests/snapshots/stax/08-check-cash/02-amount/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/08-check-cash/02-amount/00000.png and b/tests/snapshots/stax/08-check-cash/02-amount/00000.png differ
diff --git a/tests/snapshots/stax/08-check-cash/02-amount/00001.png b/tests/snapshots/stax/08-check-cash/02-amount/00001.png
index f80f4715..9c4cdc1b 100644
Binary files a/tests/snapshots/stax/08-check-cash/02-amount/00001.png and b/tests/snapshots/stax/08-check-cash/02-amount/00001.png differ
diff --git a/tests/snapshots/stax/08-check-cash/02-amount/00002.png b/tests/snapshots/stax/08-check-cash/02-amount/00002.png
index dba5fb3f..ec3d7e43 100644
Binary files a/tests/snapshots/stax/08-check-cash/02-amount/00002.png and b/tests/snapshots/stax/08-check-cash/02-amount/00002.png differ
diff --git a/tests/snapshots/stax/08-check-cash/02-amount/00003.png b/tests/snapshots/stax/08-check-cash/02-amount/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/08-check-cash/02-amount/00003.png and b/tests/snapshots/stax/08-check-cash/02-amount/00003.png differ
diff --git a/tests/snapshots/stax/08-check-cash/02-amount/00004.png b/tests/snapshots/stax/08-check-cash/02-amount/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/08-check-cash/02-amount/00004.png and b/tests/snapshots/stax/08-check-cash/02-amount/00004.png differ
diff --git a/tests/snapshots/stax/08-check-cash/02-amount/00005.png b/tests/snapshots/stax/08-check-cash/02-amount/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/08-check-cash/02-amount/00005.png differ
diff --git a/tests/snapshots/stax/08-check-cash/03-issued/00000.png b/tests/snapshots/stax/08-check-cash/03-issued/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/08-check-cash/03-issued/00000.png and b/tests/snapshots/stax/08-check-cash/03-issued/00000.png differ
diff --git a/tests/snapshots/stax/08-check-cash/03-issued/00001.png b/tests/snapshots/stax/08-check-cash/03-issued/00001.png
index 4687ad05..9413cbf2 100644
Binary files a/tests/snapshots/stax/08-check-cash/03-issued/00001.png and b/tests/snapshots/stax/08-check-cash/03-issued/00001.png differ
diff --git a/tests/snapshots/stax/08-check-cash/03-issued/00002.png b/tests/snapshots/stax/08-check-cash/03-issued/00002.png
index 1fced77c..a971cc3d 100644
Binary files a/tests/snapshots/stax/08-check-cash/03-issued/00002.png and b/tests/snapshots/stax/08-check-cash/03-issued/00002.png differ
diff --git a/tests/snapshots/stax/08-check-cash/03-issued/00003.png b/tests/snapshots/stax/08-check-cash/03-issued/00003.png
index 4cc2a599..cb33b4b4 100644
Binary files a/tests/snapshots/stax/08-check-cash/03-issued/00003.png and b/tests/snapshots/stax/08-check-cash/03-issued/00003.png differ
diff --git a/tests/snapshots/stax/08-check-cash/03-issued/00004.png b/tests/snapshots/stax/08-check-cash/03-issued/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/08-check-cash/03-issued/00004.png and b/tests/snapshots/stax/08-check-cash/03-issued/00004.png differ
diff --git a/tests/snapshots/stax/08-check-cash/03-issued/00005.png b/tests/snapshots/stax/08-check-cash/03-issued/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/08-check-cash/03-issued/00005.png and b/tests/snapshots/stax/08-check-cash/03-issued/00005.png differ
diff --git a/tests/snapshots/stax/08-check-cash/03-issued/00006.png b/tests/snapshots/stax/08-check-cash/03-issued/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/08-check-cash/03-issued/00006.png differ
diff --git a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00000.png b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00000.png and b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00000.png differ
diff --git a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00001.png b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00001.png
index 4687ad05..9413cbf2 100644
Binary files a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00001.png and b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00001.png differ
diff --git a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00002.png b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00002.png
index b4720084..106931d1 100644
Binary files a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00002.png and b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00002.png differ
diff --git a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00003.png b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00003.png
index c308eaf0..acc00f4d 100644
Binary files a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00003.png and b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00003.png differ
diff --git a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00004.png b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00004.png and b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00004.png differ
diff --git a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00005.png b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00005.png and b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00005.png differ
diff --git a/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00006.png b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/08-check-cash/04-issued-delivery-min/00006.png differ
diff --git a/tests/snapshots/stax/09-check-create/01-basic/00000.png b/tests/snapshots/stax/09-check-create/01-basic/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/09-check-create/01-basic/00000.png and b/tests/snapshots/stax/09-check-create/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/09-check-create/01-basic/00001.png b/tests/snapshots/stax/09-check-create/01-basic/00001.png
index 5dfc84f0..9bb4d586 100644
Binary files a/tests/snapshots/stax/09-check-create/01-basic/00001.png and b/tests/snapshots/stax/09-check-create/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/09-check-create/01-basic/00002.png b/tests/snapshots/stax/09-check-create/01-basic/00002.png
index 6860e4a8..18202d30 100644
Binary files a/tests/snapshots/stax/09-check-create/01-basic/00002.png and b/tests/snapshots/stax/09-check-create/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/09-check-create/01-basic/00003.png b/tests/snapshots/stax/09-check-create/01-basic/00003.png
index 07f15ae4..3dc2e4a2 100644
Binary files a/tests/snapshots/stax/09-check-create/01-basic/00003.png and b/tests/snapshots/stax/09-check-create/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/09-check-create/01-basic/00004.png b/tests/snapshots/stax/09-check-create/01-basic/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/09-check-create/01-basic/00004.png and b/tests/snapshots/stax/09-check-create/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/09-check-create/01-basic/00005.png b/tests/snapshots/stax/09-check-create/01-basic/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/09-check-create/01-basic/00005.png and b/tests/snapshots/stax/09-check-create/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/09-check-create/01-basic/00006.png b/tests/snapshots/stax/09-check-create/01-basic/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/09-check-create/01-basic/00006.png differ
diff --git a/tests/snapshots/stax/09-check-create/02-issued/00000.png b/tests/snapshots/stax/09-check-create/02-issued/00000.png
index beb25deb..42f09455 100644
Binary files a/tests/snapshots/stax/09-check-create/02-issued/00000.png and b/tests/snapshots/stax/09-check-create/02-issued/00000.png differ
diff --git a/tests/snapshots/stax/09-check-create/02-issued/00001.png b/tests/snapshots/stax/09-check-create/02-issued/00001.png
index c354f909..9498ea3c 100644
Binary files a/tests/snapshots/stax/09-check-create/02-issued/00001.png and b/tests/snapshots/stax/09-check-create/02-issued/00001.png differ
diff --git a/tests/snapshots/stax/09-check-create/02-issued/00002.png b/tests/snapshots/stax/09-check-create/02-issued/00002.png
index 9fb3c10f..fa3b1407 100644
Binary files a/tests/snapshots/stax/09-check-create/02-issued/00002.png and b/tests/snapshots/stax/09-check-create/02-issued/00002.png differ
diff --git a/tests/snapshots/stax/09-check-create/02-issued/00003.png b/tests/snapshots/stax/09-check-create/02-issued/00003.png
index 8bc5f6e8..69fe1512 100644
Binary files a/tests/snapshots/stax/09-check-create/02-issued/00003.png and b/tests/snapshots/stax/09-check-create/02-issued/00003.png differ
diff --git a/tests/snapshots/stax/09-check-create/02-issued/00004.png b/tests/snapshots/stax/09-check-create/02-issued/00004.png
index 78ecd7bc..2f79689d 100644
Binary files a/tests/snapshots/stax/09-check-create/02-issued/00004.png and b/tests/snapshots/stax/09-check-create/02-issued/00004.png differ
diff --git a/tests/snapshots/stax/09-check-create/02-issued/00005.png b/tests/snapshots/stax/09-check-create/02-issued/00005.png
index 95561713..2e538fa0 100644
Binary files a/tests/snapshots/stax/09-check-create/02-issued/00005.png and b/tests/snapshots/stax/09-check-create/02-issued/00005.png differ
diff --git a/tests/snapshots/stax/09-check-create/02-issued/00006.png b/tests/snapshots/stax/09-check-create/02-issued/00006.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/09-check-create/02-issued/00006.png and b/tests/snapshots/stax/09-check-create/02-issued/00006.png differ
diff --git a/tests/snapshots/stax/09-check-create/02-issued/00007.png b/tests/snapshots/stax/09-check-create/02-issued/00007.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/09-check-create/02-issued/00007.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/01-basic/00000.png b/tests/snapshots/stax/10-deposit-preauth/01-basic/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/10-deposit-preauth/01-basic/00000.png and b/tests/snapshots/stax/10-deposit-preauth/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/01-basic/00001.png b/tests/snapshots/stax/10-deposit-preauth/01-basic/00001.png
index c4377879..616be37e 100644
Binary files a/tests/snapshots/stax/10-deposit-preauth/01-basic/00001.png and b/tests/snapshots/stax/10-deposit-preauth/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/01-basic/00002.png b/tests/snapshots/stax/10-deposit-preauth/01-basic/00002.png
index b1564d73..9a8911c0 100644
Binary files a/tests/snapshots/stax/10-deposit-preauth/01-basic/00002.png and b/tests/snapshots/stax/10-deposit-preauth/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/01-basic/00003.png b/tests/snapshots/stax/10-deposit-preauth/01-basic/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/10-deposit-preauth/01-basic/00003.png and b/tests/snapshots/stax/10-deposit-preauth/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/01-basic/00004.png b/tests/snapshots/stax/10-deposit-preauth/01-basic/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/10-deposit-preauth/01-basic/00004.png and b/tests/snapshots/stax/10-deposit-preauth/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/01-basic/00005.png b/tests/snapshots/stax/10-deposit-preauth/01-basic/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/10-deposit-preauth/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00000.png b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00000.png and b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00000.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00001.png b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00001.png
index c4377879..616be37e 100644
Binary files a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00001.png and b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00001.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00002.png b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00002.png
index 9a1f6a14..0a52eb88 100644
Binary files a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00002.png and b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00002.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00003.png b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00003.png and b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00003.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00004.png b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00004.png and b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00004.png differ
diff --git a/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00005.png b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/10-deposit-preauth/02-unauthorize/00005.png differ
diff --git a/tests/snapshots/stax/11-offer-cancel/01-basic/00000.png b/tests/snapshots/stax/11-offer-cancel/01-basic/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/11-offer-cancel/01-basic/00000.png and b/tests/snapshots/stax/11-offer-cancel/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/11-offer-cancel/01-basic/00001.png b/tests/snapshots/stax/11-offer-cancel/01-basic/00001.png
index e4b0c355..01fa015b 100644
Binary files a/tests/snapshots/stax/11-offer-cancel/01-basic/00001.png and b/tests/snapshots/stax/11-offer-cancel/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/11-offer-cancel/01-basic/00002.png b/tests/snapshots/stax/11-offer-cancel/01-basic/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/11-offer-cancel/01-basic/00002.png and b/tests/snapshots/stax/11-offer-cancel/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/11-offer-cancel/01-basic/00003.png b/tests/snapshots/stax/11-offer-cancel/01-basic/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/11-offer-cancel/01-basic/00003.png and b/tests/snapshots/stax/11-offer-cancel/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/11-offer-cancel/01-basic/00004.png b/tests/snapshots/stax/11-offer-cancel/01-basic/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/11-offer-cancel/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/12-offer-create/01-basic/00000.png b/tests/snapshots/stax/12-offer-create/01-basic/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/12-offer-create/01-basic/00000.png and b/tests/snapshots/stax/12-offer-create/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/12-offer-create/01-basic/00001.png b/tests/snapshots/stax/12-offer-create/01-basic/00001.png
index e35011f5..2e5a83dd 100644
Binary files a/tests/snapshots/stax/12-offer-create/01-basic/00001.png and b/tests/snapshots/stax/12-offer-create/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/12-offer-create/01-basic/00002.png b/tests/snapshots/stax/12-offer-create/01-basic/00002.png
index c339f858..99887cea 100644
Binary files a/tests/snapshots/stax/12-offer-create/01-basic/00002.png and b/tests/snapshots/stax/12-offer-create/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/12-offer-create/01-basic/00003.png b/tests/snapshots/stax/12-offer-create/01-basic/00003.png
index cd8cd70e..dbac71a2 100644
Binary files a/tests/snapshots/stax/12-offer-create/01-basic/00003.png and b/tests/snapshots/stax/12-offer-create/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/12-offer-create/01-basic/00004.png b/tests/snapshots/stax/12-offer-create/01-basic/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/12-offer-create/01-basic/00004.png and b/tests/snapshots/stax/12-offer-create/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/12-offer-create/01-basic/00005.png b/tests/snapshots/stax/12-offer-create/01-basic/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/12-offer-create/01-basic/00005.png and b/tests/snapshots/stax/12-offer-create/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/12-offer-create/01-basic/00006.png b/tests/snapshots/stax/12-offer-create/01-basic/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/12-offer-create/01-basic/00006.png differ
diff --git a/tests/snapshots/stax/12-offer-create/02-passive/00000.png b/tests/snapshots/stax/12-offer-create/02-passive/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/12-offer-create/02-passive/00000.png and b/tests/snapshots/stax/12-offer-create/02-passive/00000.png differ
diff --git a/tests/snapshots/stax/12-offer-create/02-passive/00001.png b/tests/snapshots/stax/12-offer-create/02-passive/00001.png
index c4875864..e85454a8 100644
Binary files a/tests/snapshots/stax/12-offer-create/02-passive/00001.png and b/tests/snapshots/stax/12-offer-create/02-passive/00001.png differ
diff --git a/tests/snapshots/stax/12-offer-create/02-passive/00002.png b/tests/snapshots/stax/12-offer-create/02-passive/00002.png
index b4b02fb8..532b2df2 100644
Binary files a/tests/snapshots/stax/12-offer-create/02-passive/00002.png and b/tests/snapshots/stax/12-offer-create/02-passive/00002.png differ
diff --git a/tests/snapshots/stax/12-offer-create/02-passive/00003.png b/tests/snapshots/stax/12-offer-create/02-passive/00003.png
index 9175d5e9..8e6d94a0 100644
Binary files a/tests/snapshots/stax/12-offer-create/02-passive/00003.png and b/tests/snapshots/stax/12-offer-create/02-passive/00003.png differ
diff --git a/tests/snapshots/stax/12-offer-create/02-passive/00004.png b/tests/snapshots/stax/12-offer-create/02-passive/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/12-offer-create/02-passive/00004.png and b/tests/snapshots/stax/12-offer-create/02-passive/00004.png differ
diff --git a/tests/snapshots/stax/12-offer-create/02-passive/00005.png b/tests/snapshots/stax/12-offer-create/02-passive/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/12-offer-create/02-passive/00005.png and b/tests/snapshots/stax/12-offer-create/02-passive/00005.png differ
diff --git a/tests/snapshots/stax/12-offer-create/02-passive/00006.png b/tests/snapshots/stax/12-offer-create/02-passive/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/12-offer-create/02-passive/00006.png differ
diff --git a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00000.png b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00000.png and b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00000.png differ
diff --git a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00001.png b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00001.png
index b15db958..8e3d0630 100644
Binary files a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00001.png and b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00001.png differ
diff --git a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00002.png b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00002.png
index b4b02fb8..532b2df2 100644
Binary files a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00002.png and b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00002.png differ
diff --git a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00003.png b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00003.png
index 9175d5e9..8e6d94a0 100644
Binary files a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00003.png and b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00003.png differ
diff --git a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00004.png b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00004.png and b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00004.png differ
diff --git a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00005.png b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00005.png and b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00005.png differ
diff --git a/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00006.png b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/12-offer-create/03-immediate-or-cancel/00006.png differ
diff --git a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00000.png b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00000.png and b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00000.png differ
diff --git a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00001.png b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00001.png
index 91f6d06f..970763ed 100644
Binary files a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00001.png and b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00001.png differ
diff --git a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00002.png b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00002.png
index b4b02fb8..532b2df2 100644
Binary files a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00002.png and b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00002.png differ
diff --git a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00003.png b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00003.png
index 9175d5e9..8e6d94a0 100644
Binary files a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00003.png and b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00003.png differ
diff --git a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00004.png b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00004.png and b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00004.png differ
diff --git a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00005.png b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00005.png and b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00005.png differ
diff --git a/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00006.png b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/12-offer-create/04-fill-or-kill/00006.png differ
diff --git a/tests/snapshots/stax/12-offer-create/05-sell/00000.png b/tests/snapshots/stax/12-offer-create/05-sell/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/12-offer-create/05-sell/00000.png and b/tests/snapshots/stax/12-offer-create/05-sell/00000.png differ
diff --git a/tests/snapshots/stax/12-offer-create/05-sell/00001.png b/tests/snapshots/stax/12-offer-create/05-sell/00001.png
index fd8736a9..af386c34 100644
Binary files a/tests/snapshots/stax/12-offer-create/05-sell/00001.png and b/tests/snapshots/stax/12-offer-create/05-sell/00001.png differ
diff --git a/tests/snapshots/stax/12-offer-create/05-sell/00002.png b/tests/snapshots/stax/12-offer-create/05-sell/00002.png
index b4b02fb8..532b2df2 100644
Binary files a/tests/snapshots/stax/12-offer-create/05-sell/00002.png and b/tests/snapshots/stax/12-offer-create/05-sell/00002.png differ
diff --git a/tests/snapshots/stax/12-offer-create/05-sell/00003.png b/tests/snapshots/stax/12-offer-create/05-sell/00003.png
index 9175d5e9..8e6d94a0 100644
Binary files a/tests/snapshots/stax/12-offer-create/05-sell/00003.png and b/tests/snapshots/stax/12-offer-create/05-sell/00003.png differ
diff --git a/tests/snapshots/stax/12-offer-create/05-sell/00004.png b/tests/snapshots/stax/12-offer-create/05-sell/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/12-offer-create/05-sell/00004.png and b/tests/snapshots/stax/12-offer-create/05-sell/00004.png differ
diff --git a/tests/snapshots/stax/12-offer-create/05-sell/00005.png b/tests/snapshots/stax/12-offer-create/05-sell/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/12-offer-create/05-sell/00005.png and b/tests/snapshots/stax/12-offer-create/05-sell/00005.png differ
diff --git a/tests/snapshots/stax/12-offer-create/05-sell/00006.png b/tests/snapshots/stax/12-offer-create/05-sell/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/12-offer-create/05-sell/00006.png differ
diff --git a/tests/snapshots/stax/12-offer-create/06-combo/00000.png b/tests/snapshots/stax/12-offer-create/06-combo/00000.png
index beb25deb..42f09455 100644
Binary files a/tests/snapshots/stax/12-offer-create/06-combo/00000.png and b/tests/snapshots/stax/12-offer-create/06-combo/00000.png differ
diff --git a/tests/snapshots/stax/12-offer-create/06-combo/00001.png b/tests/snapshots/stax/12-offer-create/06-combo/00001.png
index 5f6c303e..115f4f60 100644
Binary files a/tests/snapshots/stax/12-offer-create/06-combo/00001.png and b/tests/snapshots/stax/12-offer-create/06-combo/00001.png differ
diff --git a/tests/snapshots/stax/12-offer-create/06-combo/00002.png b/tests/snapshots/stax/12-offer-create/06-combo/00002.png
index 9c8772bb..fec60c95 100644
Binary files a/tests/snapshots/stax/12-offer-create/06-combo/00002.png and b/tests/snapshots/stax/12-offer-create/06-combo/00002.png differ
diff --git a/tests/snapshots/stax/12-offer-create/06-combo/00003.png b/tests/snapshots/stax/12-offer-create/06-combo/00003.png
index 4c34e772..c32bf301 100644
Binary files a/tests/snapshots/stax/12-offer-create/06-combo/00003.png and b/tests/snapshots/stax/12-offer-create/06-combo/00003.png differ
diff --git a/tests/snapshots/stax/12-offer-create/06-combo/00004.png b/tests/snapshots/stax/12-offer-create/06-combo/00004.png
index 2fca706e..77fe163f 100644
Binary files a/tests/snapshots/stax/12-offer-create/06-combo/00004.png and b/tests/snapshots/stax/12-offer-create/06-combo/00004.png differ
diff --git a/tests/snapshots/stax/12-offer-create/06-combo/00005.png b/tests/snapshots/stax/12-offer-create/06-combo/00005.png
index 95561713..2e538fa0 100644
Binary files a/tests/snapshots/stax/12-offer-create/06-combo/00005.png and b/tests/snapshots/stax/12-offer-create/06-combo/00005.png differ
diff --git a/tests/snapshots/stax/12-offer-create/06-combo/00006.png b/tests/snapshots/stax/12-offer-create/06-combo/00006.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/12-offer-create/06-combo/00006.png and b/tests/snapshots/stax/12-offer-create/06-combo/00006.png differ
diff --git a/tests/snapshots/stax/12-offer-create/06-combo/00007.png b/tests/snapshots/stax/12-offer-create/06-combo/00007.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/12-offer-create/06-combo/00007.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00000.png b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00000.png
index beb25deb..42f09455 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00000.png and b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00001.png b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00001.png
index e71e271c..dc5af7bf 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00001.png and b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00002.png b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00002.png
index 2f5afbff..77fc7a56 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00002.png and b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00003.png b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00003.png
index d878cab1..97e717c3 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00003.png and b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00004.png b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00004.png
index 9959e138..1ace565f 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00004.png and b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00005.png b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00005.png
index 95561713..2e538fa0 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00005.png and b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00006.png b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00006.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00006.png and b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00006.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/01-basic/00007.png b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00007.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/13-payment-channel-claim/01-basic/00007.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00000.png b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00000.png and b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00000.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00001.png b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00001.png
index 2ab51f16..a103086e 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00001.png and b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00001.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00002.png b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00002.png
index aa52efa6..abed4703 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00002.png and b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00002.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00003.png b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00003.png
index cd8cd70e..dbac71a2 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00003.png and b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00003.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00004.png b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00004.png and b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00004.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00005.png b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00005.png and b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00005.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/02-renew/00006.png b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/13-payment-channel-claim/02-renew/00006.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/03-close/00000.png b/tests/snapshots/stax/13-payment-channel-claim/03-close/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/03-close/00000.png and b/tests/snapshots/stax/13-payment-channel-claim/03-close/00000.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/03-close/00001.png b/tests/snapshots/stax/13-payment-channel-claim/03-close/00001.png
index 538c4b07..3ec3e07c 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/03-close/00001.png and b/tests/snapshots/stax/13-payment-channel-claim/03-close/00001.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/03-close/00002.png b/tests/snapshots/stax/13-payment-channel-claim/03-close/00002.png
index 3069009a..9d892480 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/03-close/00002.png and b/tests/snapshots/stax/13-payment-channel-claim/03-close/00002.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/03-close/00003.png b/tests/snapshots/stax/13-payment-channel-claim/03-close/00003.png
index cd8cd70e..dbac71a2 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/03-close/00003.png and b/tests/snapshots/stax/13-payment-channel-claim/03-close/00003.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/03-close/00004.png b/tests/snapshots/stax/13-payment-channel-claim/03-close/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/03-close/00004.png and b/tests/snapshots/stax/13-payment-channel-claim/03-close/00004.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/03-close/00005.png b/tests/snapshots/stax/13-payment-channel-claim/03-close/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/13-payment-channel-claim/03-close/00005.png and b/tests/snapshots/stax/13-payment-channel-claim/03-close/00005.png differ
diff --git a/tests/snapshots/stax/13-payment-channel-claim/03-close/00006.png b/tests/snapshots/stax/13-payment-channel-claim/03-close/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/13-payment-channel-claim/03-close/00006.png differ
diff --git a/tests/snapshots/stax/14-payment-channel-create/01-basic/00000.png b/tests/snapshots/stax/14-payment-channel-create/01-basic/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/14-payment-channel-create/01-basic/00000.png and b/tests/snapshots/stax/14-payment-channel-create/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/14-payment-channel-create/01-basic/00001.png b/tests/snapshots/stax/14-payment-channel-create/01-basic/00001.png
index c4f8a850..93e5690d 100644
Binary files a/tests/snapshots/stax/14-payment-channel-create/01-basic/00001.png and b/tests/snapshots/stax/14-payment-channel-create/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/14-payment-channel-create/01-basic/00002.png b/tests/snapshots/stax/14-payment-channel-create/01-basic/00002.png
index 3174daf8..e78bdf4f 100644
Binary files a/tests/snapshots/stax/14-payment-channel-create/01-basic/00002.png and b/tests/snapshots/stax/14-payment-channel-create/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/14-payment-channel-create/01-basic/00003.png b/tests/snapshots/stax/14-payment-channel-create/01-basic/00003.png
index b00e9078..c4a85887 100644
Binary files a/tests/snapshots/stax/14-payment-channel-create/01-basic/00003.png and b/tests/snapshots/stax/14-payment-channel-create/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/14-payment-channel-create/01-basic/00004.png b/tests/snapshots/stax/14-payment-channel-create/01-basic/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/14-payment-channel-create/01-basic/00004.png and b/tests/snapshots/stax/14-payment-channel-create/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/14-payment-channel-create/01-basic/00005.png b/tests/snapshots/stax/14-payment-channel-create/01-basic/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/14-payment-channel-create/01-basic/00005.png and b/tests/snapshots/stax/14-payment-channel-create/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/14-payment-channel-create/01-basic/00006.png b/tests/snapshots/stax/14-payment-channel-create/01-basic/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/14-payment-channel-create/01-basic/00006.png differ
diff --git a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00000.png b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00000.png and b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00001.png b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00001.png
index aa0983df..c95a3509 100644
Binary files a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00001.png and b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00002.png b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00002.png
index d485f7ee..a99e69b9 100644
Binary files a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00002.png and b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00003.png b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00003.png and b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00004.png b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00004.png and b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/15-payment-channel-fund/01-basic/00005.png b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/15-payment-channel-fund/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00000.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00000.png
index beb25deb..7f47caaf 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/01-basic/00000.png and b/tests/snapshots/stax/16-signer-list-set/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00001.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00001.png
index 6ccf9395..fb7e1776 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/01-basic/00001.png and b/tests/snapshots/stax/16-signer-list-set/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00002.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00002.png
index 526a6350..f53cf3c5 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/01-basic/00002.png and b/tests/snapshots/stax/16-signer-list-set/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00003.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00003.png
index c7b6e176..85ed3aef 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/01-basic/00003.png and b/tests/snapshots/stax/16-signer-list-set/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00004.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00004.png
index 8413639f..4842e669 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/01-basic/00004.png and b/tests/snapshots/stax/16-signer-list-set/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00005.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00005.png
index 93ff0012..88cacdb9 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/01-basic/00005.png and b/tests/snapshots/stax/16-signer-list-set/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00006.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00006.png
index 1233e00b..07ef94af 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/01-basic/00006.png and b/tests/snapshots/stax/16-signer-list-set/01-basic/00006.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00007.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00007.png
index b2212aa4..1de18d30 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/01-basic/00007.png and b/tests/snapshots/stax/16-signer-list-set/01-basic/00007.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00008.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00008.png
index 102d7fde..ecfa1680 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/01-basic/00008.png and b/tests/snapshots/stax/16-signer-list-set/01-basic/00008.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00009.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00009.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/01-basic/00009.png and b/tests/snapshots/stax/16-signer-list-set/01-basic/00009.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/01-basic/00010.png b/tests/snapshots/stax/16-signer-list-set/01-basic/00010.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/16-signer-list-set/01-basic/00010.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/02-delete/00000.png b/tests/snapshots/stax/16-signer-list-set/02-delete/00000.png
index beb25deb..eb84ff00 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/02-delete/00000.png and b/tests/snapshots/stax/16-signer-list-set/02-delete/00000.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/02-delete/00001.png b/tests/snapshots/stax/16-signer-list-set/02-delete/00001.png
index eb1bfc35..7f1868f1 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/02-delete/00001.png and b/tests/snapshots/stax/16-signer-list-set/02-delete/00001.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/02-delete/00002.png b/tests/snapshots/stax/16-signer-list-set/02-delete/00002.png
index 969cefd7..fd68b727 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/02-delete/00002.png and b/tests/snapshots/stax/16-signer-list-set/02-delete/00002.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/02-delete/00003.png b/tests/snapshots/stax/16-signer-list-set/02-delete/00003.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/16-signer-list-set/02-delete/00003.png and b/tests/snapshots/stax/16-signer-list-set/02-delete/00003.png differ
diff --git a/tests/snapshots/stax/16-signer-list-set/02-delete/00004.png b/tests/snapshots/stax/16-signer-list-set/02-delete/00004.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/16-signer-list-set/02-delete/00004.png differ
diff --git a/tests/snapshots/stax/17-trust-set/01-basic/00000.png b/tests/snapshots/stax/17-trust-set/01-basic/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/17-trust-set/01-basic/00000.png and b/tests/snapshots/stax/17-trust-set/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/17-trust-set/01-basic/00001.png b/tests/snapshots/stax/17-trust-set/01-basic/00001.png
index 13132b88..4dd3267b 100644
Binary files a/tests/snapshots/stax/17-trust-set/01-basic/00001.png and b/tests/snapshots/stax/17-trust-set/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/17-trust-set/01-basic/00002.png b/tests/snapshots/stax/17-trust-set/01-basic/00002.png
index 66244d45..0afefcc6 100644
Binary files a/tests/snapshots/stax/17-trust-set/01-basic/00002.png and b/tests/snapshots/stax/17-trust-set/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/17-trust-set/01-basic/00003.png b/tests/snapshots/stax/17-trust-set/01-basic/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/17-trust-set/01-basic/00003.png and b/tests/snapshots/stax/17-trust-set/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/17-trust-set/01-basic/00004.png b/tests/snapshots/stax/17-trust-set/01-basic/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/17-trust-set/01-basic/00004.png and b/tests/snapshots/stax/17-trust-set/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/17-trust-set/01-basic/00005.png b/tests/snapshots/stax/17-trust-set/01-basic/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/17-trust-set/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/17-trust-set/02-quality/00000.png b/tests/snapshots/stax/17-trust-set/02-quality/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/17-trust-set/02-quality/00000.png and b/tests/snapshots/stax/17-trust-set/02-quality/00000.png differ
diff --git a/tests/snapshots/stax/17-trust-set/02-quality/00001.png b/tests/snapshots/stax/17-trust-set/02-quality/00001.png
index a89a20c0..375502f6 100644
Binary files a/tests/snapshots/stax/17-trust-set/02-quality/00001.png and b/tests/snapshots/stax/17-trust-set/02-quality/00001.png differ
diff --git a/tests/snapshots/stax/17-trust-set/02-quality/00002.png b/tests/snapshots/stax/17-trust-set/02-quality/00002.png
index c31bc4bf..26dc514e 100644
Binary files a/tests/snapshots/stax/17-trust-set/02-quality/00002.png and b/tests/snapshots/stax/17-trust-set/02-quality/00002.png differ
diff --git a/tests/snapshots/stax/17-trust-set/02-quality/00003.png b/tests/snapshots/stax/17-trust-set/02-quality/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/17-trust-set/02-quality/00003.png and b/tests/snapshots/stax/17-trust-set/02-quality/00003.png differ
diff --git a/tests/snapshots/stax/17-trust-set/02-quality/00004.png b/tests/snapshots/stax/17-trust-set/02-quality/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/17-trust-set/02-quality/00004.png and b/tests/snapshots/stax/17-trust-set/02-quality/00004.png differ
diff --git a/tests/snapshots/stax/17-trust-set/02-quality/00005.png b/tests/snapshots/stax/17-trust-set/02-quality/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/17-trust-set/02-quality/00005.png differ
diff --git a/tests/snapshots/stax/17-trust-set/03-authorize/00000.png b/tests/snapshots/stax/17-trust-set/03-authorize/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/17-trust-set/03-authorize/00000.png and b/tests/snapshots/stax/17-trust-set/03-authorize/00000.png differ
diff --git a/tests/snapshots/stax/17-trust-set/03-authorize/00001.png b/tests/snapshots/stax/17-trust-set/03-authorize/00001.png
index 5f96e3c7..591b5920 100644
Binary files a/tests/snapshots/stax/17-trust-set/03-authorize/00001.png and b/tests/snapshots/stax/17-trust-set/03-authorize/00001.png differ
diff --git a/tests/snapshots/stax/17-trust-set/03-authorize/00002.png b/tests/snapshots/stax/17-trust-set/03-authorize/00002.png
index 66244d45..0afefcc6 100644
Binary files a/tests/snapshots/stax/17-trust-set/03-authorize/00002.png and b/tests/snapshots/stax/17-trust-set/03-authorize/00002.png differ
diff --git a/tests/snapshots/stax/17-trust-set/03-authorize/00003.png b/tests/snapshots/stax/17-trust-set/03-authorize/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/17-trust-set/03-authorize/00003.png and b/tests/snapshots/stax/17-trust-set/03-authorize/00003.png differ
diff --git a/tests/snapshots/stax/17-trust-set/03-authorize/00004.png b/tests/snapshots/stax/17-trust-set/03-authorize/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/17-trust-set/03-authorize/00004.png and b/tests/snapshots/stax/17-trust-set/03-authorize/00004.png differ
diff --git a/tests/snapshots/stax/17-trust-set/03-authorize/00005.png b/tests/snapshots/stax/17-trust-set/03-authorize/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/17-trust-set/03-authorize/00005.png differ
diff --git a/tests/snapshots/stax/17-trust-set/04-no-rippling/00000.png b/tests/snapshots/stax/17-trust-set/04-no-rippling/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/17-trust-set/04-no-rippling/00000.png and b/tests/snapshots/stax/17-trust-set/04-no-rippling/00000.png differ
diff --git a/tests/snapshots/stax/17-trust-set/04-no-rippling/00001.png b/tests/snapshots/stax/17-trust-set/04-no-rippling/00001.png
index afdc42bc..9efb4de8 100644
Binary files a/tests/snapshots/stax/17-trust-set/04-no-rippling/00001.png and b/tests/snapshots/stax/17-trust-set/04-no-rippling/00001.png differ
diff --git a/tests/snapshots/stax/17-trust-set/04-no-rippling/00002.png b/tests/snapshots/stax/17-trust-set/04-no-rippling/00002.png
index 66244d45..0afefcc6 100644
Binary files a/tests/snapshots/stax/17-trust-set/04-no-rippling/00002.png and b/tests/snapshots/stax/17-trust-set/04-no-rippling/00002.png differ
diff --git a/tests/snapshots/stax/17-trust-set/04-no-rippling/00003.png b/tests/snapshots/stax/17-trust-set/04-no-rippling/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/17-trust-set/04-no-rippling/00003.png and b/tests/snapshots/stax/17-trust-set/04-no-rippling/00003.png differ
diff --git a/tests/snapshots/stax/17-trust-set/04-no-rippling/00004.png b/tests/snapshots/stax/17-trust-set/04-no-rippling/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/17-trust-set/04-no-rippling/00004.png and b/tests/snapshots/stax/17-trust-set/04-no-rippling/00004.png differ
diff --git a/tests/snapshots/stax/17-trust-set/04-no-rippling/00005.png b/tests/snapshots/stax/17-trust-set/04-no-rippling/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/17-trust-set/04-no-rippling/00005.png differ
diff --git a/tests/snapshots/stax/17-trust-set/05-rippling/00000.png b/tests/snapshots/stax/17-trust-set/05-rippling/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/17-trust-set/05-rippling/00000.png and b/tests/snapshots/stax/17-trust-set/05-rippling/00000.png differ
diff --git a/tests/snapshots/stax/17-trust-set/05-rippling/00001.png b/tests/snapshots/stax/17-trust-set/05-rippling/00001.png
index a81bd0f5..f05babdc 100644
Binary files a/tests/snapshots/stax/17-trust-set/05-rippling/00001.png and b/tests/snapshots/stax/17-trust-set/05-rippling/00001.png differ
diff --git a/tests/snapshots/stax/17-trust-set/05-rippling/00002.png b/tests/snapshots/stax/17-trust-set/05-rippling/00002.png
index 66244d45..0afefcc6 100644
Binary files a/tests/snapshots/stax/17-trust-set/05-rippling/00002.png and b/tests/snapshots/stax/17-trust-set/05-rippling/00002.png differ
diff --git a/tests/snapshots/stax/17-trust-set/05-rippling/00003.png b/tests/snapshots/stax/17-trust-set/05-rippling/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/17-trust-set/05-rippling/00003.png and b/tests/snapshots/stax/17-trust-set/05-rippling/00003.png differ
diff --git a/tests/snapshots/stax/17-trust-set/05-rippling/00004.png b/tests/snapshots/stax/17-trust-set/05-rippling/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/17-trust-set/05-rippling/00004.png and b/tests/snapshots/stax/17-trust-set/05-rippling/00004.png differ
diff --git a/tests/snapshots/stax/17-trust-set/05-rippling/00005.png b/tests/snapshots/stax/17-trust-set/05-rippling/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/17-trust-set/05-rippling/00005.png differ
diff --git a/tests/snapshots/stax/17-trust-set/06-freeze/00000.png b/tests/snapshots/stax/17-trust-set/06-freeze/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/17-trust-set/06-freeze/00000.png and b/tests/snapshots/stax/17-trust-set/06-freeze/00000.png differ
diff --git a/tests/snapshots/stax/17-trust-set/06-freeze/00001.png b/tests/snapshots/stax/17-trust-set/06-freeze/00001.png
index 37d58199..4e06ef9f 100644
Binary files a/tests/snapshots/stax/17-trust-set/06-freeze/00001.png and b/tests/snapshots/stax/17-trust-set/06-freeze/00001.png differ
diff --git a/tests/snapshots/stax/17-trust-set/06-freeze/00002.png b/tests/snapshots/stax/17-trust-set/06-freeze/00002.png
index a5df59cb..0aa5c15f 100644
Binary files a/tests/snapshots/stax/17-trust-set/06-freeze/00002.png and b/tests/snapshots/stax/17-trust-set/06-freeze/00002.png differ
diff --git a/tests/snapshots/stax/17-trust-set/06-freeze/00003.png b/tests/snapshots/stax/17-trust-set/06-freeze/00003.png
index 0282c68d..a12a1784 100644
Binary files a/tests/snapshots/stax/17-trust-set/06-freeze/00003.png and b/tests/snapshots/stax/17-trust-set/06-freeze/00003.png differ
diff --git a/tests/snapshots/stax/17-trust-set/06-freeze/00004.png b/tests/snapshots/stax/17-trust-set/06-freeze/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/17-trust-set/06-freeze/00004.png and b/tests/snapshots/stax/17-trust-set/06-freeze/00004.png differ
diff --git a/tests/snapshots/stax/17-trust-set/06-freeze/00005.png b/tests/snapshots/stax/17-trust-set/06-freeze/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/17-trust-set/06-freeze/00005.png and b/tests/snapshots/stax/17-trust-set/06-freeze/00005.png differ
diff --git a/tests/snapshots/stax/17-trust-set/06-freeze/00006.png b/tests/snapshots/stax/17-trust-set/06-freeze/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/17-trust-set/06-freeze/00006.png differ
diff --git a/tests/snapshots/stax/17-trust-set/07-unfreeze/00000.png b/tests/snapshots/stax/17-trust-set/07-unfreeze/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/17-trust-set/07-unfreeze/00000.png and b/tests/snapshots/stax/17-trust-set/07-unfreeze/00000.png differ
diff --git a/tests/snapshots/stax/17-trust-set/07-unfreeze/00001.png b/tests/snapshots/stax/17-trust-set/07-unfreeze/00001.png
index 59eb626f..2ba21c13 100644
Binary files a/tests/snapshots/stax/17-trust-set/07-unfreeze/00001.png and b/tests/snapshots/stax/17-trust-set/07-unfreeze/00001.png differ
diff --git a/tests/snapshots/stax/17-trust-set/07-unfreeze/00002.png b/tests/snapshots/stax/17-trust-set/07-unfreeze/00002.png
index 5c753ba8..0ca53359 100644
Binary files a/tests/snapshots/stax/17-trust-set/07-unfreeze/00002.png and b/tests/snapshots/stax/17-trust-set/07-unfreeze/00002.png differ
diff --git a/tests/snapshots/stax/17-trust-set/07-unfreeze/00003.png b/tests/snapshots/stax/17-trust-set/07-unfreeze/00003.png
index 0282c68d..a12a1784 100644
Binary files a/tests/snapshots/stax/17-trust-set/07-unfreeze/00003.png and b/tests/snapshots/stax/17-trust-set/07-unfreeze/00003.png differ
diff --git a/tests/snapshots/stax/17-trust-set/07-unfreeze/00004.png b/tests/snapshots/stax/17-trust-set/07-unfreeze/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/17-trust-set/07-unfreeze/00004.png and b/tests/snapshots/stax/17-trust-set/07-unfreeze/00004.png differ
diff --git a/tests/snapshots/stax/17-trust-set/07-unfreeze/00005.png b/tests/snapshots/stax/17-trust-set/07-unfreeze/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/17-trust-set/07-unfreeze/00005.png and b/tests/snapshots/stax/17-trust-set/07-unfreeze/00005.png differ
diff --git a/tests/snapshots/stax/17-trust-set/07-unfreeze/00006.png b/tests/snapshots/stax/17-trust-set/07-unfreeze/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/17-trust-set/07-unfreeze/00006.png differ
diff --git a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00000.png b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00000.png and b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00000.png differ
diff --git a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00001.png b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00001.png
index e0913ee8..e0171222 100644
Binary files a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00001.png and b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00001.png differ
diff --git a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00002.png b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00002.png
index 20c806ea..6653ecd0 100644
Binary files a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00002.png and b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00002.png differ
diff --git a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00003.png b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00003.png and b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00003.png differ
diff --git a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00004.png b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00004.png and b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00004.png differ
diff --git a/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00005.png b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/17-trust-set/08-non-standard-currency/00005.png differ
diff --git a/tests/snapshots/stax/17-trust-set/09-remove/00000.png b/tests/snapshots/stax/17-trust-set/09-remove/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/17-trust-set/09-remove/00000.png and b/tests/snapshots/stax/17-trust-set/09-remove/00000.png differ
diff --git a/tests/snapshots/stax/17-trust-set/09-remove/00001.png b/tests/snapshots/stax/17-trust-set/09-remove/00001.png
index 072f200e..7309c253 100644
Binary files a/tests/snapshots/stax/17-trust-set/09-remove/00001.png and b/tests/snapshots/stax/17-trust-set/09-remove/00001.png differ
diff --git a/tests/snapshots/stax/17-trust-set/09-remove/00002.png b/tests/snapshots/stax/17-trust-set/09-remove/00002.png
index 20c806ea..6653ecd0 100644
Binary files a/tests/snapshots/stax/17-trust-set/09-remove/00002.png and b/tests/snapshots/stax/17-trust-set/09-remove/00002.png differ
diff --git a/tests/snapshots/stax/17-trust-set/09-remove/00003.png b/tests/snapshots/stax/17-trust-set/09-remove/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/17-trust-set/09-remove/00003.png and b/tests/snapshots/stax/17-trust-set/09-remove/00003.png differ
diff --git a/tests/snapshots/stax/17-trust-set/09-remove/00004.png b/tests/snapshots/stax/17-trust-set/09-remove/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/17-trust-set/09-remove/00004.png and b/tests/snapshots/stax/17-trust-set/09-remove/00004.png differ
diff --git a/tests/snapshots/stax/17-trust-set/09-remove/00005.png b/tests/snapshots/stax/17-trust-set/09-remove/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/17-trust-set/09-remove/00005.png differ
diff --git a/tests/snapshots/stax/18-arrays/01-basic/00000.png b/tests/snapshots/stax/18-arrays/01-basic/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/18-arrays/01-basic/00000.png and b/tests/snapshots/stax/18-arrays/01-basic/00000.png differ
diff --git a/tests/snapshots/stax/18-arrays/01-basic/00001.png b/tests/snapshots/stax/18-arrays/01-basic/00001.png
index 65cbf654..c3a01a4f 100644
Binary files a/tests/snapshots/stax/18-arrays/01-basic/00001.png and b/tests/snapshots/stax/18-arrays/01-basic/00001.png differ
diff --git a/tests/snapshots/stax/18-arrays/01-basic/00002.png b/tests/snapshots/stax/18-arrays/01-basic/00002.png
index 7488bc91..604ebde8 100644
Binary files a/tests/snapshots/stax/18-arrays/01-basic/00002.png and b/tests/snapshots/stax/18-arrays/01-basic/00002.png differ
diff --git a/tests/snapshots/stax/18-arrays/01-basic/00003.png b/tests/snapshots/stax/18-arrays/01-basic/00003.png
index e49431e4..91c2360e 100644
Binary files a/tests/snapshots/stax/18-arrays/01-basic/00003.png and b/tests/snapshots/stax/18-arrays/01-basic/00003.png differ
diff --git a/tests/snapshots/stax/18-arrays/01-basic/00004.png b/tests/snapshots/stax/18-arrays/01-basic/00004.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/18-arrays/01-basic/00004.png and b/tests/snapshots/stax/18-arrays/01-basic/00004.png differ
diff --git a/tests/snapshots/stax/18-arrays/01-basic/00005.png b/tests/snapshots/stax/18-arrays/01-basic/00005.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/18-arrays/01-basic/00005.png differ
diff --git a/tests/snapshots/stax/18-arrays/02-multiple/00000.png b/tests/snapshots/stax/18-arrays/02-multiple/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/18-arrays/02-multiple/00000.png and b/tests/snapshots/stax/18-arrays/02-multiple/00000.png differ
diff --git a/tests/snapshots/stax/18-arrays/02-multiple/00001.png b/tests/snapshots/stax/18-arrays/02-multiple/00001.png
index f77e2319..89f68d2b 100644
Binary files a/tests/snapshots/stax/18-arrays/02-multiple/00001.png and b/tests/snapshots/stax/18-arrays/02-multiple/00001.png differ
diff --git a/tests/snapshots/stax/18-arrays/02-multiple/00002.png b/tests/snapshots/stax/18-arrays/02-multiple/00002.png
index 8a874d9c..6d06ccb2 100644
Binary files a/tests/snapshots/stax/18-arrays/02-multiple/00002.png and b/tests/snapshots/stax/18-arrays/02-multiple/00002.png differ
diff --git a/tests/snapshots/stax/18-arrays/02-multiple/00003.png b/tests/snapshots/stax/18-arrays/02-multiple/00003.png
index 0693aeb0..8fc06888 100644
Binary files a/tests/snapshots/stax/18-arrays/02-multiple/00003.png and b/tests/snapshots/stax/18-arrays/02-multiple/00003.png differ
diff --git a/tests/snapshots/stax/18-arrays/02-multiple/00004.png b/tests/snapshots/stax/18-arrays/02-multiple/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/18-arrays/02-multiple/00004.png and b/tests/snapshots/stax/18-arrays/02-multiple/00004.png differ
diff --git a/tests/snapshots/stax/18-arrays/02-multiple/00005.png b/tests/snapshots/stax/18-arrays/02-multiple/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/18-arrays/02-multiple/00005.png and b/tests/snapshots/stax/18-arrays/02-multiple/00005.png differ
diff --git a/tests/snapshots/stax/18-arrays/02-multiple/00006.png b/tests/snapshots/stax/18-arrays/02-multiple/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/18-arrays/02-multiple/00006.png differ
diff --git a/tests/snapshots/stax/18-arrays/03-not-last/00000.png b/tests/snapshots/stax/18-arrays/03-not-last/00000.png
index beb25deb..3119b975 100644
Binary files a/tests/snapshots/stax/18-arrays/03-not-last/00000.png and b/tests/snapshots/stax/18-arrays/03-not-last/00000.png differ
diff --git a/tests/snapshots/stax/18-arrays/03-not-last/00001.png b/tests/snapshots/stax/18-arrays/03-not-last/00001.png
index f77e2319..89f68d2b 100644
Binary files a/tests/snapshots/stax/18-arrays/03-not-last/00001.png and b/tests/snapshots/stax/18-arrays/03-not-last/00001.png differ
diff --git a/tests/snapshots/stax/18-arrays/03-not-last/00002.png b/tests/snapshots/stax/18-arrays/03-not-last/00002.png
index 23ac3d3c..c54465b3 100644
Binary files a/tests/snapshots/stax/18-arrays/03-not-last/00002.png and b/tests/snapshots/stax/18-arrays/03-not-last/00002.png differ
diff --git a/tests/snapshots/stax/18-arrays/03-not-last/00003.png b/tests/snapshots/stax/18-arrays/03-not-last/00003.png
index 5baefb43..fa7dc2b8 100644
Binary files a/tests/snapshots/stax/18-arrays/03-not-last/00003.png and b/tests/snapshots/stax/18-arrays/03-not-last/00003.png differ
diff --git a/tests/snapshots/stax/18-arrays/03-not-last/00004.png b/tests/snapshots/stax/18-arrays/03-not-last/00004.png
index c77563b9..7cff0b71 100644
Binary files a/tests/snapshots/stax/18-arrays/03-not-last/00004.png and b/tests/snapshots/stax/18-arrays/03-not-last/00004.png differ
diff --git a/tests/snapshots/stax/18-arrays/03-not-last/00005.png b/tests/snapshots/stax/18-arrays/03-not-last/00005.png
index ebe9a9a7..2ba6d27d 100644
Binary files a/tests/snapshots/stax/18-arrays/03-not-last/00005.png and b/tests/snapshots/stax/18-arrays/03-not-last/00005.png differ
diff --git a/tests/snapshots/stax/18-arrays/03-not-last/00006.png b/tests/snapshots/stax/18-arrays/03-not-last/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/18-arrays/03-not-last/00006.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm/00000.png b/tests/snapshots/stax/test_get_public_key_confirm/00000.png
index a5c0aa6e..37a61e44 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm/00000.png and b/tests/snapshots/stax/test_get_public_key_confirm/00000.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm/00001.png b/tests/snapshots/stax/test_get_public_key_confirm/00001.png
index 13499fcc..276adbdb 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm/00001.png and b/tests/snapshots/stax/test_get_public_key_confirm/00001.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm/00002.png b/tests/snapshots/stax/test_get_public_key_confirm/00002.png
index 86ba643d..3f906b2b 100644
Binary files a/tests/snapshots/stax/test_get_public_key_confirm/00002.png and b/tests/snapshots/stax/test_get_public_key_confirm/00002.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_confirm/00003.png b/tests/snapshots/stax/test_get_public_key_confirm/00003.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/test_get_public_key_confirm/00003.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_reject/00000.png b/tests/snapshots/stax/test_get_public_key_reject/00000.png
index a5c0aa6e..37a61e44 100644
Binary files a/tests/snapshots/stax/test_get_public_key_reject/00000.png and b/tests/snapshots/stax/test_get_public_key_reject/00000.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_reject/00001.png b/tests/snapshots/stax/test_get_public_key_reject/00001.png
index b0eba3f0..276adbdb 100644
Binary files a/tests/snapshots/stax/test_get_public_key_reject/00001.png and b/tests/snapshots/stax/test_get_public_key_reject/00001.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_reject/00002.png b/tests/snapshots/stax/test_get_public_key_reject/00002.png
index 86ba643d..b0eba3f0 100644
Binary files a/tests/snapshots/stax/test_get_public_key_reject/00002.png and b/tests/snapshots/stax/test_get_public_key_reject/00002.png differ
diff --git a/tests/snapshots/stax/test_get_public_key_reject/00003.png b/tests/snapshots/stax/test_get_public_key_reject/00003.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/test_get_public_key_reject/00003.png differ
diff --git a/tests/snapshots/stax/test_sign_reject/00000.png b/tests/snapshots/stax/test_sign_reject/00000.png
index beb25deb..0fc396e5 100644
Binary files a/tests/snapshots/stax/test_sign_reject/00000.png and b/tests/snapshots/stax/test_sign_reject/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_reject/00001.png b/tests/snapshots/stax/test_sign_reject/00001.png
index babad989..d300f6af 100644
Binary files a/tests/snapshots/stax/test_sign_reject/00001.png and b/tests/snapshots/stax/test_sign_reject/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_reject/00002.png b/tests/snapshots/stax/test_sign_reject/00002.png
index 86ba643d..9a80ac12 100644
Binary files a/tests/snapshots/stax/test_sign_reject/00002.png and b/tests/snapshots/stax/test_sign_reject/00002.png differ
diff --git a/tests/snapshots/stax/test_sign_reject/00003.png b/tests/snapshots/stax/test_sign_reject/00003.png
new file mode 100644
index 00000000..91c2360e
Binary files /dev/null and b/tests/snapshots/stax/test_sign_reject/00003.png differ
diff --git a/tests/snapshots/stax/test_sign_reject/00004.png b/tests/snapshots/stax/test_sign_reject/00004.png
new file mode 100644
index 00000000..babad989
Binary files /dev/null and b/tests/snapshots/stax/test_sign_reject/00004.png differ
diff --git a/tests/snapshots/stax/test_sign_reject/00005.png b/tests/snapshots/stax/test_sign_reject/00005.png
new file mode 100644
index 00000000..cebc8bed
Binary files /dev/null and b/tests/snapshots/stax/test_sign_reject/00005.png differ
diff --git a/tests/snapshots/stax/test_sign_reject/00006.png b/tests/snapshots/stax/test_sign_reject/00006.png
new file mode 100644
index 00000000..4e5f8c6a
Binary files /dev/null and b/tests/snapshots/stax/test_sign_reject/00006.png differ
diff --git a/tests/utils.py b/tests/utils.py
index ea43aa0c..17bc66a4 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -13,18 +13,15 @@
 from ecdsa import VerifyingKey, SECP256k1  # type: ignore [import]
 
 from ragger.bip import calculate_public_key_and_chaincode, CurveChoice
-from ragger.navigator import NavInsID, NavIns, Navigator
-from ragger.firmware import Firmware
 
 
-ROOT_SCREENSHOT_PATH = Path(__file__).parent.resolve()
 DEFAULT_PATH = "44'/144'/0'/0'/0"
 DEFAULT_BIP32_PATH = Bip32Path.build(DEFAULT_PATH)
 TX_PREFIX_SINGLE = [0x53, 0x54, 0x58, 0x00]
 TX_PREFIX_MULTI = [0x53, 0x4D, 0x54, 0x00]
 
 
-def pop_size_prefixed_buf_from_buf(buffer:bytes):
+def pop_size_prefixed_buf_from_buf(buffer:bytes) -> Tuple[bytes, int, bytes]:
     """ Returns remainder, data_len, data """
 
     data_len = buffer[0]
@@ -57,61 +54,11 @@ def unpack_get_public_key_response(reply: bytes) -> Tuple[int, str, int, str]:
     return key_len, key_data.hex(), len(chain_data), chain_data.hex()
 
 
-def util_navigate(
-        firmware: Firmware,
-        navigator: Navigator,
-        test_name: Path,
-        text: str = "",
-        screen_change: bool = True,
-) -> None:
-    """ Navigate in the menus with conditions """
-
-    assert text
-    valid_instr: list[NavIns | NavInsID] = []
-
-    if firmware.device.startswith("nano"):
-        text = text.split("_")[0]
-        nav_inst = NavInsID.RIGHT_CLICK
-        valid_instr.append(NavInsID.BOTH_CLICK)
-
-    else:
-        if text == "Approve":
-            text = "Confirm"
-            valid_instr.append(NavInsID.USE_CASE_ADDRESS_CONFIRMATION_CONFIRM)
-            nav_inst = NavInsID.USE_CASE_REVIEW_TAP
-
-        elif text == "Reject_pubkey":
-            text = "Cancel"
-            valid_instr.append(NavInsID.USE_CASE_CHOICE_REJECT)
-            nav_inst = NavInsID.USE_CASE_REVIEW_REJECT
-
-        elif text == "Reject_sign":
-            text = "Reject transaction"
-            valid_instr.append(NavInsID.USE_CASE_CHOICE_CONFIRM)
-            nav_inst = NavInsID.USE_CASE_REVIEW_REJECT
-
-        elif text == "Sign transaction":
-            text = "Hold to confirm"
-            valid_instr.append(NavInsID.USE_CASE_REVIEW_CONFIRM)
-            nav_inst = NavInsID.USE_CASE_REVIEW_TAP
-
-        else:
-            raise ValueError(f'Wrong text "{text}"')
-
-    navigator.navigate_until_text_and_compare(nav_inst,
-                                              valid_instr,
-                                              text,
-                                              ROOT_SCREENSHOT_PATH,
-                                              test_name,
-                                              screen_change_after_last_instruction=screen_change)
-
-
-def verify_version(version: str) -> None:
+def verify_version(root_path: Path, version: str) -> None:
     """ Verify the app version, based on defines in Makefile """
 
     print(f"version: {version}")
-    parent = Path(ROOT_SCREENSHOT_PATH).parent.resolve()
-    makefile = f"{parent}/Makefile"
+    makefile = f"{root_path.parent.resolve()}/Makefile"
     print(f"{makefile}")
     with open(makefile, "r", encoding="utf-8") as f_p:
         lines = f_p.readlines()
diff --git a/tests/xrp.py b/tests/xrp.py
index 53b665a8..81408634 100644
--- a/tests/xrp.py
+++ b/tests/xrp.py
@@ -1,7 +1,9 @@
 from contextlib import contextmanager
-from typing import Optional
+from typing import Optional, Tuple
 from enum import IntEnum
 from ragger.backend.interface import BackendInterface, RAPDU
+from ragger.firmware import Firmware
+from ragger.navigator import Navigator
 from ragger.utils.misc import split_message
 
 from .utils import DEFAULT_BIP32_PATH, unpack_get_public_key_response, unpack_configuration_response
@@ -57,7 +59,7 @@ class Errors(IntEnum):
 class XRPClient:
     CLA = 0xE0
 
-    def __init__(self, client: BackendInterface, firmware, navigator):
+    def __init__(self, client: BackendInterface, firmware: Firmware, navigator: Navigator) -> None:
         if not isinstance(client, BackendInterface):
             raise TypeError("client must be an instance of BackendInterface")
         self._client = client
@@ -78,13 +80,14 @@ def _exchange_async(self,
                   data: bytes = b""):
         return self._client.exchange_async(self.CLA, ins, p1=p1, p2=p2, data=data)
 
-    def get_configuration(self):
+    def get_configuration(self) -> str:
         reply = self._exchange(Ins.GET_CONFIGURATION)
         assert reply.status == Errors.SW_SUCCESS
 
         return unpack_configuration_response(reply.data)
 
-    def get_pubkey_no_confirm(self, path: bytes = DEFAULT_BIP32_PATH, chain_code: bool = False):
+    def get_pubkey_no_confirm(self, path: bytes = DEFAULT_BIP32_PATH,
+                              chain_code: bool = False) -> Tuple[int, str, int, str]:
         p2 = P2.CURVE_SECP256K1
         if chain_code:
             p2 |= P2.CHAIN_CODE  # type: ignore[assignment]