diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5dbd7e0c9..e2f9050358 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,9 @@ variables:
 
   # No need for TLS because everything runs on the same machine
   DOCKER_TLS_CERTDIR: ""
+
+  NIX_SHELL: "nix-shell"
+
 stages:
   - environment
   - prebuild
@@ -29,9 +32,9 @@ stages:
 
 before_script:
   - . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh || true
-  - nix-shell --run "poetry install --remove-untracked"
-  - export LEGACY_VERSION=$(nix-shell --run "./tools/version.sh legacy/firmware/version.h")
-  - export CORE_VERSION=$(nix-shell --run "./tools/version.sh core/embed/firmware/version.h")
+  - $NIX_SHELL --run "poetry install --remove-untracked"
+  - export LEGACY_VERSION=$($NIX_SHELL --run "./tools/version.sh legacy/firmware/version.h")
+  - export CORE_VERSION=$($NIX_SHELL --run "./tools/version.sh core/embed/firmware/version.h")
 
 include:
   - ci/environment.yml
diff --git a/README.md b/README.md
index 627e8e5a29..400b6fbfd2 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Also please have a look at the docs, either in the `docs` folder or at  [docs.tr
 
 ## Security vulnerability disclosure
 
-Please report suspected security vulnerabilities in private to [security@satoshilabs.com](mailto:security@satoshilabs.com), also see [the disclosure section on the Trezor.io website](https://trezor.io/security/). Please do NOT create publicly viewable issues for suspected security vulnerabilities.
+Please report suspected security vulnerabilities in private to [security@satoshilabs.com](mailto:security@satoshilabs.com), also see [the disclosure section on the Trezor.io website](https://trezor.io/support/a/how-to-report-a-security-issue). Please do NOT create publicly viewable issues for suspected security vulnerabilities.
 
 ## Documentation
 
diff --git a/build-docker.sh b/build-docker.sh
index 52ae60b624..4ab13fe536 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -32,6 +32,7 @@ if [ -z "$ALPINE_CHECKSUM" ]; then
  fi
 
 
+DOCKER=${DOCKER:-docker}
 CONTAINER_NAME=${CONTAINER_NAME:-trezor-firmware-env.nix}
 ALPINE_CDN=${ALPINE_CDN:-https://dl-cdn.alpinelinux.org/alpine}
 ALPINE_RELEASE=${ALPINE_RELEASE:-3.15}
@@ -137,7 +138,13 @@ echo
 echo ">>> DOCKER BUILD ALPINE_VERSION=$ALPINE_VERSION ALPINE_ARCH=$ALPINE_ARCH NIX_VERSION=$NIX_VERSION -t $CONTAINER_NAME"
 echo
 
-docker build --build-arg ALPINE_VERSION="$ALPINE_VERSION" --build-arg ALPINE_ARCH="$ALPINE_ARCH" --build-arg NIX_VERSION="$NIX_VERSION" -t "$CONTAINER_NAME" ci/
+$DOCKER build \
+  --network=host \
+  --build-arg ALPINE_VERSION="$ALPINE_VERSION" \
+  --build-arg ALPINE_ARCH="$ALPINE_ARCH" \
+  --build-arg NIX_VERSION="$NIX_VERSION" \
+  -t "$CONTAINER_NAME" \
+  ci/
 
 # stat under macOS has slightly different cli interface
 USER=$(stat -c "%u" . 2>/dev/null || stat -f "%u" .)
@@ -179,7 +186,10 @@ EOF
   echo ">>> DOCKER RUN core BITCOIN_ONLY=$BITCOIN_ONLY PRODUCTION=$PRODUCTION"
   echo
 
-  docker run -it --rm \
+  $DOCKER run \
+    --network=host \
+    -it \
+    --rm \
     -v "$DIR:/local" \
     -v "$DIR/build/core$DIRSUFFIX":/build:z \
     --env BITCOIN_ONLY="$BITCOIN_ONLY" \
@@ -225,7 +235,10 @@ EOF
   echo ">>> DOCKER RUN legacy BITCOIN_ONLY=$BITCOIN_ONLY PRODUCTION=$PRODUCTION"
   echo
 
-  docker run -it --rm \
+  $DOCKER run \
+    --network=host \
+    -it \
+    --rm \
     -v "$DIR:/local" \
     -v "$DIR/build/legacy$DIRSUFFIX":/build:z \
     --env BITCOIN_ONLY="$BITCOIN_ONLY" \
@@ -233,7 +246,6 @@ EOF
     --init \
     "$CONTAINER_NAME" \
     /nix/var/nix/profiles/default/bin/nix-shell --run "bash /local/build/$SCRIPT_NAME"
-
 done
 
 # all built, show fingerprints
diff --git a/ci/build.yml b/ci/build.yml
index d15929d747..edd0c245ba 100644
--- a/ci/build.yml
+++ b/ci/build.yml
@@ -22,17 +22,17 @@ core fw regular build:
   <<: *gitlab_caching
   needs: []
   script:
-    - nix-shell --run "poetry run make -C core build_boardloader"
-    - nix-shell --run "poetry run make -C core build_bootloader"
-    - nix-shell --run "poetry run make -C core build_bootloader_ci"
-    - nix-shell --run "poetry run make -C core build_prodtest"
-    - nix-shell --run "poetry run make -C core build_firmware"
-    - nix-shell --run "poetry run make -C core sizecheck"
-    - cp core/build/firmware/firmware.bin trezor-fw-regular-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - $NIX_SHELL --run "poetry run make -C core build_boardloader"
+    - $NIX_SHELL --run "poetry run make -C core build_bootloader"
+    - $NIX_SHELL --run "poetry run make -C core build_bootloader_ci"
+    - $NIX_SHELL --run "poetry run make -C core build_prodtest"
+    - $NIX_SHELL --run "poetry run make -C core build_firmware"
+    - $NIX_SHELL --run "poetry run make -C core sizecheck"
+    - cp core/build/firmware/firmware.bin firmware-T2T1-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-regular-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - firmware-T2T1-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 # Build of Core into firmware with enabled _debug_ mode. In debug mode you can
@@ -43,12 +43,12 @@ core fw regular debug build:
   <<: *gitlab_caching
   needs: []
   script:
-    - nix-shell --run "PYOPT=0 poetry run make -C core build_firmware"
-    - cp core/build/firmware/firmware.bin trezor-fw-regular-debug-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - $NIX_SHELL --run "PYOPT=0 poetry run make -C core build_firmware"
+    - cp core/build/firmware/firmware.bin firmware-T2T1-debug-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-regular-debug-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - firmware-T2T1-debug-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 core fw regular production build:
@@ -60,17 +60,17 @@ core fw regular production build:
   variables:
     PRODUCTION: "1"
   script:
-    - nix-shell --run "poetry run make -C core build_boardloader"
-    - nix-shell --run "poetry run make -C core build_bootloader"
-    - nix-shell --run "poetry run make -C core build_bootloader_ci"
-    - nix-shell --run "poetry run make -C core build_prodtest"
-    - nix-shell --run "poetry run make -C core build_firmware"
-    - nix-shell --run "poetry run make -C core sizecheck"
-    - cp core/build/firmware/firmware.bin trezor-fw-regular-production-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - $NIX_SHELL --run "poetry run make -C core build_boardloader"
+    - $NIX_SHELL --run "poetry run make -C core build_bootloader"
+    - $NIX_SHELL --run "poetry run make -C core build_bootloader_ci"
+    - $NIX_SHELL --run "poetry run make -C core build_prodtest"
+    - $NIX_SHELL --run "poetry run make -C core build_firmware"
+    - $NIX_SHELL --run "poetry run make -C core sizecheck"
+    - cp core/build/firmware/firmware.bin firmware-T2T1-production-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-regular-production-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - firmware-T2T1-production-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 # Build of Core into firmware. Bitcoin-only version.
@@ -81,14 +81,14 @@ core fw btconly build:
   variables:
     BITCOIN_ONLY: "1"
   script:
-    - nix-shell --run "poetry run make -C core build_firmware"
+    - $NIX_SHELL --run "poetry run make -C core build_firmware"
     - mv core/build/firmware/firmware.bin core/build/firmware/firmware-bitcoinonly.bin
-    - nix-shell --run "poetry run ./tools/check-bitcoin-only core/build/firmware/firmware-bitcoinonly.bin"
-    - cp core/build/firmware/firmware-bitcoinonly.bin trezor-fw-btconly-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - $NIX_SHELL --run "poetry run ./tools/check-bitcoin-only core/build/firmware/firmware-bitcoinonly.bin"
+    - cp core/build/firmware/firmware-bitcoinonly.bin firmware-T2T1-btconly-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-btconly-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - firmware-T2T1-btconly-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 core fw btconly debug build:
@@ -99,8 +99,8 @@ core fw btconly debug build:
     BITCOIN_ONLY: "1"
     PYOPT: "0"
   script:
-    - nix-shell --run "poetry run make -C core build_firmware"
-    - cp core/build/firmware/firmware.bin trezor-fw-btconly-debug-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - $NIX_SHELL --run "poetry run make -C core build_firmware"
+    - cp core/build/firmware/firmware.bin firmware-T2T1-btconly-debug-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
   only:  # currently used only for HW tests and deploys
     - schedules  # nightly build
     - /^legacy\//
@@ -111,7 +111,7 @@ core fw btconly debug build:
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-btconly-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - firmware-T2T1-btconly-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 core fw btconly production build:
@@ -124,29 +124,13 @@ core fw btconly production build:
     PRODUCTION: "1"
     BITCOIN_ONLY: "1"
   script:
-    - nix-shell --run "poetry run make -C core build_firmware"
-    - nix-shell --run "poetry run ./tools/check-bitcoin-only core/build/firmware/firmware.bin"
-    - cp core/build/firmware/firmware.bin trezor-fw-btconly-production-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - $NIX_SHELL --run "poetry run make -C core build_firmware"
+    - $NIX_SHELL --run "poetry run ./tools/check-bitcoin-only core/build/firmware/firmware.bin"
+    - cp core/build/firmware/firmware.bin firmware-T2T1-btconly-production-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-btconly-production-*.*.*-$CI_COMMIT_SHORT_SHA.bin
-    expire_in: 1 week
-
-core fw btconly t1 build:
-  stage: build
-  <<: *gitlab_caching
-  needs: []
-  variables:
-    BITCOIN_ONLY: "1"
-    TREZOR_MODEL: "1"
-  script:
-    - nix-shell --run "poetry run make -C core build_firmware"
-    - cp core/build/firmware/firmware.bin trezor-fw-btconly-t1-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.bin
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
-    paths:
-      - trezor-fw-btconly-t1-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - firmware-T2T1-btconly-production-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 # Non-frozen emulator build. This means you still need Python files
@@ -156,7 +140,7 @@ core unix regular build:
   <<: *gitlab_caching
   needs: []
   script:
-    - nix-shell --run "poetry run make -C core build_unix"
+    - $NIX_SHELL --run "poetry run make -C core build_unix"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -172,7 +156,7 @@ core unix regular asan build:
   variables:
     ADDRESS_SANITIZER: "1"
   script:
-    - nix-shell --run "poetry run make -C core build_unix"
+    - $NIX_SHELL --run "poetry run make -C core build_unix"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -187,7 +171,7 @@ core unix frozen regular build:
   <<: *gitlab_caching
   needs: []
   script:
-    - nix-shell --run "poetry run make -C core build_unix_frozen"
+    - $NIX_SHELL --run "poetry run make -C core build_unix_frozen"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -207,7 +191,7 @@ core unix frozen btconly debug build:
     PYOPT: "0"
     BITCOIN_ONLY: "1"
   script:
-    - nix-shell --run "poetry run make -C core build_unix_frozen"
+    - $NIX_SHELL --run "poetry run make -C core build_unix_frozen"
     - mv core/build/unix/trezor-emu-core core/build/unix/trezor-emu-core-bitcoinonly
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -226,7 +210,7 @@ core unix frozen btconly debug asan build:
     BITCOIN_ONLY: "1"
     ADDRESS_SANITIZER: "1"
   script:
-    - nix-shell --run "poetry run make -C core build_unix_frozen"
+    - $NIX_SHELL --run "poetry run make -C core build_unix_frozen"
     - mv core/build/unix/trezor-emu-core core/build/unix/trezor-emu-core-bitcoinonly
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -245,7 +229,7 @@ core unix frozen debug build:
   variables:
     PYOPT: "0"
   script:
-    - nix-shell --run "poetry run make -C core build_unix_frozen"
+    - $NIX_SHELL --run "poetry run make -C core build_unix_frozen"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     untracked: true
@@ -261,7 +245,7 @@ core unix frozen debug asan build:
     PYOPT: "0"
     ADDRESS_SANITIZER: "1"
   script:
-    - nix-shell --run "poetry run make -C core build_unix_frozen"
+    - $NIX_SHELL --run "poetry run make -C core build_unix_frozen"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     untracked: true
@@ -280,7 +264,7 @@ core unix frozen debug build arm:
   variables:
     PYOPT: "0"
   script:
-    - nix-shell --run "poetry run make -C core build_unix_frozen"
+    - $NIX_SHELL --run "poetry run make -C core build_unix_frozen"
     - mv core/build/unix/trezor-emu-core core/build/unix/trezor-emu-core-arm
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -289,22 +273,6 @@ core unix frozen debug build arm:
   tags:
     - docker_darwin_arm
 
-core unix frozen btconly debug t1 build:
-  stage: build
-  <<: *gitlab_caching
-  needs: []
-  variables:
-    BITCOIN_ONLY: "1"
-    TREZOR_MODEL: "1"
-  script:
-    - nix-shell --run "poetry run make -C core build_unix_frozen"
-    - mv core/build/unix/trezor-emu-core core/build/unix/trezor-emu-core-bitcoinonly
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
-    paths:
-      - core/build/unix  # most of it needed by test_rust
-    expire_in: 1 week
-
 core macos frozen regular build:
   stage: build
   <<: *gitlab_caching
@@ -313,7 +281,7 @@ core macos frozen regular build:
   tags:
     - darwin_arm
   script:
-    - nix-shell --option system x86_64-darwin --run "poetry run make -C core build_unix_frozen"
+    - $NIX_SHELL --option system x86_64-darwin --run "poetry run make -C core build_unix_frozen"
     - export NAME="trezor-emu-core.darwin"
     - cp -v core/build/unix/trezor-emu-core ./$NAME
     - chmod +x $NAME
@@ -343,8 +311,8 @@ crypto build:
       - crypto/**
   script:
     - cp -r crypto crypto_noasan
-    - nix-shell --run "poetry run make -C crypto"
-    - nix-shell --run "export ADDRESS_SANITIZER=0; poetry run make -C crypto_noasan"
+    - $NIX_SHELL --run "poetry run make -C crypto"
+    - $NIX_SHELL --run "export ADDRESS_SANITIZER=0; poetry run make -C crypto_noasan"
     - mv crypto_noasan/tests/test_check crypto/tests/test_check_noasan
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -364,15 +332,15 @@ legacy fw regular build:
   <<: *gitlab_caching
   needs: []
   script:
-    - nix-shell --run "export PRODUCTION=1 && poetry run legacy/script/cibuild"
-    - nix-shell --run "poetry run legacy/script/setup"
-    - nix-shell --run "export PRODUCTION=0 && poetry run legacy/script/cibuild"
-    - nix-shell --run "poetry run make -C legacy/demo"
-    - mv legacy/firmware/trezor.bin trezor-fw-regular-$LEGACY_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - $NIX_SHELL --run "export PRODUCTION=1 && poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run legacy/script/setup"
+    - $NIX_SHELL --run "export PRODUCTION=0 && poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run make -C legacy/demo"
+    - mv legacy/firmware/trezor.bin firmware-T1B1-$LEGACY_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-regular-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - firmware-T1B1-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 legacy fw regular debug build:
@@ -382,14 +350,14 @@ legacy fw regular debug build:
   variables:
     DEBUG_LINK: "1"
   script:
-    - nix-shell --run "export PRODUCTION=1 && poetry run legacy/script/cibuild"
-    - nix-shell --run "poetry run legacy/script/setup"
-    - nix-shell --run "export PRODUCTION=0 && poetry run legacy/script/cibuild"
-    - mv legacy/firmware/trezor.bin trezor-fw-regular-debug-$LEGACY_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - $NIX_SHELL --run "export PRODUCTION=1 && poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run legacy/script/setup"
+    - $NIX_SHELL --run "export PRODUCTION=0 && poetry run legacy/script/cibuild"
+    - mv legacy/firmware/trezor.bin firmware-T1B1-debug-$LEGACY_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-regular-debug-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - firmware-T1B1-debug-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 legacy fw btconly build:
@@ -399,16 +367,16 @@ legacy fw btconly build:
   variables:
     BITCOIN_ONLY: "1"
   script:
-    - nix-shell --run "export PRODUCTION=1 && poetry run legacy/script/cibuild"
-    - nix-shell --run "poetry run legacy/script/setup"
-    - nix-shell --run "export PRODUCTION=0 && poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "export PRODUCTION=1 && poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run legacy/script/setup"
+    - $NIX_SHELL --run "export PRODUCTION=0 && poetry run legacy/script/cibuild"
     - mv legacy/firmware/trezor.bin legacy/firmware/trezor-bitcoinonly.bin
-    - nix-shell --run "poetry run ./tools/check-bitcoin-only legacy/firmware/trezor-bitcoinonly.bin"
-    - mv legacy/firmware/trezor-bitcoinonly.bin trezor-fw-btconly-$LEGACY_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - $NIX_SHELL --run "poetry run ./tools/check-bitcoin-only legacy/firmware/trezor-bitcoinonly.bin"
+    - mv legacy/firmware/trezor-bitcoinonly.bin firmware-T1B1-btconly-$LEGACY_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-btconly-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - firmware-T1B1-btconly-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 legacy fw btconly debug build:
@@ -419,15 +387,15 @@ legacy fw btconly debug build:
     BITCOIN_ONLY: "1"
     DEBUG_LINK: "1"
   script:
-    - nix-shell --run "export PRODUCTION=1 && poetry run legacy/script/cibuild"
-    - nix-shell --run "poetry run legacy/script/setup"
-    - nix-shell --run "export PRODUCTION=0 && poetry run legacy/script/cibuild"
-    - nix-shell --run "poetry run ./tools/check-bitcoin-only legacy/firmware/trezor.bin"
-    - mv legacy/firmware/trezor.bin trezor-fw-btconly-debug-$LEGACY_VERSION-$CI_COMMIT_SHORT_SHA.bin
+    - $NIX_SHELL --run "export PRODUCTION=1 && poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run legacy/script/setup"
+    - $NIX_SHELL --run "export PRODUCTION=0 && poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run ./tools/check-bitcoin-only legacy/firmware/trezor.bin"
+    - mv legacy/firmware/trezor.bin firmware-T1B1-btconly-debug-$LEGACY_VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
-      - trezor-fw-btconly-*.*.*-$CI_COMMIT_SHORT_SHA.bin
+      - firmware-T1B1-btconly-debug-*.*.*-$CI_COMMIT_SHORT_SHA.bin
     expire_in: 1 week
 
 # Regular version (not only Bitcoin) of above.
@@ -440,7 +408,7 @@ legacy emu regular debug build:
     DEBUG_LINK: "1"
     EMULATOR: "1"
   script:
-    - nix-shell --run "poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run legacy/script/cibuild"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -458,7 +426,7 @@ legacy emu regular debug asan build:
     EMULATOR: "1"
     ADDRESS_SANITIZER: "1"
   script:
-    - nix-shell --run "poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run legacy/script/cibuild"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -479,7 +447,7 @@ legacy emu regular debug build arm:
     DEBUG_LINK: "1"
     EMULATOR: "1"
   script:
-    - nix-shell --run "poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run legacy/script/cibuild"
     - mv legacy/firmware/trezor.elf  legacy/firmware/trezor-arm.elf
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -500,7 +468,7 @@ legacy emu btconly debug build:
     DEBUG_LINK: "1"
     EMULATOR: "1"
   script:
-    - nix-shell --run "poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run legacy/script/cibuild"
     - mv legacy/firmware/trezor.elf legacy/firmware/trezor-bitcoinonly.elf
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -520,7 +488,7 @@ legacy emu btconly debug asan build:
     EMULATOR: "1"
     ADDRESS_SANITIZER: "1"
   script:
-    - nix-shell --run "poetry run legacy/script/cibuild"
+    - $NIX_SHELL --run "poetry run legacy/script/cibuild"
     - mv legacy/firmware/trezor.elf legacy/firmware/trezor-bitcoinonly.elf
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
diff --git a/ci/deploy.yml b/ci/deploy.yml
index b34e76f267..8b141f0d72 100644
--- a/ci/deploy.yml
+++ b/ci/deploy.yml
@@ -12,7 +12,7 @@ release core fw regular deploy:
     - core fw regular build
   script:
     - export VERSION=$(./tools/version.sh core/embed/firmware/version.h)
-    - export NAME="trezor-fw-regular-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
+    - export NAME="firmware-T2T1-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
     - echo "Deploying to ${DEPLOY_DIRECTORY}/$NAME"
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
@@ -33,7 +33,7 @@ release core fw btconly deploy:
     - core fw btconly build
   script:
     - export VERSION=$(./tools/version.sh core/embed/firmware/version.h)
-    - export NAME="trezor-fw-btconly-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
+    - export NAME="firmware-T2T1-btconly-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
     - echo "Deploying to ${DEPLOY_DIRECTORY}/$NAME"
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
@@ -54,7 +54,7 @@ release core fw regular debug deploy:
     - core fw regular debug build
   script:
     - export VERSION=$(./tools/version.sh core/embed/firmware/version.h)
-    - export NAME="trezor-fw-regular-debug-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
+    - export NAME="firmware-T2T1-debug-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
     - echo "Deploying to ${DEPLOY_DIRECTORY}/$NAME"
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
@@ -75,7 +75,7 @@ release core fw btconly debug deploy:
     - core fw btconly debug build
   script:
     - export VERSION=$(./tools/version.sh core/embed/firmware/version.h)
-    - export NAME="trezor-fw-btconly-debug-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
+    - export NAME="firmware-T2T1-btconly-debug-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
     - echo "Deploying to ${DEPLOY_DIRECTORY}/$NAME"
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
@@ -98,7 +98,7 @@ release legacy fw regular deploy:
     - legacy fw regular build
   script:
     - export VERSION=$(./tools/version.sh legacy/firmware/version.h)
-    - export NAME="trezor-fw-regular-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
+    - export NAME="firmware-T1B1-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
     - echo "Deploying to ${DEPLOY_DIRECTORY}/$NAME"
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
@@ -119,7 +119,7 @@ release legacy fw btconly deploy:
     - legacy fw btconly build
   script:
     - export VERSION=$(./tools/version.sh legacy/firmware/version.h)
-    - export NAME="trezor-fw-btconly-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
+    - export NAME="firmware-T1B1-btconly-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
     - echo "Deploying to ${DEPLOY_DIRECTORY}/$NAME"
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
@@ -140,7 +140,7 @@ release legacy fw regular debug deploy:
     - legacy fw regular debug build
   script:
     - export VERSION=$(./tools/version.sh legacy/firmware/version.h)
-    - export NAME="trezor-fw-regular-debug-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
+    - export NAME="firmware-T1B1-debug-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
     - echo "Deploying to ${DEPLOY_DIRECTORY}/$NAME"
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
@@ -161,7 +161,7 @@ release legacy fw btconly debug deploy:
     - legacy fw btconly debug build
   script:
     - export VERSION=$(./tools/version.sh legacy/firmware/version.h)
-    - export NAME="trezor-fw-btconly-debug-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
+    - export NAME="firmware-T1B1-btconly-debug-$VERSION-$CI_COMMIT_SHORT_SHA.bin"
     - echo "Deploying to ${DEPLOY_DIRECTORY}/$NAME"
     - mkdir -p "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}"
     - rsync --delete -va $NAME "${DEPLOY_BASE_DIR}/${DEPLOY_DIRECTORY}/$NAME"
@@ -188,8 +188,8 @@ release core unix debug deploy:
     - DEST="$DEPLOY_PATH/trezor-emu-core-v$VERSION"
     - DEST_ARM="$DEPLOY_PATH/arm/trezor-emu-core-v$VERSION-arm"
     - echo "Deploying to $DEST and $DEST_ARM"
-    - nix-shell -p patchelf --run "patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 core/build/unix/trezor-emu-core"
-    - nix-shell -p patchelf --run "patchelf --set-interpreter /lib/ld-linux-aarch64.so.1 core/build/unix/trezor-emu-core-arm"
+    - $NIX_SHELL -p patchelf --run "patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 core/build/unix/trezor-emu-core"
+    - $NIX_SHELL -p patchelf --run "patchelf --set-interpreter /lib/ld-linux-aarch64.so.1 core/build/unix/trezor-emu-core-arm"
     - rsync --delete -va core/build/unix/trezor-emu-core "$DEST"
     - rsync --delete -va core/build/unix/trezor-emu-core-arm "$DEST_ARM"
   only:
@@ -213,8 +213,8 @@ release legacy unix debug deploy:
     - DEST="$DEPLOY_PATH/trezor-emu-legacy-v$VERSION"
     - DEST_ARM="$DEPLOY_PATH/arm/trezor-emu-legacy-v$VERSION-arm"
     - echo "Deploying to $DEST and $DEST_ARM"
-    - nix-shell -p patchelf --run "patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 legacy/firmware/trezor.elf"
-    - nix-shell -p patchelf --run "patchelf --set-interpreter /lib/ld-linux-aarch64.so.1 legacy/firmware/trezor-arm.elf"
+    - $NIX_SHELL -p patchelf --run "patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 legacy/firmware/trezor.elf"
+    - $NIX_SHELL -p patchelf --run "patchelf --set-interpreter /lib/ld-linux-aarch64.so.1 legacy/firmware/trezor-arm.elf"
     - rsync --delete -va legacy/firmware/trezor.elf "$DEST"
     - rsync --delete -va legacy/firmware/trezor-arm.elf "$DEST_ARM"
   only:
@@ -234,6 +234,7 @@ ui tests fixtures deploy:
     GIT_SUBMODULE_STRATEGY: "none"
   before_script: []  # no poetry
   needs:
+    - core click test
     - core device test
     - legacy device test
   script:
diff --git a/ci/hardware_tests/t1_hw_test.sh b/ci/hardware_tests/t1_hw_test.sh
index 2205059ac9..66eeafe8be 100755
--- a/ci/hardware_tests/t1_hw_test.sh
+++ b/ci/hardware_tests/t1_hw_test.sh
@@ -17,5 +17,5 @@ set +a
 ./record_video.sh ${T1_CAMERA} ${CI_COMMIT_SHORT_SHA} start
 (cd ../.. && poetry install)
 poetry run python bootstrap.py t1
-poetry run python bootstrap.py t1 ../../trezor-*.bin
+poetry run python bootstrap.py t1 ../../firmware-T1*.bin
 poetry run pytest ../../tests/device_tests
diff --git a/ci/posttest.yml b/ci/posttest.yml
index afde3fe59e..3524f2a22b 100644
--- a/ci/posttest.yml
+++ b/ci/posttest.yml
@@ -13,12 +13,13 @@ core unix coverage posttest:
     COVERAGE_THRESHOLD: "78"
   <<: *gitlab_caching
   needs:
+    - core click test
     - core device test
     - core monero test
     - core u2f test
     - core fido2 test
   script:
-    - nix-shell --run "poetry run make -C core coverage"
+    - $NIX_SHELL --run "poetry run make -C core coverage"
   coverage: '/COVERAGE: \d+%/'
   artifacts:
     name: core-unix-coverage-posttest
@@ -34,11 +35,12 @@ unix ui changes:
     - master
   <<: *gitlab_caching
   needs:
+    - core click test
     - core device test
     - legacy device test
   script:
-    - nix-shell --run "cd tests/ui_tests ; poetry run python reporting/report_master_diff.py TT_ T1_"
-    - mv tests/ui_tests/reporting/reports/master_diff/ .
+    - $NIX_SHELL --run "poetry run python -m tests.ui_tests.reporting master-diff"
+    - mv tests/ui_tests/reports/master_diff .
   artifacts:
     name: core-unix-ui-changes
     paths:
diff --git a/ci/prebuild.yml b/ci/prebuild.yml
index e97215402d..7c4057c915 100644
--- a/ci/prebuild.yml
+++ b/ci/prebuild.yml
@@ -19,35 +19,28 @@ style prebuild:
     GIT_SUBMODULE_STRATEGY: "none"
   <<: *gitlab_caching
   script:
-    - nix-shell --run "poetry run make -j1 style_check"
+    - $NIX_SHELL --run "poetry run make -j1 style_check"
 
 # Check validity of coin definitions and protobuf files.
 common prebuild:
   stage: prebuild
   <<: *gitlab_caching
   script:
-    - nix-shell --run "poetry run make defs_check"
+    - $NIX_SHELL --run "poetry run make defs_check"
 
 # Check validity of auto-generated files.
 gen prebuild:
   stage: prebuild
   <<: *gitlab_caching
   script:
-    - nix-shell --run "poetry run make -j1 gen_check"
+    - $NIX_SHELL --run "poetry run make -j1 gen_check"
 
 # Checking format of .editorconfig files.
 editor prebuild:
   stage: prebuild
   <<: *gitlab_caching
   script:
-    - nix-shell --run "make editor_check"
-
-# All .yml/.yaml files are checked for syntax validity and other correctness.
-yaml prebuild:
-  stage: prebuild
-  <<: *gitlab_caching
-  script:
-    - nix-shell --run "poetry run make yaml_check"
+    - $NIX_SHELL --run "make editor_check"
 
 # Checking the format of release commit messages.
 release commit messages prebuild:
@@ -63,7 +56,7 @@ release commit messages prebuild:
       # We want this to run on gitlab.com/satoshilabs/trezor/trezor-firmware only.
       - $CI_PROJECT_PATH_SLUG == 'satoshilabs-trezor-trezor-firmware'
   script:
-    - nix-shell --run "ci/check_release_commit_messages.sh"
+    - $NIX_SHELL --run "ci/check_release_commit_messages.sh"
 
 # Verifying that all commits changing some functionality have a changelog entry
 # or contain `[no changelog]` in the commit message.
@@ -76,4 +69,4 @@ changelog prebuild:
     GIT_SUBMODULE_STRATEGY: "none"
     GIT_STRATEGY: clone
   script:
-    - nix-shell --run "ci/check_changelog.sh"
+    - $NIX_SHELL --run "ci/check_changelog.sh"
diff --git a/ci/prepare_ui_artifacts.py b/ci/prepare_ui_artifacts.py
index 0efa556a29..f5fc8f753c 100644
--- a/ci/prepare_ui_artifacts.py
+++ b/ci/prepare_ui_artifacts.py
@@ -5,24 +5,24 @@ from pathlib import Path
 ROOT = Path(__file__).resolve().parent.parent
 sys.path.insert(0, str(ROOT))
 # Needed for setup purposes, filling the FILE_HASHES dict
-from tests.ui_tests import read_fixtures  # isort:skip
+from tests.ui_tests.common import TestResult, _hash_files, get_fixtures  # isort:skip
 
-read_fixtures()
-from tests.ui_tests import _hash_files, FILE_HASHES, SCREENS_DIR  # isort:skip
 
-# As in CI we are running T1 and TT tests separately, there will
-# always be the other model missing.
-# Therefore, choosing just the cases for our model.
-if len(sys.argv) > 1 and sys.argv[1].upper() == "T1":
-    model = "T1"
-else:
-    model = "TT"
-model_file_hashes = {k: v for k, v in FILE_HASHES.items() if k.startswith(f"{model}_")}
+FIXTURES = get_fixtures()
 
-for test_case, expected_hash in model_file_hashes.items():
-    recorded_dir = SCREENS_DIR / test_case / "recorded"
-    actual_hash = _hash_files(recorded_dir)
+for result in TestResult.recent_results():
+    if not result.passed or result.expected_hash != result.actual_hash:
+        print("WARNING: skipping failed test", result.test.id)
+        continue
+
+    actual_hash = _hash_files(result.test.actual_dir)
+    expected_hash = (
+        FIXTURES.get(result.test.model, {})
+        .get(result.test.group, {})
+        .get(result.test.fixtures_name)
+    )
+    assert result.expected_hash == actual_hash
     assert expected_hash == actual_hash
     shutil.make_archive(
-        str(ROOT / "ci/ui_test_records" / actual_hash), "zip", recorded_dir
+        str(ROOT / "ci/ui_test_records" / actual_hash), "zip", result.test.actual_dir
     )
diff --git a/ci/test-hw.yml b/ci/test-hw.yml
index d4d01ef4a8..b909192b42 100644
--- a/ci/test-hw.yml
+++ b/ci/test-hw.yml
@@ -41,9 +41,9 @@ hardware core regular device test:
     - set -a
     - source hardware.cfg
     - set +a
-    - nix-shell --run "cd ../.. && poetry install"
-    - nix-shell --run "poetry run python bootstrap.py tt ../../trezor-*.bin | ts -s"
-    - nix-shell --run "poetry run pytest ../../tests/device_tests | ts -s"
+    - $NIX_SHELL --run "cd ../.. && poetry install"
+    - $NIX_SHELL --run "poetry run python bootstrap.py tt ../../firmware-T2*.bin | ts -s"
+    - $NIX_SHELL --run "poetry run pytest ../../tests/device_tests | ts -s"
   timeout: 6h
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -71,9 +71,9 @@ hardware core btconly device test:
     - set -a
     - source hardware.cfg
     - set +a
-    - nix-shell --run "cd ../.. && poetry install"
-    - nix-shell --run "poetry run python bootstrap.py tt ../../trezor-*.bin | ts -s"
-    - nix-shell --run "poetry run pytest ../../tests/device_tests | ts -s"
+    - $NIX_SHELL --run "cd ../.. && poetry install"
+    - $NIX_SHELL --run "poetry run python bootstrap.py tt ../../firmware-T2*.bin | ts -s"
+    - $NIX_SHELL --run "poetry run pytest ../../tests/device_tests | ts -s"
   timeout: 4h
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -98,9 +98,9 @@ hardware core monero test:
     - set -a
     - source hardware.cfg
     - set +a
-    - nix-shell --run "cd ../.. && poetry install"
-    - nix-shell --run "poetry run python bootstrap.py tt ../../trezor-*.bin | ts -s"
-    - nix-shell --arg fullDeps true --run "cd ../../core/tests && ./run_tests_device_emu_monero.sh $TESTOPTS | ts -s"
+    - $NIX_SHELL --run "cd ../.. && poetry install"
+    - $NIX_SHELL --run "poetry run python bootstrap.py tt ../../firmware-T2*.bin | ts -s"
+    - $NIX_SHELL --arg fullDeps true --run "cd ../../core/tests && ./run_tests_device_emu_monero.sh $TESTOPTS | ts -s"
   timeout: 1h
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -124,7 +124,7 @@ hardware legacy regular device test:
     - legacy fw regular debug build
   script:
     - cd ci/hardware_tests
-    - nix-shell --run "./t1_hw_test.sh | ts -s"
+    - $NIX_SHELL --run "./t1_hw_test.sh | ts -s"
   timeout: 1h10m
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -150,7 +150,7 @@ hardware legacy btconly device test:
     - legacy fw btconly debug build
   script:
     - cd ci/hardware_tests
-    - nix-shell --run "./t1_hw_test.sh | ts -s"
+    - $NIX_SHELL --run "./t1_hw_test.sh | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
diff --git a/ci/test.yml b/ci/test.yml
index 37cdc8dc67..b72f6cbbe5 100644
--- a/ci/test.yml
+++ b/ci/test.yml
@@ -18,7 +18,7 @@ core unit python test:
   needs:
     - core unix regular build
   script:
-    - nix-shell --run "poetry run make -C core test | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test | ts -s"
 
 # Rust unit tests.
 core unit rust test:
@@ -27,8 +27,8 @@ core unit rust test:
   needs:
     - core unix frozen debug build
   script:
-    - nix-shell --run "poetry run make -C core clippy | ts -s"
-    - nix-shell --run "poetry run make -C core test_rust | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core clippy | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_rust | ts -s"
 
 core unit asan test:
   stage: test
@@ -43,20 +43,9 @@ core unit asan test:
     ADDRESS_SANITIZER: "1"
     LSAN_OPTIONS: "suppressions=../../asan_suppressions.txt"
   script:
-    - nix-shell --run "poetry run make -C core test | ts -s"
-    - nix-shell --run "poetry run make -C core clean build_unix | ts -s"
-    - nix-shell --run "poetry run make -C core test_rust | ts -s"
-
-core unit t1 test:
-  stage: test
-  <<: *gitlab_caching
-  needs:
-    - core unix frozen btconly debug t1 build
-  variables:
-    BITCOIN_ONLY: "1"
-    TREZOR_MODEL: "1"
-  script:
-    - nix-shell --run "poetry run make -C core test_rust | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core clean build_unix | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_rust | ts -s"
 
 # Device tests for Core. Running device tests and also comparing screens
 # with the expected UI result.
@@ -70,12 +59,12 @@ core device test:
   variables:
     TREZOR_PROFILING: 1
   script:
-    - nix-shell --run "poetry run make -C core test_emu_ui | ts -s"
-    - mv core/src/.coverage core/.coverage.test_emu
+    - $NIX_SHELL --run "poetry run make -C core test_emu_ui | ts -s"
   after_script:
-    - mv tests/ui_tests/reporting/reports/test/ test_ui_report
-    - nix-shell --run "poetry run python ci/prepare_ui_artifacts.py TT | ts -s"
-    - diff tests/ui_tests/fixtures.json tests/ui_tests/fixtures.suggestion.json
+    - mv core/src/.coverage core/.coverage.test_emu
+    - mv tests/ui_tests/reports/test/ test_ui_report
+    - $NIX_SHELL --run "poetry run python ci/prepare_ui_artifacts.py | ts -s"
+    - diff -u tests/ui_tests/fixtures.json tests/ui_tests/fixtures.suggestion.json
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -101,7 +90,7 @@ core device asan test:
   variables:
     PYTEST_TIMEOUT: "600"
   script:
-    - nix-shell --run "poetry run make -C core test_emu | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_emu | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -119,7 +108,7 @@ core btconly device test:
     MICROPYTHON: "build/unix/trezor-emu-core-bitcoinonly"
     TREZOR_PYTEST_SKIP_ALTCOINS: 1
   script:
-    - nix-shell --run "poetry run make -C core test_emu | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_emu | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -142,7 +131,7 @@ core btconly device asan test:
     TREZOR_PYTEST_SKIP_ALTCOINS: 1
     PYTEST_TIMEOUT: "600"
   script:
-    - nix-shell --run "poetry run make -C core test_emu | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_emu | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -159,7 +148,7 @@ core monero test:
   variables:
     TREZOR_PROFILING: 1
   script:
-    - nix-shell --arg fullDeps true --run "poetry run make -C core test_emu_monero | ts -s"
+    - $NIX_SHELL --arg fullDeps true --run "poetry run make -C core test_emu_monero | ts -s"
     - mv core/src/.coverage core/.coverage.test_emu_monero
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -180,7 +169,7 @@ core monero asan test:
   variables:
     TREZOR_PROFILING: 1
   script:
-    - nix-shell --arg fullDeps true --run "poetry run make -C core test_emu_monero | ts -s"
+    - $NIX_SHELL --arg fullDeps true --run "poetry run make -C core test_emu_monero | ts -s"
     - mv core/src/.coverage core/.coverage.test_emu_monero
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -200,8 +189,8 @@ core u2f test:
   variables:
     TREZOR_PROFILING: 1
   script:
-    - nix-shell --run "poetry run make -C tests/fido_tests/u2f-tests-hid | ts -s"
-    - nix-shell --run "poetry run make -C core test_emu_u2f | ts -s"
+    - $NIX_SHELL --run "poetry run make -C tests/fido_tests/u2f-tests-hid | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_emu_u2f | ts -s"
     - mv core/src/.coverage core/.coverage.test_emu_u2f
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -219,8 +208,8 @@ core u2f asan test:
   only:
     - schedules  # nightly build
   script:
-    - nix-shell --run "poetry run make -C tests/fido_tests/u2f-tests-hid | ts -s"
-    - nix-shell --run "poetry run make -C core test_emu_u2f | ts -s"
+    - $NIX_SHELL --run "poetry run make -C tests/fido_tests/u2f-tests-hid | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_emu_u2f | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -238,7 +227,7 @@ core fido2 test:
     TREZOR_PROFILING: 1
   script:
     - pgrep trezor-emu-core || true
-    - nix-shell --run "poetry run make -C core test_emu_fido2 | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_emu_fido2 | ts -s"
     - pgrep trezor-emu-core || true
     - mv core/src/.coverage core/.coverage.test_emu_fido2
   artifacts:
@@ -261,7 +250,7 @@ core fido2 asan test:
     - schedules  # nightly build
   script:
     - pgrep trezor-emu-core || true
-    - nix-shell --run "poetry run make -C core test_emu_fido2 | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_emu_fido2 | ts -s"
     - pgrep trezor-emu-core || true
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -277,11 +266,22 @@ core click test:
   <<: *gitlab_caching
   needs:
     - core unix frozen debug build
+  variables:
+    TREZOR_PROFILING: 1
   script:
-    - nix-shell --run "poetry run make -C core test_emu_click | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_emu_click_ui | ts -s"
+  after_script:
+    - mv core/src/.coverage core/.coverage.test_click
+    - mv tests/ui_tests/reports/test/ test_ui_report
+    - $NIX_SHELL --run "poetry run python ci/prepare_ui_artifacts.py | ts -s"
+    - diff -u tests/ui_tests/fixtures.json tests/ui_tests/fixtures.suggestion.json
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
+      - ci/ui_test_records/
+      - test_ui_report
+      - tests/ui_tests/screens/
+      - tests/ui_tests/fixtures.suggestion.json
       - tests/trezor.log
       - tests/junit.xml
     reports:
@@ -297,7 +297,7 @@ core click asan test:
   only:
     - schedules  # nightly build
   script:
-    - nix-shell --run "poetry run make -C core test_emu_click | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_emu_click | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -318,8 +318,8 @@ core upgrade test:
   variables:
     TREZOR_UPGRADE_TEST: "core"
   script:
-    - nix-shell --run "tests/download_emulators.sh"
-    - nix-shell --run "poetry run pytest --junitxml=tests/junit.xml tests/upgrade_tests | ts -s"
+    - $NIX_SHELL --run "tests/download_emulators.sh"
+    - $NIX_SHELL --run "poetry run pytest --junitxml=tests/junit.xml tests/upgrade_tests | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -339,8 +339,8 @@ core upgrade asan test:
   variables:
     TREZOR_UPGRADE_TEST: "core"
   script:
-    - nix-shell --run "tests/download_emulators.sh"
-    - nix-shell --run "poetry run pytest --junitxml=tests/junit.xml tests/upgrade_tests | ts -s"
+    - $NIX_SHELL --run "tests/download_emulators.sh"
+    - $NIX_SHELL --run "poetry run pytest --junitxml=tests/junit.xml tests/upgrade_tests | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -357,7 +357,7 @@ core persistence test:
   needs:
     - core unix frozen debug build
   script:
-    - nix-shell --run "poetry run pytest --junitxml=tests/junit.xml tests/persistence_tests | ts -s"
+    - $NIX_SHELL --run "poetry run pytest --junitxml=tests/junit.xml tests/persistence_tests | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -375,7 +375,7 @@ core persistence asan test:
   only:
     - schedules  # nightly build
   script:
-    - nix-shell --run "poetry run pytest --junitxml=tests/junit.xml tests/persistence_tests | ts -s"
+    - $NIX_SHELL --run "poetry run pytest --junitxml=tests/junit.xml tests/persistence_tests | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -392,8 +392,8 @@ core hwi test:
     - core unix frozen debug build
   allow_failure: true
   script:
-    - nix-shell --run "git clone https://github.com/bitcoin-core/HWI.git"
-    - nix-shell --arg fullDeps true --run "cd HWI && poetry install && poetry run ./test/test_trezor.py --model_t ../core/build/unix/trezor-emu-core bitcoind"
+    - $NIX_SHELL --run "git clone https://github.com/bitcoin-core/HWI.git"
+    - $NIX_SHELL --arg fullDeps true --run "cd HWI && poetry install && poetry run ./test/test_trezor.py --model_t ../core/build/unix/trezor-emu-core bitcoind"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -420,8 +420,8 @@ crypto test:
     - ./crypto/tests/aestst
     - ./crypto/tests/test_check
     - ./crypto/tests/test_openssl 1000
-    - nix-shell --run "cd crypto && ITERS=10 poetry run pytest --junitxml=tests/junit.xml tests | ts -s"
-    - nix-shell --run "CK_TIMEOUT_MULTIPLIER=20 valgrind -q --error-exitcode=1 ./crypto/tests/test_check_noasan | ts -s"
+    - $NIX_SHELL --run "cd crypto && ITERS=10 poetry run pytest --junitxml=tests/junit.xml tests | ts -s"
+    - $NIX_SHELL --run "CK_TIMEOUT_MULTIPLIER=20 valgrind -q --error-exitcode=1 ./crypto/tests/test_check_noasan | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -442,11 +442,11 @@ legacy device test:
   variables:
     EMULATOR: "1"
   script:
-    - nix-shell --run "poetry run make -C legacy test_emu_ui | ts -s"
+    - $NIX_SHELL --run "poetry run make -C legacy test_emu_ui | ts -s"
   after_script:
-    - mv tests/ui_tests/reporting/reports/test/ test_ui_report
-    - nix-shell --run "poetry run python ci/prepare_ui_artifacts.py T1 | ts -s"
-    - diff tests/ui_tests/fixtures.json tests/ui_tests/fixtures.suggestion.json
+    - mv tests/ui_tests/reports/test/ test_ui_report
+    - $NIX_SHELL --run "poetry run python ci/prepare_ui_artifacts.py | ts -s"
+    - diff -u tests/ui_tests/fixtures.json tests/ui_tests/fixtures.suggestion.json
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -471,7 +471,7 @@ legacy asan test:
   variables:
     EMULATOR: "1"
   script:
-    - nix-shell --run "poetry run make -C legacy test_emu | ts -s"
+    - $NIX_SHELL --run "poetry run make -C legacy test_emu | ts -s"
 
 legacy btconly test:
   stage: test
@@ -483,7 +483,7 @@ legacy btconly test:
     EMULATOR_BINARY: "firmware/trezor-bitcoinonly.elf"
     TREZOR_PYTEST_SKIP_ALTCOINS: 1
   script:
-    - nix-shell --run "poetry run make -C legacy test_emu | ts -s"
+    - $NIX_SHELL --run "poetry run make -C legacy test_emu | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -505,7 +505,7 @@ legacy btconly asan test:
     EMULATOR_BINARY: "firmware/trezor-bitcoinonly.elf"
     TREZOR_PYTEST_SKIP_ALTCOINS: 1
   script:
-    - nix-shell --run "poetry run make -C legacy test_emu | ts -s"
+    - $NIX_SHELL --run "poetry run make -C legacy test_emu | ts -s"
 
 
 legacy upgrade test:
@@ -516,8 +516,8 @@ legacy upgrade test:
   variables:
     TREZOR_UPGRADE_TEST: "legacy"
   script:
-    - nix-shell --run "tests/download_emulators.sh"
-    - nix-shell --run "poetry run pytest --junitxml=tests/junit.xml tests/upgrade_tests | ts -s"
+    - $NIX_SHELL --run "tests/download_emulators.sh"
+    - $NIX_SHELL --run "poetry run pytest --junitxml=tests/junit.xml tests/upgrade_tests | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -537,8 +537,8 @@ legacy upgrade asan test:
   variables:
     TREZOR_UPGRADE_TEST: "legacy"
   script:
-    - nix-shell --run "tests/download_emulators.sh"
-    - nix-shell --run "poetry run pytest --junitxml=tests/junit.xml tests/upgrade_tests | ts -s"
+    - $NIX_SHELL --run "tests/download_emulators.sh"
+    - $NIX_SHELL --run "poetry run pytest --junitxml=tests/junit.xml tests/upgrade_tests | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -557,8 +557,8 @@ legacy hwi test:
     EMULATOR: "1"
   allow_failure: true
   script:
-    - nix-shell --run "git clone https://github.com/bitcoin-core/HWI.git"
-    - nix-shell --arg fullDeps true --run "cd HWI && poetry install && poetry run ./test/test_trezor.py --model_1 ../legacy/firmware/trezor.elf bitcoind"
+    - $NIX_SHELL --run "git clone https://github.com/bitcoin-core/HWI.git"
+    - $NIX_SHELL --arg fullDeps true --run "cd HWI && poetry install && poetry run ./test/test_trezor.py --model_1 ../legacy/firmware/trezor.elf bitcoind"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -584,14 +584,14 @@ python test:
     # See also:
     # https://github.com/NixOS/nixpkgs/blob/b00c7c2d1d905eb63c81a0917f1a94b763a7843b/pkgs/development/interpreters/python/cpython/default.nix#L103
     # https://github.com/NixOS/nixpkgs/pull/98915
-    - nix-shell --arg fullDeps true --run "unset _PYTHON_SYSCONFIGDATA_NAME && cd python && poetry run tox | ts -s"
+    - $NIX_SHELL --arg fullDeps true --run "unset _PYTHON_SYSCONFIGDATA_NAME && cd python && poetry run tox | ts -s"
 
 python support test:
   stage: test
   <<: *gitlab_caching
   needs: []
   script:
-    - nix-shell --run "poetry run make python_support_check | ts -s"
+    - $NIX_SHELL --run "poetry run make python_support_check | ts -s"
 
 
 # Storage
@@ -607,8 +607,8 @@ storage test:
   needs: []
   script:
     - unset PYTEST_TIMEOUT
-    - nix-shell --run "poetry run make -C storage/tests build | ts -s"
-    - nix-shell --run "poetry run make -C storage/tests tests_all | ts -s"
+    - $NIX_SHELL --run "poetry run make -C storage/tests build | ts -s"
+    - $NIX_SHELL --run "poetry run make -C storage/tests tests_all | ts -s"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -630,10 +630,10 @@ core unix memory profiler:
     TREZOR_MEMPERF: "1"
     PYTEST_TIMEOUT: "900"
   script:
-    - nix-shell --run "poetry run make -C core build_unix_frozen | ts -s"
-    - nix-shell --run "poetry run make -C core test_emu | ts -s"
-    - nix-shell --run "mkdir core/prof/memperf-html"
-    - nix-shell --run "poetry run core/tools/alloc.py --alloc-data=core/src/alloc_data.txt html core/prof/memperf-html"
+    - $NIX_SHELL --run "poetry run make -C core build_unix_frozen | ts -s"
+    - $NIX_SHELL --run "poetry run make -C core test_emu | ts -s"
+    - $NIX_SHELL --run "mkdir core/prof/memperf-html"
+    - $NIX_SHELL --run "poetry run core/tools/alloc.py --alloc-data=core/src/alloc_data.txt html core/prof/memperf-html"
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -647,6 +647,7 @@ core unix memory profiler:
 connect test core:
   image: ghcr.io/trezor/trezor-user-env
   stage: test
+  when: manual
   tags:
     - runner-internal
   needs:
@@ -656,10 +657,10 @@ connect test core:
   before_script:
     - cp /builds/satoshilabs/trezor/trezor-firmware/core/build/unix/trezor-emu-core /trezor-user-env/src/binaries/firmware/bin/trezor-emu-core-v2.99.99
     - chmod +x /trezor-user-env/src/binaries/firmware/bin/trezor-emu-core-v2.99.99
-    - nix-shell --run "autoPatchelf /trezor-user-env/src/binaries/firmware/bin/trezor-emu-core-v2.99.99"
+    - $NIX_SHELL --run "autoPatchelf /trezor-user-env/src/binaries/firmware/bin/trezor-emu-core-v2.99.99"
   script:
     - /trezor-user-env/run-nix.sh &
-    - nix-shell --run "tests/connect_tests/connect_tests.sh 2.99.99"
+    - $NIX_SHELL --run "tests/connect_tests/connect_tests.sh 2.99.99"
   after_script:
     - cp /trezor-user-env/logs/debugging.log trezor-user-env-debugging.log
     - cp /trezor-user-env/logs/emulator_bridge.log tenv-emulator-bridge-debugging.log
diff --git a/common/defs/blockchain_link.json b/common/defs/blockchain_link.json
index 27d21ae428..20f80bad15 100644
--- a/common/defs/blockchain_link.json
+++ b/common/defs/blockchain_link.json
@@ -143,7 +143,7 @@
   "bitcoin:SYS": {
     "type": "blockbook",
     "url": [
-      "https://sys1.bcfn.ca"
+      "https://blockbook.elint.services"
     ]
   },
   "bitcoin:TEST": {
@@ -267,7 +267,7 @@
   "misc:tADA": {
     "type": "blockfrost",
     "url": [
-      "wss://trezor-cardano-testnet.blockfrost.io"
+      "wss://trezor-cardano-preview.blockfrost.io"
     ]
   }
 }
diff --git a/common/defs/coins_details.json b/common/defs/coins_details.json
index 2cbf44f2c6..aaaec9c987 100644
--- a/common/defs/coins_details.json
+++ b/common/defs/coins_details.json
@@ -5,7 +5,7 @@
                 "Github": "https://github.com/Actinium-project/Actinium",
                 "Homepage": "https://actinium.org"
             },
-            "marketcap_usd": 170785,
+            "marketcap_usd": 180870,
             "name": "Actinium",
             "shortcut": "ACM",
             "t1_enabled": "yes",
@@ -23,7 +23,7 @@
                 "Github": "https://github.com/axerunners/axe",
                 "Homepage": "https://axerunners.com"
             },
-            "marketcap_usd": 33291,
+            "marketcap_usd": 20908,
             "name": "Axe",
             "shortcut": "AXE",
             "t1_enabled": "yes",
@@ -38,10 +38,10 @@
         },
         "bitcoin:BCH": {
             "links": {
-                "Github": "https://github.com/Bitcoin-ABC/bitcoin-abc",
+                "Github": "https://github.com/bitcoin-cash-node/bitcoin-cash-node",
                 "Homepage": "https://www.bitcoincash.org"
             },
-            "marketcap_usd": 2218852104,
+            "marketcap_usd": 2567934801,
             "name": "Bitcoin Cash",
             "shortcut": "BCH",
             "t1_enabled": "yes",
@@ -67,7 +67,7 @@
                 "Github": "https://github.com/bitcoin/bitcoin",
                 "Homepage": "https://bitcoin.org"
             },
-            "marketcap_usd": 391846686091,
+            "marketcap_usd": 451280107391,
             "name": "Bitcoin",
             "shortcut": "BTC",
             "t1_enabled": "yes",
@@ -93,7 +93,7 @@
                 "Github": "https://github.com/BTCPrivate/BitcoinPrivate",
                 "Homepage": "https://btcprivate.org"
             },
-            "marketcap_usd": 3284351,
+            "marketcap_usd": 2118991,
             "name": "Bitcoin Private",
             "shortcut": "BTCP",
             "t1_enabled": "yes",
@@ -111,7 +111,7 @@
                 "Github": "https://github.com/BTCGPU/BTCGPU",
                 "Homepage": "https://bitcoingold.org"
             },
-            "marketcap_usd": 302310527,
+            "marketcap_usd": 297235948,
             "name": "Bitcoin Gold",
             "shortcut": "BTG",
             "t1_enabled": "yes",
@@ -137,7 +137,7 @@
                 "Github": "https://github.com/LIMXTEC/BitCore",
                 "Homepage": "https://bitcore.cc"
             },
-            "marketcap_usd": 913428,
+            "marketcap_usd": 1290295,
             "name": "Bitcore",
             "shortcut": "BTX",
             "t1_enabled": "yes",
@@ -173,7 +173,7 @@
                 "Github": "https://github.com/Crowndev/crowncoin",
                 "Homepage": "https://crownplatform.com"
             },
-            "marketcap_usd": 407416,
+            "marketcap_usd": 227389,
             "name": "Crown",
             "shortcut": "CRW",
             "t1_enabled": "yes",
@@ -191,7 +191,7 @@
                 "Github": "https://github.com/dashpay/dash",
                 "Homepage": "https://www.dash.org"
             },
-            "marketcap_usd": 446460854,
+            "marketcap_usd": 801190219,
             "name": "Dash",
             "shortcut": "DASH",
             "t1_enabled": "yes",
@@ -221,7 +221,7 @@
                 "Github": "https://github.com/decred/dcrd",
                 "Homepage": "https://www.decred.org"
             },
-            "marketcap_usd": 387420904,
+            "marketcap_usd": 353035595,
             "name": "Decred",
             "shortcut": "DCR",
             "t1_enabled": "yes",
@@ -239,7 +239,7 @@
                 "Github": "https://github.com/digibyte/digibyte",
                 "Homepage": "https://digibyte.io"
             },
-            "marketcap_usd": 136437999,
+            "marketcap_usd": 180666248,
             "name": "DigiByte",
             "shortcut": "DGB",
             "t1_enabled": "yes",
@@ -261,7 +261,7 @@
                 "Github": "https://github.com/dogecoin/dogecoin",
                 "Homepage": "https://dogecoin.com"
             },
-            "marketcap_usd": 17458340960,
+            "marketcap_usd": 10815053466,
             "name": "Dogecoin",
             "shortcut": "DOGE",
             "t1_enabled": "yes",
@@ -296,7 +296,7 @@
                 "Github": "https://github.com/firoorg/firo",
                 "Homepage": "https://firo.org"
             },
-            "marketcap_usd": 25525429,
+            "marketcap_usd": 30581066,
             "name": "Firo",
             "shortcut": "FIRO",
             "t1_enabled": "yes",
@@ -354,7 +354,7 @@
                 "Github": "https://github.com/FeatherCoin/Feathercoin",
                 "Homepage": "https://feathercoin.com"
             },
-            "marketcap_usd": 1410060,
+            "marketcap_usd": 1216847,
             "name": "Feathercoin",
             "shortcut": "FTC",
             "t1_enabled": "yes",
@@ -372,7 +372,7 @@
                 "Github": "https://github.com/Groestlcoin/groestlcoin",
                 "Homepage": "https://www.groestlcoin.org"
             },
-            "marketcap_usd": 29552741,
+            "marketcap_usd": 35812118,
             "name": "Groestlcoin",
             "shortcut": "GRS",
             "t1_enabled": "yes",
@@ -390,7 +390,7 @@
                 "Github": "https://github.com/komodoplatform/komodo",
                 "Homepage": "https://komodoplatform.com"
             },
-            "marketcap_usd": 33418706,
+            "marketcap_usd": 40071524,
             "name": "Komodo",
             "shortcut": "KMD",
             "t1_enabled": "yes",
@@ -421,7 +421,7 @@
                 "Github": "https://github.com/litecoin-project/litecoin",
                 "Homepage": "https://litecoin.org"
             },
-            "marketcap_usd": 4206955984,
+            "marketcap_usd": 6827206762,
             "name": "Litecoin",
             "shortcut": "LTC",
             "t1_enabled": "yes",
@@ -447,7 +447,7 @@
                 "Github": "https://github.com/monacoinproject/monacoin",
                 "Homepage": "https://monacoin.org"
             },
-            "marketcap_usd": 29037582,
+            "marketcap_usd": 32996960,
             "name": "Monacoin",
             "shortcut": "MONA",
             "t1_enabled": "yes",
@@ -483,7 +483,7 @@
                 "Github": "https://github.com/namecoin/namecoin-core",
                 "Homepage": "https://namecoin.org"
             },
-            "marketcap_usd": 16485813,
+            "marketcap_usd": 18207166,
             "name": "Namecoin",
             "shortcut": "NMC",
             "t1_enabled": "yes",
@@ -505,7 +505,7 @@
                 "Github": "https://github.com/peercoin/peercoin",
                 "Homepage": "https://peercoin.net"
             },
-            "marketcap_usd": 13096518,
+            "marketcap_usd": 12956306,
             "name": "Peercoin",
             "shortcut": "PPC",
             "t1_enabled": "yes",
@@ -518,7 +518,7 @@
                 "Github": "https://github.com/qtumproject/qtum",
                 "Homepage": "https://qtum.org"
             },
-            "marketcap_usd": 294077696,
+            "marketcap_usd": 349944403,
             "name": "Qtum",
             "shortcut": "QTUM",
             "t1_enabled": "yes",
@@ -536,7 +536,7 @@
                 "Github": "https://github.com/RitoProject",
                 "Homepage": "https://ritocoin.org"
             },
-            "marketcap_usd": 70012,
+            "marketcap_usd": 41504,
             "name": "Ritocoin",
             "shortcut": "RITO",
             "t1_enabled": "yes",
@@ -554,7 +554,7 @@
                 "Github": "https://github.com/RavenProject/Ravencoin",
                 "Homepage": "https://ravencoin.org"
             },
-            "marketcap_usd": 358925468,
+            "marketcap_usd": 364652876,
             "name": "Ravencoin",
             "shortcut": "RVN",
             "t1_enabled": "yes",
@@ -576,7 +576,7 @@
                 "Github": "https://github.com/SmartCash/Core-Smart",
                 "Homepage": "https://smartcash.cc"
             },
-            "marketcap_usd": 574145,
+            "marketcap_usd": 831180,
             "name": "SmartCash",
             "shortcut": "SMART",
             "t1_enabled": "yes",
@@ -594,7 +594,7 @@
                 "Github": "https://github.com/syscoin/syscoin",
                 "Homepage": "https://syscoin.org"
             },
-            "marketcap_usd": 99537142,
+            "marketcap_usd": 135689538,
             "name": "Syscoin",
             "shortcut": "SYS",
             "t1_enabled": "yes",
@@ -630,7 +630,7 @@
                 "Github": "https://github.com/viacoin",
                 "Homepage": "https://viacoin.org"
             },
-            "marketcap_usd": 5676717,
+            "marketcap_usd": 1208142,
             "name": "Viacoin",
             "shortcut": "VIA",
             "t1_enabled": "yes",
@@ -666,7 +666,7 @@
                 "Github": "https://github.com/vertcoin-project/vertcoin-core",
                 "Homepage": "https://vertcoin.org"
             },
-            "marketcap_usd": 11830934,
+            "marketcap_usd": 10390580,
             "name": "Vertcoin",
             "shortcut": "VTC",
             "t1_enabled": "yes",
@@ -684,7 +684,7 @@
                 "Github": "https://github.com/primecoin/primecoin",
                 "Homepage": "https://primecoin.io"
             },
-            "marketcap_usd": 1591653,
+            "marketcap_usd": 1320490,
             "name": "Primecoin",
             "shortcut": "XPM",
             "t1_enabled": "yes",
@@ -702,7 +702,7 @@
                 "Github": "https://gitlab.com/bitcoinrh/BRhodiumNode",
                 "Homepage": "https://xrhodium.org"
             },
-            "marketcap_usd": 292390,
+            "marketcap_usd": 162003,
             "name": "xRhodium",
             "shortcut": "XRC",
             "t1_enabled": "yes",
@@ -738,7 +738,7 @@
                 "Github": "https://github.com/vergecurrency/VERGE",
                 "Homepage": "https://vergecurrency.com"
             },
-            "marketcap_usd": 51864312,
+            "marketcap_usd": 55431549,
             "name": "Verge",
             "shortcut": "XVG",
             "t1_enabled": "yes",
@@ -756,7 +756,7 @@
                 "Github": "https://github.com/zcore-coin/zcore-2.0",
                 "Homepage": "https://zcore.cash"
             },
-            "marketcap_usd": 50663,
+            "marketcap_usd": 43805,
             "name": "ZCore",
             "shortcut": "ZCR",
             "t1_enabled": "yes",
@@ -774,7 +774,7 @@
                 "Github": "https://github.com/zcash/zcash",
                 "Homepage": "https://z.cash"
             },
-            "marketcap_usd": 782825397,
+            "marketcap_usd": 719562172,
             "name": "Zcash",
             "shortcut": "ZEC",
             "t1_enabled": "yes",
@@ -791,16 +791,15 @@
                 }
             ]
         },
-        "erc20:avax:AVAX": {
-            "address": "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7",
+        "erc20:avax:USDT": {
+            "address": "0xde3A24028580884448a5397872046a019649b084",
             "links": {
-                "Github": "https://github.com/ava-labs",
-                "Homepage": "https://www.avalabs.org"
+                "Homepage": "https://tether.to/"
             },
             "marketcap_usd": 0,
-            "name": "Avalanche",
+            "name": "Tether",
             "network": "avax",
-            "shortcut": "AVAX",
+            "shortcut": "USDT",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "erc20",
@@ -815,15 +814,16 @@
                 }
             ]
         },
-        "erc20:avax:USDT": {
-            "address": "0xde3A24028580884448a5397872046a019649b084",
+        "erc20:avax:WAVAX": {
+            "address": "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7",
             "links": {
-                "Homepage": "https://tether.to/"
+                "Github": "https://github.com/ava-labs",
+                "Homepage": "https://www.avalabs.org"
             },
             "marketcap_usd": 0,
-            "name": "Tether",
+            "name": "Avalanche",
             "network": "avax",
-            "shortcut": "USDT",
+            "shortcut": "WAVAX",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "erc20",
@@ -959,7 +959,7 @@
             "links": {
                 "Homepage": "https://0xbitcoin.org/"
             },
-            "marketcap_usd": 1555936,
+            "marketcap_usd": 1723091,
             "name": "0xBitcoin",
             "network": "eth",
             "shortcut": "0xBTC",
@@ -1017,7 +1017,7 @@
             "links": {
                 "Homepage": "https://ico.1worldonline.com"
             },
-            "marketcap_usd": 3759768,
+            "marketcap_usd": 0,
             "name": "1World",
             "network": "eth",
             "shortcut": "1WO",
@@ -1095,7 +1095,7 @@
                 "Github": "https://github.com/crypt04dvisor/AlphaWallet",
                 "Homepage": "https://alphaplatform.co/"
             },
-            "marketcap_usd": 276496,
+            "marketcap_usd": 139356,
             "name": "Alpha",
             "network": "eth",
             "shortcut": "A",
@@ -1115,7 +1115,7 @@
                 "Github": "https://github.com/aave",
                 "Homepage": "https://aave.com/ "
             },
-            "marketcap_usd": 1161930750,
+            "marketcap_usd": 1111722344,
             "name": "Aave",
             "network": "eth",
             "shortcut": "AAVE",
@@ -1194,7 +1194,7 @@
             "links": {
                 "Homepage": "https://www.arcblock.io"
             },
-            "marketcap_usd": 11566295,
+            "marketcap_usd": 14156469,
             "name": "ArcBlock Token",
             "network": "eth",
             "shortcut": "ABT",
@@ -1214,7 +1214,7 @@
                 "Github": "https://github.com/theabyssportal",
                 "Homepage": "https://www.theabyss.com"
             },
-            "marketcap_usd": 3732542,
+            "marketcap_usd": 3473031,
             "name": "Abyss Token",
             "network": "eth",
             "shortcut": "ABYSS",
@@ -1271,7 +1271,7 @@
             "links": {
                 "Homepage": "https://adbank.network"
             },
-            "marketcap_usd": 467096,
+            "marketcap_usd": 928468,
             "name": "adbank",
             "network": "eth",
             "shortcut": "ADB",
@@ -1350,7 +1350,7 @@
                 "Github": "https://github.com/aditus",
                 "Homepage": "https://aditus.net"
             },
-            "marketcap_usd": 49258,
+            "marketcap_usd": 52124,
             "name": "Aditus",
             "network": "eth",
             "shortcut": "ADI",
@@ -1423,26 +1423,6 @@
                 }
             ]
         },
-        "erc20:eth:ADX": {
-            "address": "0xADE00C28244d5CE17D72E40330B1c318cD12B7c3",
-            "links": {
-                "Github": "https://github.com/AdExNetwork",
-                "Homepage": "https://www.adex.network"
-            },
-            "marketcap_usd": 23515621,
-            "name": "AdEx Network",
-            "network": "eth",
-            "shortcut": "ADX",
-            "t1_enabled": "yes",
-            "t2_enabled": "yes",
-            "type": "erc20",
-            "wallet": [
-                {
-                    "name": "Trezor Suite",
-                    "url": "https://suite.trezor.io"
-                }
-            ]
-        },
         "erc20:eth:ADX-LOYALTY": {
             "address": "0xd9A4cB9dc9296e111c66dFACAb8Be034EE2E1c2C",
             "links": {
@@ -1463,26 +1443,6 @@
                 }
             ]
         },
-        "erc20:eth:ADXL": {
-            "address": "0x4470BB87d77b963A013DB939BE332f927f2b992e",
-            "links": {
-                "Github": "https://github.com/AdExNetwork",
-                "Homepage": "https://www.adex.network"
-            },
-            "marketcap_usd": 0,
-            "name": "AdEx Network (legacy)",
-            "network": "eth",
-            "shortcut": "ADXL",
-            "t1_enabled": "yes",
-            "t2_enabled": "yes",
-            "type": "erc20",
-            "wallet": [
-                {
-                    "name": "Trezor Suite",
-                    "url": "https://suite.trezor.io"
-                }
-            ]
-        },
         "erc20:eth:AE": {
             "address": "0x5CA9a71B1d01849C0a95490Cc00559717fCF0D1d",
             "links": {
@@ -1569,7 +1529,7 @@
                 "Github": "https://github.com/IDNI",
                 "Homepage": "https://tau.net/"
             },
-            "marketcap_usd": 3172747,
+            "marketcap_usd": 6463799,
             "name": "Agoras: Currency of Tau",
             "network": "eth",
             "shortcut": "AGRS",
@@ -1627,7 +1587,7 @@
             "links": {
                 "Homepage": "https://www.aidcoin.co"
             },
-            "marketcap_usd": 169103,
+            "marketcap_usd": 296328,
             "name": "AidCoin",
             "network": "eth",
             "shortcut": "AID",
@@ -1686,7 +1646,7 @@
                 "Github": "https://github.com/AigangNetwork",
                 "Homepage": "https://aigang.network/"
             },
-            "marketcap_usd": 10160,
+            "marketcap_usd": 2866,
             "name": "Aigang",
             "network": "eth",
             "shortcut": "AIX",
@@ -1745,7 +1705,7 @@
                 "Github": "https://github.com/aleph-im/",
                 "Homepage": "https://aleph.im"
             },
-            "marketcap_usd": 24352266,
+            "marketcap_usd": 17910289,
             "name": "Aleph.im",
             "network": "eth",
             "shortcut": "ALEPH",
@@ -1922,7 +1882,7 @@
                 "Github": "https://github.com/amlt-by-coinfirm",
                 "Homepage": "https://amlt.coinfirm.io/"
             },
-            "marketcap_usd": 1048846,
+            "marketcap_usd": 1874483,
             "name": "AMLT",
             "network": "eth",
             "shortcut": "AMLT",
@@ -1942,7 +1902,7 @@
                 "Github": "https://github.com/amontech",
                 "Homepage": "https://amon.tech"
             },
-            "marketcap_usd": 112369,
+            "marketcap_usd": 227037,
             "name": "Amon",
             "network": "eth",
             "shortcut": "AMN",
@@ -1962,7 +1922,7 @@
                 "Github": "https://github.com/AMO-Project/",
                 "Homepage": "https://amo.foundation"
             },
-            "marketcap_usd": 19117921,
+            "marketcap_usd": 15060121,
             "name": "AMO Coin",
             "network": "eth",
             "shortcut": "AMO",
@@ -1981,7 +1941,7 @@
             "links": {
                 "Homepage": "https://ados.foundation/"
             },
-            "marketcap_usd": 362721,
+            "marketcap_usd": 709645,
             "name": "Token AmonD",
             "network": "eth",
             "shortcut": "AMON",
@@ -2001,7 +1961,7 @@
                 "Github": "https://github.com/amptoken",
                 "Homepage": "https://amptoken.org"
             },
-            "marketcap_usd": 203029513,
+            "marketcap_usd": 238924137,
             "name": "Amp",
             "network": "eth",
             "shortcut": "AMP",
@@ -2021,7 +1981,7 @@
                 "Github": "https://github.com/ampleforth",
                 "Homepage": "https://ampleforth.org"
             },
-            "marketcap_usd": 51073131,
+            "marketcap_usd": 46578948,
             "name": "Ampleforth",
             "network": "eth",
             "shortcut": "AMPL",
@@ -2099,7 +2059,7 @@
             "links": {
                 "Homepage": "https://www.aurorachain.io"
             },
-            "marketcap_usd": 2226265,
+            "marketcap_usd": 2078947,
             "name": "Aurora",
             "network": "eth",
             "shortcut": "AOA",
@@ -2119,7 +2079,7 @@
                 "Github": "https://github.com/api3dao",
                 "Homepage": "https://api3.org/"
             },
-            "marketcap_usd": 100290169,
+            "marketcap_usd": 124100419,
             "name": "API3",
             "network": "eth",
             "shortcut": "API3",
@@ -2198,7 +2158,7 @@
                 "Github": "https://github.com/alphaquark/Alpha-Quark",
                 "Homepage": "https://www.alphaquark.io"
             },
-            "marketcap_usd": 28613935,
+            "marketcap_usd": 33804550,
             "name": "AlphaQuarkToken",
             "network": "eth",
             "shortcut": "AQT",
@@ -2237,7 +2197,7 @@
             "links": {
                 "Homepage": "https://www.arbitragect.com"
             },
-            "marketcap_usd": 21363,
+            "marketcap_usd": 48931,
             "name": "ArbitrageCT",
             "network": "eth",
             "shortcut": "ARCT",
@@ -2316,7 +2276,7 @@
                 "Github": "https://github.com/aeronaero/aeron",
                 "Homepage": "https://aeron.aero"
             },
-            "marketcap_usd": 366,
+            "marketcap_usd": 95,
             "name": "Aeron",
             "network": "eth",
             "shortcut": "ARNX",
@@ -2335,7 +2295,7 @@
             "links": {
                 "Homepage": "http://www.maecenas.co"
             },
-            "marketcap_usd": 44657,
+            "marketcap_usd": 41649,
             "name": "Maecenas",
             "network": "eth",
             "shortcut": "ART",
@@ -2413,7 +2373,7 @@
             "links": {
                 "Homepage": "https://airswap.io"
             },
-            "marketcap_usd": 22471693,
+            "marketcap_usd": 19734634,
             "name": "Airswap",
             "network": "eth",
             "shortcut": "AST",
@@ -2452,7 +2412,7 @@
             "links": {
                 "Homepage": "https://atlant.io"
             },
-            "marketcap_usd": 598005,
+            "marketcap_usd": 638027,
             "name": "ATLANT",
             "network": "eth",
             "shortcut": "ATL",
@@ -2568,7 +2528,7 @@
             "links": {
                 "Homepage": "https://auctus.org"
             },
-            "marketcap_usd": 113891,
+            "marketcap_usd": 141310,
             "name": "Auctus",
             "network": "eth",
             "shortcut": "AUC",
@@ -2588,7 +2548,7 @@
                 "Github": "https://github.com/audiusproject",
                 "Homepage": "https://audius.co"
             },
-            "marketcap_usd": 184541037,
+            "marketcap_usd": 323841415,
             "name": "Audius",
             "network": "eth",
             "shortcut": "AUDIO",
@@ -2685,7 +2645,7 @@
             "links": {
                 "Homepage": "https://aventus.io"
             },
-            "marketcap_usd": 9322687,
+            "marketcap_usd": 7052932,
             "name": "Aventus",
             "network": "eth",
             "shortcut": "AVT",
@@ -2784,7 +2744,7 @@
                 "Github": "https://github.com/axieinfinity",
                 "Homepage": "https://axieinfinity.com/"
             },
-            "marketcap_usd": 841323253,
+            "marketcap_usd": 1098056194,
             "name": "Axie Infinity Shards",
             "network": "eth",
             "shortcut": "AXS",
@@ -2843,7 +2803,7 @@
                 "Github": "https://github.com/balancer-labs",
                 "Homepage": "https://balancer.finance"
             },
-            "marketcap_usd": 296900138,
+            "marketcap_usd": 329982207,
             "name": "Balancer",
             "network": "eth",
             "shortcut": "BAL",
@@ -2902,7 +2862,7 @@
             "links": {
                 "Homepage": "https://www.banca.world"
             },
-            "marketcap_usd": 260806,
+            "marketcap_usd": 152329,
             "name": "Banca",
             "network": "eth",
             "shortcut": "BANCA",
@@ -2960,7 +2920,7 @@
             "links": {
                 "Homepage": "https://basicattentiontoken.org"
             },
-            "marketcap_usd": 481787663,
+            "marketcap_usd": 442713735,
             "name": "Basic Attention Token",
             "network": "eth",
             "shortcut": "BAT",
@@ -3154,7 +3114,7 @@
                 "Github": "https://github.com/VinceBCD/BCDiploma",
                 "Homepage": "https://www.bcdiploma.com"
             },
-            "marketcap_usd": 2752949,
+            "marketcap_usd": 2474009,
             "name": "Blockchain Certified Data Token",
             "network": "eth",
             "shortcut": "BCDT",
@@ -3212,7 +3172,7 @@
                 "Github": "https://github.com/blockmason",
                 "Homepage": "https://blockmason.io"
             },
-            "marketcap_usd": 296795,
+            "marketcap_usd": 285234,
             "name": "BlockMason Credit Protocol Token",
             "network": "eth",
             "shortcut": "BCPT",
@@ -3232,7 +3192,7 @@
                 "Github": "https://github.com/bitcv",
                 "Homepage": "https://bitcv.one/"
             },
-            "marketcap_usd": 135719,
+            "marketcap_usd": 0,
             "name": "BitCapitalVendor Token",
             "network": "eth",
             "shortcut": "BCV",
@@ -3331,7 +3291,7 @@
                 "Github": "https://github.com/Rentberry",
                 "Homepage": "https://rentberry.com"
             },
-            "marketcap_usd": 88451,
+            "marketcap_usd": 107070,
             "name": "Berry",
             "network": "eth",
             "shortcut": "BERRY",
@@ -3429,7 +3389,7 @@
             "links": {
                 "Homepage": "https://bnktothefuture.com"
             },
-            "marketcap_usd": 5865681,
+            "marketcap_usd": 3387108,
             "name": "BnkToTheFuture",
             "network": "eth",
             "shortcut": "BFT",
@@ -3701,7 +3661,7 @@
                 "Github": "https://github.com/hellobloom",
                 "Homepage": "https://hellobloom.io"
             },
-            "marketcap_usd": 1697321,
+            "marketcap_usd": 3006871,
             "name": "Bloom",
             "network": "eth",
             "shortcut": "BLT",
@@ -3721,7 +3681,7 @@
                 "Github": "https://github.com/BlueCrypto",
                 "Homepage": "https://blueprotocol.com/"
             },
-            "marketcap_usd": 184442,
+            "marketcap_usd": 234732,
             "name": "Ethereum Blue",
             "network": "eth",
             "shortcut": "BLUE",
@@ -3779,7 +3739,7 @@
             "links": {
                 "Homepage": "https://bluzelle.com"
             },
-            "marketcap_usd": 25431290,
+            "marketcap_usd": 40249218,
             "name": "Bluzelle",
             "network": "eth",
             "shortcut": "BLZ",
@@ -3818,7 +3778,7 @@
             "links": {
                 "Homepage": "https://www.bitmart.com"
             },
-            "marketcap_usd": 25357237,
+            "marketcap_usd": 18049390,
             "name": "BitMart Token",
             "network": "eth",
             "shortcut": "BMX",
@@ -3837,7 +3797,7 @@
             "links": {
                 "Homepage": "https://www.binance.com"
             },
-            "marketcap_usd": 51094687147,
+            "marketcap_usd": 0,
             "name": "Binance Coin",
             "network": "eth",
             "shortcut": "BNB",
@@ -3896,7 +3856,7 @@
                 "Github": "https://github.com/bancorprotocol",
                 "Homepage": "https://www.bancor.network"
             },
-            "marketcap_usd": 92685313,
+            "marketcap_usd": 74533517,
             "name": "Bancor Network Token",
             "network": "eth",
             "shortcut": "BNT",
@@ -3915,7 +3875,7 @@
             "links": {
                 "Homepage": "https://bounty0x.io"
             },
-            "marketcap_usd": 219819,
+            "marketcap_usd": 148222,
             "name": "Bounty0x Token",
             "network": "eth",
             "shortcut": "BNTY",
@@ -3934,7 +3894,7 @@
             "links": {
                 "Homepage": "https://bobsrepair.com"
             },
-            "marketcap_usd": 320390,
+            "marketcap_usd": 710785,
             "name": "Bob's repair",
             "network": "eth",
             "shortcut": "BOB",
@@ -4011,7 +3971,7 @@
             "links": {
                 "Homepage": "https://bonpay.com"
             },
-            "marketcap_usd": 6913,
+            "marketcap_usd": 7918,
             "name": "Bonpay",
             "network": "eth",
             "shortcut": "BON",
@@ -4068,7 +4028,7 @@
             "links": {
                 "Homepage": "https://www.bouts.pro"
             },
-            "marketcap_usd": 16672,
+            "marketcap_usd": 13777,
             "name": "BoutsPro",
             "network": "eth",
             "shortcut": "BOUTS",
@@ -4185,7 +4145,7 @@
                 "Github": "https://github.com/breadwallet",
                 "Homepage": "https://token.breadapp.com/en"
             },
-            "marketcap_usd": 818082,
+            "marketcap_usd": 544089,
             "name": "Bread",
             "network": "eth",
             "shortcut": "BRD",
@@ -4517,7 +4477,7 @@
             "links": {
                 "Homepage": "https://www.bottos.org"
             },
-            "marketcap_usd": 273933,
+            "marketcap_usd": 464164,
             "name": "Bottos",
             "network": "eth",
             "shortcut": "BTO",
@@ -4654,7 +4614,7 @@
                 "Github": "https://github.com/paxosglobal/busd-contract",
                 "Homepage": "https://www.paxos.com/busd"
             },
-            "marketcap_usd": 21655558969,
+            "marketcap_usd": 10638728787,
             "name": "Binance USD (BUSD)",
             "network": "eth",
             "shortcut": "BUSD",
@@ -4731,7 +4691,7 @@
             "links": {
                 "Homepage": "https://bezant.io"
             },
-            "marketcap_usd": 342268,
+            "marketcap_usd": 328936,
             "name": "Bezant",
             "network": "eth",
             "shortcut": "BZNT",
@@ -4771,7 +4731,7 @@
                 "Github": "https://github.com/cryptotwenty",
                 "Homepage": "https://crypto20.com"
             },
-            "marketcap_usd": 1369992,
+            "marketcap_usd": 1040095,
             "name": "Crypto20's Token",
             "network": "eth",
             "shortcut": "C20",
@@ -4829,7 +4789,7 @@
                 "Github": "https://github.com/Global-Crypto-Alliance/call-token",
                 "Homepage": "https://gcalliance.io"
             },
-            "marketcap_usd": 95664,
+            "marketcap_usd": 0,
             "name": "CALL token",
             "network": "eth",
             "shortcut": "CALL",
@@ -4943,7 +4903,7 @@
             "links": {
                 "Homepage": "https://coin.cashbet.com"
             },
-            "marketcap_usd": 1382293,
+            "marketcap_usd": 1412688,
             "name": "CashBet Coin",
             "network": "eth",
             "shortcut": "CBC",
@@ -5059,7 +5019,7 @@
             "links": {
                 "Homepage": "https://ccore.io"
             },
-            "marketcap_usd": 14839,
+            "marketcap_usd": 15877,
             "name": "Ccore",
             "network": "eth",
             "shortcut": "CCO",
@@ -5117,7 +5077,7 @@
             "links": {
                 "Homepage": "https://www.ceek.com/"
             },
-            "marketcap_usd": 109692246,
+            "marketcap_usd": 85892279,
             "name": "CEEK VR Token",
             "network": "eth",
             "shortcut": "CEEK",
@@ -5137,7 +5097,7 @@
                 "Github": "https://github.com/celer-network",
                 "Homepage": "https://www.celer.network/"
             },
-            "marketcap_usd": 101777758,
+            "marketcap_usd": 145988517,
             "name": "CelerToken",
             "network": "eth",
             "shortcut": "CELR",
@@ -5176,7 +5136,7 @@
             "links": {
                 "Homepage": "https://www.centrality.ai"
             },
-            "marketcap_usd": 25642589,
+            "marketcap_usd": 20808822,
             "name": "Centrality",
             "network": "eth",
             "shortcut": "CENNZ",
@@ -5274,7 +5234,7 @@
                 "Github": "https://github.com/cache-token/cache-contract",
                 "Homepage": "https://cache.gold"
             },
-            "marketcap_usd": 3672269,
+            "marketcap_usd": 2889849,
             "name": "CACHE Gold",
             "network": "eth",
             "shortcut": "CGT",
@@ -5332,7 +5292,7 @@
             "links": {
                 "Homepage": "https://swissborg.com"
             },
-            "marketcap_usd": 236704686,
+            "marketcap_usd": 214599152,
             "name": "SwissBorg",
             "network": "eth",
             "shortcut": "CHSB",
@@ -5371,7 +5331,7 @@
                 "Github": "https://github.com/CivilizationCIV",
                 "Homepage": "https://civfund.org"
             },
-            "marketcap_usd": 7556958,
+            "marketcap_usd": 9218468,
             "name": "Civilization",
             "network": "eth",
             "shortcut": "CIV",
@@ -5546,7 +5506,7 @@
             "links": {
                 "Homepage": "https://coinloan.io"
             },
-            "marketcap_usd": 30997570,
+            "marketcap_usd": 0,
             "name": "CoinLoan",
             "network": "eth",
             "shortcut": "CLT",
@@ -5622,7 +5582,7 @@
             "links": {
                 "Homepage": "https://app.coinmerge.io/"
             },
-            "marketcap_usd": 1398993,
+            "marketcap_usd": 0,
             "name": "Coin Merge",
             "network": "eth",
             "shortcut": "CMERGE",
@@ -5660,7 +5620,7 @@
             "links": {
                 "Homepage": "https://cindicator.com"
             },
-            "marketcap_usd": 1186005,
+            "marketcap_usd": 2370802,
             "name": "Cindicator",
             "network": "eth",
             "shortcut": "CND",
@@ -5679,7 +5639,7 @@
             "links": {
                 "Homepage": "https://cnntoken.io"
             },
-            "marketcap_usd": 129880,
+            "marketcap_usd": 0,
             "name": "Content Neutrality Network",
             "network": "eth",
             "shortcut": "CNN",
@@ -5738,7 +5698,7 @@
                 "Github": "https://github.com/cobinhood",
                 "Homepage": "https://cobinhood.com"
             },
-            "marketcap_usd": 83896,
+            "marketcap_usd": 96081,
             "name": "Cobinhood Token",
             "network": "eth",
             "shortcut": "COB",
@@ -5778,7 +5738,7 @@
                 "Github": "https://github.com/coinfi",
                 "Homepage": "https://www.coinfi.com"
             },
-            "marketcap_usd": 367774,
+            "marketcap_usd": 376891,
             "name": "CoinFi Token",
             "network": "eth",
             "shortcut": "COFI",
@@ -5818,7 +5778,7 @@
                 "Github": "https://github.com/compound-finance",
                 "Homepage": "https://compound.finance"
             },
-            "marketcap_usd": 340322043,
+            "marketcap_usd": 361396714,
             "name": "Compound",
             "network": "eth",
             "shortcut": "COMP",
@@ -5876,7 +5836,7 @@
                 "Github": "https://github.com/coti-io",
                 "Homepage": "https://coti.io"
             },
-            "marketcap_usd": 109304001,
+            "marketcap_usd": 101905846,
             "name": "COTI",
             "network": "eth",
             "shortcut": "COTI",
@@ -5953,7 +5913,7 @@
             "links": {
                 "Homepage": "http://www.cpchain.io"
             },
-            "marketcap_usd": 1017265,
+            "marketcap_usd": 1798478,
             "name": "CPChain",
             "network": "eth",
             "shortcut": "CPC",
@@ -6206,7 +6166,7 @@
             "links": {
                 "Homepage": "https://credits.com/en"
             },
-            "marketcap_usd": 821955,
+            "marketcap_usd": 1464121,
             "name": "Credits",
             "network": "eth",
             "shortcut": "CS",
@@ -6324,7 +6284,7 @@
                 "Github": "https://github.com/cartesi",
                 "Homepage": "https://cartesi.io"
             },
-            "marketcap_usd": 86108834,
+            "marketcap_usd": 108034607,
             "name": "Cartesi Token",
             "network": "eth",
             "shortcut": "CTSI",
@@ -6420,7 +6380,7 @@
             "links": {
                 "Homepage": "https://www.civic.com"
             },
-            "marketcap_usd": 119866737,
+            "marketcap_usd": 118856816,
             "name": "Civic",
             "network": "eth",
             "shortcut": "CVC",
@@ -6459,7 +6419,7 @@
             "links": {
                 "Homepage": "http://www.cybervein.org"
             },
-            "marketcap_usd": 1471294,
+            "marketcap_usd": 1632453,
             "name": "CyberVein",
             "network": "eth",
             "shortcut": "CVT",
@@ -6557,7 +6517,7 @@
             "links": {
                 "Homepage": "https://cybermusic.io"
             },
-            "marketcap_usd": 123113,
+            "marketcap_usd": 252201,
             "name": "CyberMusic",
             "network": "eth",
             "shortcut": "CYMT",
@@ -6693,7 +6653,7 @@
                 "Github": "https://github.com/makerdao",
                 "Homepage": "https://makerdao.com"
             },
-            "marketcap_usd": 6114390089,
+            "marketcap_usd": 5224409492,
             "name": "Dai Stablecoin v2.0",
             "network": "eth",
             "shortcut": "DAI",
@@ -6765,6 +6725,26 @@
                 }
             ]
         },
+        "erc20:eth:DATA": {
+            "address": "0x8f693ca8D21b157107184d29D398A8D082b38b76",
+            "links": {
+                "Github": "https://github.com/streamr-dev",
+                "Homepage": "https://streamr.network/"
+            },
+            "marketcap_usd": 31983242,
+            "name": "Streamr (DATA)",
+            "network": "eth",
+            "shortcut": "DATA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:DATABroker": {
             "address": "0x1B5f21ee98eed48d292e8e2d3Ed82b40a9728A22",
             "links": {
@@ -6810,7 +6790,7 @@
                 "Github": "https://github.com/DAVFoundation",
                 "Homepage": "https://dav.network/"
             },
-            "marketcap_usd": 1455080,
+            "marketcap_usd": 713066,
             "name": "DAV Token",
             "network": "eth",
             "shortcut": "DAV",
@@ -6829,7 +6809,7 @@
             "links": {
                 "Homepage": "https://www.daex.io"
             },
-            "marketcap_usd": 1067349,
+            "marketcap_usd": 2068186,
             "name": "DAEX",
             "network": "eth",
             "shortcut": "DAX",
@@ -6868,7 +6848,7 @@
                 "Github": "https://github.com/chronologic",
                 "Homepage": "https://chronologic.network"
             },
-            "marketcap_usd": 28050,
+            "marketcap_usd": 0,
             "name": "ChronoLogic DAY",
             "network": "eth",
             "shortcut": "DAY",
@@ -6887,7 +6867,7 @@
             "links": {
                 "Homepage": "https://www.decent.bet"
             },
-            "marketcap_usd": 38505,
+            "marketcap_usd": 61736,
             "name": "DecentBet",
             "network": "eth",
             "shortcut": "DBET",
@@ -6986,7 +6966,7 @@
                 "Github": "https://github.com/Dentacoin",
                 "Homepage": "https://dentacoin.com"
             },
-            "marketcap_usd": 1652451,
+            "marketcap_usd": 1239469,
             "name": "Dentacoin",
             "network": "eth",
             "shortcut": "DCN",
@@ -7083,7 +7063,7 @@
             "links": {
                 "Homepage": "https://www.dentwireless.com"
             },
-            "marketcap_usd": 83547899,
+            "marketcap_usd": 116975263,
             "name": "DENT",
             "network": "eth",
             "shortcut": "DENT",
@@ -7141,7 +7121,7 @@
                 "Github": "https://github.com/dforcenetwork",
                 "Homepage": "https://dforce.network"
             },
-            "marketcap_usd": 20134820,
+            "marketcap_usd": 23334461,
             "name": "dForce Platform Token",
             "network": "eth",
             "shortcut": "DF",
@@ -7160,7 +7140,7 @@
             "links": {
                 "Homepage": "https://digix.global/"
             },
-            "marketcap_usd": 11955948,
+            "marketcap_usd": 8201143,
             "name": "Digix DAO",
             "network": "eth",
             "shortcut": "DGD",
@@ -7220,7 +7200,7 @@
                 "Github": "https://github.com/DigixGlobal",
                 "Homepage": "https://digix.global"
             },
-            "marketcap_usd": 2070563,
+            "marketcap_usd": 2548238,
             "name": "Digix Gold Token",
             "network": "eth",
             "shortcut": "DGX",
@@ -7298,7 +7278,7 @@
             "links": {
                 "Homepage": "https://inmediate.io"
             },
-            "marketcap_usd": 330096,
+            "marketcap_usd": 0,
             "name": "Digital Insurance Token",
             "network": "eth",
             "shortcut": "DIT",
@@ -7336,7 +7316,7 @@
             "links": {
                 "Homepage": "https://www.agrello.org"
             },
-            "marketcap_usd": 105387,
+            "marketcap_usd": 135781,
             "name": "Agrello",
             "network": "eth",
             "shortcut": "DLT",
@@ -7356,7 +7336,7 @@
                 "Github": "https://github.com/suntechsoft/dmarket-smartcontract",
                 "Homepage": "https://dmarket.com"
             },
-            "marketcap_usd": 395055,
+            "marketcap_usd": 399206,
             "name": "DMarket Token",
             "network": "eth",
             "shortcut": "DMT",
@@ -7395,7 +7375,7 @@
                 "Github": "https://github.com/district0x",
                 "Homepage": "https://district0x.io"
             },
-            "marketcap_usd": 16254401,
+            "marketcap_usd": 21489851,
             "name": "District0x Network Token",
             "network": "eth",
             "shortcut": "DNT",
@@ -7491,7 +7471,7 @@
             "links": {
                 "Homepage": "https://dovu.io"
             },
-            "marketcap_usd": 2494127,
+            "marketcap_usd": 10302838,
             "name": "Dovu",
             "network": "eth",
             "shortcut": "DOV",
@@ -7550,7 +7530,7 @@
                 "Github": "https://github.com/dragonchain/dragonchain",
                 "Homepage": "https://dragonchain.com"
             },
-            "marketcap_usd": 5681767,
+            "marketcap_usd": 5066629,
             "name": "Dragon",
             "network": "eth",
             "shortcut": "DRGN",
@@ -7588,7 +7568,7 @@
             "links": {
                 "Homepage": "https://token.domraider.com"
             },
-            "marketcap_usd": 190033,
+            "marketcap_usd": 138277,
             "name": "DomRaider",
             "network": "eth",
             "shortcut": "DRT",
@@ -7725,7 +7705,7 @@
             "links": {
                 "Homepage": "https://datarius.io"
             },
-            "marketcap_usd": 41183,
+            "marketcap_usd": 37098,
             "name": "Datarius Credit",
             "network": "eth",
             "shortcut": "DTRC",
@@ -7976,7 +7956,7 @@
             "links": {
                 "Homepage": "https://edgeless.io"
             },
-            "marketcap_usd": 4520365,
+            "marketcap_usd": 1489622,
             "name": "Edgeless",
             "network": "eth",
             "shortcut": "EDG",
@@ -8095,7 +8075,7 @@
                 "Github": "https://github.com/egretia",
                 "Homepage": "https://www.egretia.io"
             },
-            "marketcap_usd": 1508009,
+            "marketcap_usd": 1382423,
             "name": "Egretia Token",
             "network": "eth",
             "shortcut": "EGT",
@@ -8153,7 +8133,7 @@
             "links": {
                 "Homepage": "https://echolink.info"
             },
-            "marketcap_usd": 34050,
+            "marketcap_usd": 16271,
             "name": "EchoLink",
             "network": "eth",
             "shortcut": "EKO",
@@ -8191,7 +8171,7 @@
             "links": {
                 "Homepage": "https://electrify.asia"
             },
-            "marketcap_usd": 527477,
+            "marketcap_usd": 385598,
             "name": "Electrify.Asia",
             "network": "eth",
             "shortcut": "ELEC",
@@ -8211,7 +8191,7 @@
                 "Github": "https://github.com/aelfProject",
                 "Homepage": "https://aelf.io/"
             },
-            "marketcap_usd": 67897092,
+            "marketcap_usd": 157530461,
             "name": "ELF Token",
             "network": "eth",
             "shortcut": "ELF",
@@ -8250,7 +8230,7 @@
                 "Github": "https://github.com/eltcoin",
                 "Homepage": "http://www.eltcoin.tech/"
             },
-            "marketcap_usd": 23680,
+            "marketcap_usd": 29287,
             "name": "ELTCOIN",
             "network": "eth",
             "shortcut": "ELTCOIN",
@@ -8270,7 +8250,7 @@
                 "Github": "https://github.com/Elysian-ELY",
                 "Homepage": "https://elycoin.io"
             },
-            "marketcap_usd": 33357,
+            "marketcap_usd": 41694,
             "name": "ELYCOIN",
             "network": "eth",
             "shortcut": "ELY",
@@ -8408,7 +8388,7 @@
                 "Github": "https://github.com/enigmampc",
                 "Homepage": "https://enigma.co/"
             },
-            "marketcap_usd": 117358,
+            "marketcap_usd": 66749,
             "name": "Enigma",
             "network": "eth",
             "shortcut": "ENG",
@@ -8447,7 +8427,7 @@
                 "Github": "https://github.com/enjin/contracts",
                 "Homepage": "https://enjincoin.io"
             },
-            "marketcap_usd": 432291943,
+            "marketcap_usd": 468951418,
             "name": "ENJIN",
             "network": "eth",
             "shortcut": "ENJ",
@@ -8467,7 +8447,7 @@
                 "Github": "https://github.com/Enecuum",
                 "Homepage": "https://enecuum.com"
             },
-            "marketcap_usd": 7945051,
+            "marketcap_usd": 3492342,
             "name": "Enecuum",
             "network": "eth",
             "shortcut": "ENQ",
@@ -8584,7 +8564,7 @@
             "links": {
                 "Homepage": "https://eroscoin.org"
             },
-            "marketcap_usd": 38119,
+            "marketcap_usd": 43656,
             "name": "Eroscoin",
             "network": "eth",
             "shortcut": "ERO",
@@ -8838,7 +8818,7 @@
                 "Github": "https://github.com/stasisnet",
                 "Homepage": "https://stasis.net"
             },
-            "marketcap_usd": 110532336,
+            "marketcap_usd": 130380616,
             "name": "STASIS EURS",
             "network": "eth",
             "shortcut": "EURS",
@@ -8876,7 +8856,7 @@
             "links": {
                 "Homepage": "https://eventchain.io"
             },
-            "marketcap_usd": 32588,
+            "marketcap_usd": 26440,
             "name": "EventChain",
             "network": "eth",
             "shortcut": "EVC",
@@ -8935,7 +8915,7 @@
                 "Github": "https://github.com/evedo-co",
                 "Homepage": "https://www.evedo.co"
             },
-            "marketcap_usd": 419149,
+            "marketcap_usd": 394579,
             "name": "Evedo Token",
             "network": "eth",
             "shortcut": "EVED",
@@ -8994,7 +8974,7 @@
             "links": {
                 "Homepage": "https://everex.io "
             },
-            "marketcap_usd": 264591,
+            "marketcap_usd": 338085,
             "name": "Everex",
             "network": "eth",
             "shortcut": "EVX",
@@ -9092,7 +9072,7 @@
             "links": {
                 "Homepage": "https://exrnchain.com"
             },
-            "marketcap_usd": 1431650,
+            "marketcap_usd": 1505076,
             "name": "EXRNchain",
             "network": "eth",
             "shortcut": "EXRN",
@@ -9208,7 +9188,7 @@
             "links": {
                 "Homepage": "https://tokensale.faceter.io"
             },
-            "marketcap_usd": 207152,
+            "marketcap_usd": 0,
             "name": "Faceter",
             "network": "eth",
             "shortcut": "FACE",
@@ -9306,7 +9286,7 @@
             "links": {
                 "Homepage": "https://friendz.io"
             },
-            "marketcap_usd": 199716,
+            "marketcap_usd": 22710,
             "name": "Friendz",
             "network": "eth",
             "shortcut": "FDZ",
@@ -9444,7 +9424,7 @@
             "links": {
                 "Homepage": "https://www.flixxo.com"
             },
-            "marketcap_usd": 159183,
+            "marketcap_usd": 739558,
             "name": "Flixxo",
             "network": "eth",
             "shortcut": "FLIXX",
@@ -9463,7 +9443,7 @@
             "links": {
                 "Homepage": "https://firelotto.io"
             },
-            "marketcap_usd": 16070,
+            "marketcap_usd": 32076,
             "name": "Fire Lotto",
             "network": "eth",
             "shortcut": "FLOT",
@@ -9483,7 +9463,7 @@
                 "Github": "https://github.com/gameflip",
                 "Homepage": "https://gameflip.com"
             },
-            "marketcap_usd": 469995,
+            "marketcap_usd": 439780,
             "name": "FLIP Token",
             "network": "eth",
             "shortcut": "FLP",
@@ -9639,7 +9619,7 @@
                 "Github": "https://github.com/f-o-a-m",
                 "Homepage": "http://foam.space"
             },
-            "marketcap_usd": 8465344,
+            "marketcap_usd": 4813660,
             "name": "FOAM Token",
             "network": "eth",
             "shortcut": "FOAM",
@@ -9716,7 +9696,7 @@
             "links": {
                 "Homepage": "https://shapeshift.com"
             },
-            "marketcap_usd": 14988331,
+            "marketcap_usd": 14439774,
             "name": "FOX",
             "network": "eth",
             "shortcut": "FOX",
@@ -9852,7 +9832,7 @@
             "links": {
                 "Homepage": "https://fanstime.org"
             },
-            "marketcap_usd": 176143,
+            "marketcap_usd": 147781,
             "name": "FansTime",
             "network": "eth",
             "shortcut": "FTI",
@@ -9872,7 +9852,7 @@
                 "Github": "https://github.com/Fantom-foundation/",
                 "Homepage": "https://fantom.foundation/"
             },
-            "marketcap_usd": 574037369,
+            "marketcap_usd": 1245702872,
             "name": "Fantom Token",
             "network": "eth",
             "shortcut": "FTM",
@@ -9930,7 +9910,7 @@
             "links": {
                 "Homepage": "https://www.fintrux.com"
             },
-            "marketcap_usd": 449697,
+            "marketcap_usd": 176615,
             "name": "FintruX Network",
             "network": "eth",
             "shortcut": "FTX",
@@ -9950,7 +9930,7 @@
                 "Github": "https://github.com/futuraxproject",
                 "Homepage": "https://futurax.global"
             },
-            "marketcap_usd": 52722,
+            "marketcap_usd": 55426,
             "name": "FUTURAX",
             "network": "eth",
             "shortcut": "FTXT",
@@ -9970,7 +9950,7 @@
                 "Github": "https://github.com/etherparty",
                 "Homepage": "https://etherparty.io"
             },
-            "marketcap_usd": 270613,
+            "marketcap_usd": 265967,
             "name": "Etherparty FUEL",
             "network": "eth",
             "shortcut": "FUEL",
@@ -9989,7 +9969,7 @@
             "links": {
                 "Homepage": "https://funfair.io"
             },
-            "marketcap_usd": 82431215,
+            "marketcap_usd": 77061620,
             "name": "Funfair",
             "network": "eth",
             "shortcut": "FUN",
@@ -10008,7 +9988,7 @@
             "links": {
                 "Homepage": "https://fuzex.co"
             },
-            "marketcap_usd": 39376,
+            "marketcap_usd": 0,
             "name": "FuzeX",
             "network": "eth",
             "shortcut": "FXT",
@@ -10066,7 +10046,7 @@
             "links": {
                 "Homepage": "https://flyp.me"
             },
-            "marketcap_usd": 512140,
+            "marketcap_usd": 618522,
             "name": "FlypMe",
             "network": "eth",
             "shortcut": "FYP",
@@ -10125,7 +10105,7 @@
                 "Github": "https://github.com/gluwa/Creditcoin",
                 "Homepage": "https://creditcoinfoundation.org"
             },
-            "marketcap_usd": 117187195,
+            "marketcap_usd": 103231356,
             "name": "Creditcoin Token",
             "network": "eth",
             "shortcut": "G-CRE",
@@ -10165,7 +10145,7 @@
                 "Github": "https://github.com/gamecredits-project",
                 "Homepage": "https://www.gamecredits.org"
             },
-            "marketcap_usd": 2462960,
+            "marketcap_usd": 3159640,
             "name": "GAME Credits",
             "network": "eth",
             "shortcut": "GAME",
@@ -10400,7 +10380,7 @@
                 "Github": "https://github.com/Governor-DAO",
                 "Homepage": "https://www.governordao.org"
             },
-            "marketcap_usd": 502739,
+            "marketcap_usd": 362122,
             "name": "Governor DAO",
             "network": "eth",
             "shortcut": "GDAO",
@@ -10478,7 +10458,7 @@
             "links": {
                 "Homepage": "https://gems.org"
             },
-            "marketcap_usd": 142792,
+            "marketcap_usd": 94104,
             "name": "Gems",
             "network": "eth",
             "shortcut": "GEM",
@@ -10498,7 +10478,7 @@
                 "Github": "https://github.com/daostack",
                 "Homepage": "https://daostack.io"
             },
-            "marketcap_usd": 437613,
+            "marketcap_usd": 1374362,
             "name": "DAOstack",
             "network": "eth",
             "shortcut": "GEN",
@@ -10537,7 +10517,7 @@
                 "Github": "https://github.com/Getprotocol",
                 "Homepage": "http://www.get-protocol.io"
             },
-            "marketcap_usd": 12604913,
+            "marketcap_usd": 17570214,
             "name": "GET Protocol",
             "network": "eth",
             "shortcut": "GET",
@@ -10595,7 +10575,7 @@
             "links": {
                 "Homepage": "https://gamerhash.io/"
             },
-            "marketcap_usd": 7810604,
+            "marketcap_usd": 5973218,
             "name": "GamerCoin",
             "network": "eth",
             "shortcut": "GHX",
@@ -10668,6 +10648,26 @@
                 }
             ]
         },
+        "erc20:eth:GIV": {
+            "address": "0x900dB999074d9277c5DA2A43F252D74366230DA0",
+            "links": {
+                "Github": "https://github.com/Giveth",
+                "Homepage": "https://giveth.io/"
+            },
+            "marketcap_usd": 0,
+            "name": "Giveth",
+            "network": "eth",
+            "shortcut": "GIV",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:GL": {
             "address": "0xA5B399a76bbAbEf93D70255525C1d2BCC3701d0b",
             "links": {
@@ -10712,7 +10712,7 @@
             "links": {
                 "Homepage": "https://gamb.io"
             },
-            "marketcap_usd": 968385,
+            "marketcap_usd": 1277478,
             "name": "GAMB",
             "network": "eth",
             "shortcut": "GMB",
@@ -10731,7 +10731,7 @@
             "links": {
                 "Homepage": "https://gnosis.pm"
             },
-            "marketcap_usd": 301224889,
+            "marketcap_usd": 278912676,
             "name": "Gnosis",
             "network": "eth",
             "shortcut": "GNO",
@@ -10770,7 +10770,7 @@
             "links": {
                 "Homepage": "https://genaro.network"
             },
-            "marketcap_usd": 1885910,
+            "marketcap_usd": 1942086,
             "name": "Genaro Network",
             "network": "eth",
             "shortcut": "GNX",
@@ -10849,7 +10849,7 @@
                 "Github": "https://github.com/coti-io/cvi-contracts",
                 "Homepage": "https://cvi.finance"
             },
-            "marketcap_usd": 4959922,
+            "marketcap_usd": 9674350,
             "name": "GOVI",
             "network": "eth",
             "shortcut": "GOVI",
@@ -10887,7 +10887,7 @@
             "links": {
                 "Homepage": "http://gridplus.io"
             },
-            "marketcap_usd": 11336358,
+            "marketcap_usd": 8168623,
             "name": "Grid+",
             "network": "eth",
             "shortcut": "GRID",
@@ -10966,7 +10966,7 @@
                 "Github": "https://github.com/graphprotocol",
                 "Homepage": "https://thegraph.com"
             },
-            "marketcap_usd": 560119157,
+            "marketcap_usd": 1397892462,
             "name": "Graph Token",
             "network": "eth",
             "shortcut": "GRT",
@@ -10985,7 +10985,7 @@
             "links": {
                 "Homepage": "https://www.gsc.social"
             },
-            "marketcap_usd": 383092,
+            "marketcap_usd": 1307261,
             "name": "Global Social Chain",
             "network": "eth",
             "shortcut": "GSC",
@@ -11024,7 +11024,7 @@
                 "Github": "https://github.com/GameLeLe",
                 "Homepage": "https://game.com"
             },
-            "marketcap_usd": 597721,
+            "marketcap_usd": 626409,
             "name": "GTC Token",
             "network": "eth",
             "shortcut": "GTC",
@@ -11038,13 +11038,33 @@
                 }
             ]
         },
+        "erc20:eth:GTEC": {
+            "address": "0x30E193bd3F52713D5562cf316f35115034525f44",
+            "links": {
+                "Github": "https://github.com/Sustainability-Creative-Co/GreenTechCoin",
+                "Homepage": "https://greentechcoin.xyz"
+            },
+            "marketcap_usd": 0,
+            "name": "Green Tech Coin",
+            "network": "eth",
+            "shortcut": "GTEC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:GTH": {
             "address": "0xeb986DA994E4a118d5956b02d8b7c3C7CE373674",
             "links": {
                 "Github": "https://github.com/GatherNetwork",
                 "Homepage": "https://gather.network"
             },
-            "marketcap_usd": 1283292,
+            "marketcap_usd": 1331693,
             "name": "GTH",
             "network": "eth",
             "shortcut": "GTH",
@@ -11084,7 +11104,7 @@
                 "Github": "https://github.com/GIFTO-io",
                 "Homepage": "https://gifto.io/"
             },
-            "marketcap_usd": 18131381,
+            "marketcap_usd": 0,
             "name": "Gifto",
             "network": "eth",
             "shortcut": "GTO",
@@ -11162,7 +11182,7 @@
                 "Github": "https://github.com/GenesisVision",
                 "Homepage": "https://genesis.vision"
             },
-            "marketcap_usd": 764941,
+            "marketcap_usd": 849673,
             "name": "Genesis Vision",
             "network": "eth",
             "shortcut": "GVT",
@@ -11338,7 +11358,7 @@
             "links": {
                 "Homepage": "https://www.showhand.io"
             },
-            "marketcap_usd": 958237,
+            "marketcap_usd": 1007382,
             "name": "ShowHand",
             "network": "eth",
             "shortcut": "HAND",
@@ -11414,7 +11434,7 @@
             "links": {
                 "Homepage": "https://heartbout.com"
             },
-            "marketcap_usd": 5873,
+            "marketcap_usd": 11910,
             "name": "HeartBout",
             "network": "eth",
             "shortcut": "HB",
@@ -11550,7 +11570,7 @@
                 "Github": "https://github.com/bitcoinHEX",
                 "Homepage": "https://hex.win"
             },
-            "marketcap_usd": 7511735555,
+            "marketcap_usd": 10933582176,
             "name": "HEX",
             "network": "eth",
             "shortcut": "HEX",
@@ -11744,7 +11764,7 @@
             "links": {
                 "Homepage": "https://humaniq.com"
             },
-            "marketcap_usd": 846268,
+            "marketcap_usd": 774910,
             "name": "Humaniq",
             "network": "eth",
             "shortcut": "HMQ",
@@ -11842,7 +11862,7 @@
                 "Github": "https://github.com/Holo-Host",
                 "Homepage": "https://holo.host/"
             },
-            "marketcap_usd": 344440090,
+            "marketcap_usd": 357796049,
             "name": "Holo Token",
             "network": "eth",
             "shortcut": "HOT (Holo)",
@@ -11861,7 +11881,7 @@
             "links": {
                 "Homepage": "https://thehydrofoundation.com/"
             },
-            "marketcap_usd": 1212987,
+            "marketcap_usd": 2858970,
             "name": "Hydro Protocol",
             "network": "eth",
             "shortcut": "HOT (Hydro)",
@@ -11899,7 +11919,7 @@
             "links": {
                 "Homepage": "https://www.hbg.com"
             },
-            "marketcap_usd": 1270062242,
+            "marketcap_usd": 856172229,
             "name": "Huobi Token",
             "network": "eth",
             "shortcut": "HT",
@@ -12018,7 +12038,7 @@
                 "Github": "https://github.com/HiveProjectLTD",
                 "Homepage": "https://www.hiveterminal.com"
             },
-            "marketcap_usd": 639056,
+            "marketcap_usd": 479398,
             "name": "Hiveterminal Token",
             "network": "eth",
             "shortcut": "HVN",
@@ -12173,7 +12193,7 @@
             "links": {
                 "Homepage": "https://www.everest.org"
             },
-            "marketcap_usd": 7623699,
+            "marketcap_usd": 4268877,
             "name": "Everest (ID)",
             "network": "eth",
             "shortcut": "ID",
@@ -12231,7 +12251,7 @@
                 "Github": "https://github.com/rupiah-token/",
                 "Homepage": "https://www.rupiahtoken.com"
             },
-            "marketcap_usd": 7891601,
+            "marketcap_usd": 7924738,
             "name": "Rupiah Token",
             "network": "eth",
             "shortcut": "IDRT",
@@ -12250,7 +12270,7 @@
             "links": {
                 "Homepage": "https://investfeed.com"
             },
-            "marketcap_usd": 117198,
+            "marketcap_usd": 134220,
             "name": "InvestFeed",
             "network": "eth",
             "shortcut": "IFT",
@@ -12269,7 +12289,7 @@
             "links": {
                 "Homepage": "http://igtoken.net"
             },
-            "marketcap_usd": 66382,
+            "marketcap_usd": 69787,
             "name": "IGToken",
             "network": "eth",
             "shortcut": "IG",
@@ -12308,7 +12328,7 @@
             "links": {
                 "Homepage": "https://ihtcoin.com"
             },
-            "marketcap_usd": 209407,
+            "marketcap_usd": 159461,
             "name": "I HOUSE TOKEN",
             "network": "eth",
             "shortcut": "IHT",
@@ -12385,7 +12405,7 @@
             "links": {
                 "Homepage": "https://indorse.io"
             },
-            "marketcap_usd": 129641,
+            "marketcap_usd": 148825,
             "name": "Indorse",
             "network": "eth",
             "shortcut": "IND",
@@ -12560,7 +12580,7 @@
                 "Github": "https://github.com/iotexproject/iotex-core",
                 "Homepage": "http://iotex.io/"
             },
-            "marketcap_usd": 265267970,
+            "marketcap_usd": 264394884,
             "name": "IoTeX Network",
             "network": "eth",
             "shortcut": "IOTX",
@@ -12580,7 +12600,7 @@
                 "Github": "https://github.com/InsurePal",
                 "Homepage": "https://insurepal.io/"
             },
-            "marketcap_usd": 24064,
+            "marketcap_usd": 34625,
             "name": "InsurePal token",
             "network": "eth",
             "shortcut": "IPL",
@@ -12619,7 +12639,7 @@
                 "Github": "https://github.com/iqeon",
                 "Homepage": "https://iqeon.io/"
             },
-            "marketcap_usd": 1548039,
+            "marketcap_usd": 1731566,
             "name": "IQeon",
             "network": "eth",
             "shortcut": "IQN",
@@ -12679,7 +12699,7 @@
                 "Github": "https://github.com/IoTChainCode",
                 "Homepage": "https://iotchain.io/"
             },
-            "marketcap_usd": 10816,
+            "marketcap_usd": 0,
             "name": "IoT Chain",
             "network": "eth",
             "shortcut": "ITC",
@@ -12777,7 +12797,7 @@
             "links": {
                 "Homepage": "https://www.insurex.co"
             },
-            "marketcap_usd": 159977,
+            "marketcap_usd": 60603,
             "name": "InsureX",
             "network": "eth",
             "shortcut": "IXT",
@@ -12836,7 +12856,7 @@
                 "Github": "https://github.com/TokyoToken/JasmyCoin",
                 "Homepage": "https://jasmy.co.jp"
             },
-            "marketcap_usd": 24741311,
+            "marketcap_usd": 285268503,
             "name": "JasmyCoin",
             "network": "eth",
             "shortcut": "JASMY",
@@ -12933,7 +12953,7 @@
                 "Github": "https://github.com/JobchainOfficial",
                 "Homepage": "https://www.jobchain.com"
             },
-            "marketcap_usd": 6283133,
+            "marketcap_usd": 2519134,
             "name": "Jobchain",
             "network": "eth",
             "shortcut": "JOB",
@@ -13010,7 +13030,7 @@
             "links": {
                 "Homepage": "http://www.kan.land"
             },
-            "marketcap_usd": 10574643,
+            "marketcap_usd": 11935328,
             "name": "BitKan",
             "network": "eth",
             "shortcut": "KAN",
@@ -13088,7 +13108,7 @@
             "links": {
                 "Homepage": "https://kindads.io"
             },
-            "marketcap_usd": 10723,
+            "marketcap_usd": 0,
             "name": "Kind Ads Token",
             "network": "eth",
             "shortcut": "KIND",
@@ -13146,7 +13166,7 @@
             "links": {
                 "Homepage": "https://kanadecoin.com"
             },
-            "marketcap_usd": 84677,
+            "marketcap_usd": 89020,
             "name": "KanadeCoin",
             "network": "eth",
             "shortcut": "KNDC",
@@ -13224,7 +13244,7 @@
                 "Github": "https://github.com/Cryptense/",
                 "Homepage": "https://kryll.io/"
             },
-            "marketcap_usd": 13931057,
+            "marketcap_usd": 11584452,
             "name": "Kryll",
             "network": "eth",
             "shortcut": "KRL",
@@ -13379,7 +13399,7 @@
                 "Github": "https://github.com/latoken",
                 "Homepage": "https://latoken.com/"
             },
-            "marketcap_usd": 20871451,
+            "marketcap_usd": 12469110,
             "name": "LATOKEN",
             "network": "eth",
             "shortcut": "LA",
@@ -13418,7 +13438,7 @@
                 "Github": "https://github.com/LambdaIM",
                 "Homepage": "https://www.lambda.im/"
             },
-            "marketcap_usd": 2524621,
+            "marketcap_usd": 3436594,
             "name": "Lambda",
             "network": "eth",
             "shortcut": "LAMB",
@@ -13456,7 +13476,7 @@
             "links": {
                 "Homepage": "https://www.mycred.io"
             },
-            "marketcap_usd": 1236883,
+            "marketcap_usd": 1984754,
             "name": "Cred",
             "network": "eth",
             "shortcut": "LBA",
@@ -13475,7 +13495,7 @@
             "links": {
                 "Homepage": "https://www.localcoinswap.com"
             },
-            "marketcap_usd": 378219,
+            "marketcap_usd": 0,
             "name": "LocalCoinSwap",
             "network": "eth",
             "shortcut": "LCS",
@@ -13766,7 +13786,7 @@
             "links": {
                 "Homepage": "https://link.smartcontract.com"
             },
-            "marketcap_usd": 3811788891,
+            "marketcap_usd": 3706867339,
             "name": "Chainlink",
             "network": "eth",
             "shortcut": "LINK (Chainlink)",
@@ -13824,7 +13844,7 @@
                 "Github": "https://github.com/GNYIO",
                 "Homepage": "https://www.gny.io/lisk"
             },
-            "marketcap_usd": 268579,
+            "marketcap_usd": 513069,
             "name": "Lisk Machine Learning",
             "network": "eth",
             "shortcut": "LML",
@@ -13922,7 +13942,7 @@
             "links": {
                 "Homepage": "https://www.locuschain.com"
             },
-            "marketcap_usd": 62589574,
+            "marketcap_usd": 106084983,
             "name": "Locus Chain",
             "network": "eth",
             "shortcut": "LOCUS",
@@ -13979,7 +13999,7 @@
             "links": {
                 "Homepage": "https://looksrare.org/"
             },
-            "marketcap_usd": 98650767,
+            "marketcap_usd": 87358911,
             "name": "LooksRare",
             "network": "eth",
             "shortcut": "LOOKS",
@@ -13999,7 +14019,7 @@
                 "Github": "github.com/loomnetwork/",
                 "Homepage": "https://loomx.io"
             },
-            "marketcap_usd": 62700878,
+            "marketcap_usd": 68665519,
             "name": "LOOM",
             "network": "eth",
             "shortcut": "LOOM",
@@ -14019,7 +14039,7 @@
                 "Github": "https://github.com/livepeer",
                 "Homepage": "https://livepeer.org/"
             },
-            "marketcap_usd": 231874740,
+            "marketcap_usd": 202398732,
             "name": "Livepeer Token",
             "network": "eth",
             "shortcut": "LPT",
@@ -14058,7 +14078,7 @@
                 "Github": "https://github.com/loopring",
                 "Homepage": "https://loopring.org"
             },
-            "marketcap_usd": 342544118,
+            "marketcap_usd": 488986992,
             "name": "Loopring",
             "network": "eth",
             "shortcut": "LRC",
@@ -14156,7 +14176,7 @@
                 "Github": "https://github.com/lunyr",
                 "Homepage": "https://lunyr.com"
             },
-            "marketcap_usd": 49719,
+            "marketcap_usd": 39214,
             "name": "Lunyr",
             "network": "eth",
             "shortcut": "LUN",
@@ -14254,7 +14274,7 @@
                 "Github": "https://github.com/TreasureProject",
                 "Homepage": "https://treasure.lol/"
             },
-            "marketcap_usd": 70602976,
+            "marketcap_usd": 334874623,
             "name": "MAGIC",
             "network": "eth",
             "shortcut": "MAGIC",
@@ -14294,7 +14314,7 @@
                 "Github": "https://github.com/decentraland",
                 "Homepage": "https://decentraland.org"
             },
-            "marketcap_usd": 1169611173,
+            "marketcap_usd": 1197020889,
             "name": "Decentraland MANA",
             "network": "eth",
             "shortcut": "MANA",
@@ -14332,7 +14352,7 @@
             "links": {
                 "Homepage": "https://midasprotocol.io/"
             },
-            "marketcap_usd": 79376,
+            "marketcap_usd": 46340,
             "name": "MIDAS PROTOCOL",
             "network": "eth",
             "shortcut": "MAS",
@@ -14351,7 +14371,7 @@
             "links": {
                 "Homepage": "https://polygon.technology/"
             },
-            "marketcap_usd": 7431717654,
+            "marketcap_usd": 10673372779,
             "name": "Matic Token",
             "network": "eth",
             "shortcut": "MATIC",
@@ -14448,7 +14468,7 @@
             "links": {
                 "Homepage": "https://moedaseeds.com"
             },
-            "marketcap_usd": 919826,
+            "marketcap_usd": 1291844,
             "name": "Moeda Loyalty Points",
             "network": "eth",
             "shortcut": "MDA",
@@ -14467,7 +14487,7 @@
             "links": {
                 "Homepage": "https://www.mdt.co"
             },
-            "marketcap_usd": 20390256,
+            "marketcap_usd": 41400337,
             "name": "Measurable Data Token",
             "network": "eth",
             "shortcut": "MDT",
@@ -14543,7 +14563,7 @@
             "links": {
                 "Homepage": "https://dontbuymeme.com"
             },
-            "marketcap_usd": 2272818,
+            "marketcap_usd": 1541109,
             "name": "Meme",
             "network": "eth",
             "shortcut": "MEME",
@@ -14597,25 +14617,6 @@
                 }
             ]
         },
-        "erc20:eth:MET": {
-            "address": "0xa3d58c4E56fedCae3a7c43A725aeE9A71F0ece4e",
-            "links": {
-                "Homepage": "https://www.metronome.io"
-            },
-            "marketcap_usd": 0,
-            "name": "Metronome",
-            "network": "eth",
-            "shortcut": "MET",
-            "t1_enabled": "yes",
-            "t2_enabled": "yes",
-            "type": "erc20",
-            "wallet": [
-                {
-                    "name": "Trezor Suite",
-                    "url": "https://suite.trezor.io"
-                }
-            ]
-        },
         "erc20:eth:METM": {
             "address": "0xFEF3884b603C33EF8eD4183346E093A173C94da6",
             "links": {
@@ -14641,7 +14642,7 @@
                 "Github": "https://github.com/syncfab",
                 "Homepage": "https://syncfab.com/"
             },
-            "marketcap_usd": 2566024,
+            "marketcap_usd": 1569704,
             "name": "SyncFab Smart Manufacturing Blockchain",
             "network": "eth",
             "shortcut": "MFG",
@@ -14661,7 +14662,7 @@
                 "Github": "https://github.com/MainframeHQ",
                 "Homepage": "https://mainframe.com"
             },
-            "marketcap_usd": 50822421,
+            "marketcap_usd": 46148389,
             "name": "Mainframe Token",
             "network": "eth",
             "shortcut": "MFT",
@@ -14795,7 +14796,7 @@
             "links": {
                 "Homepage": "https://token.morpheuslabs.io"
             },
-            "marketcap_usd": 2690049,
+            "marketcap_usd": 9699325,
             "name": "Morpheus Infrastructure Token",
             "network": "eth",
             "shortcut": "MITX",
@@ -14815,7 +14816,7 @@
                 "Github": "https://github.com/makerdao",
                 "Homepage": "https://makerdao.com"
             },
-            "marketcap_usd": 833169733,
+            "marketcap_usd": 754815596,
             "name": "MakerDAO",
             "network": "eth",
             "shortcut": "MKR",
@@ -14854,7 +14855,7 @@
             "links": {
                 "Homepage": "https://melonport.com"
             },
-            "marketcap_usd": 47193145,
+            "marketcap_usd": 51522892,
             "name": "Melonport",
             "network": "eth",
             "shortcut": "MLN (new)",
@@ -14951,7 +14952,7 @@
                 "Github": "https://github.com/Goldmint",
                 "Homepage": "https://goldmint.io"
             },
-            "marketcap_usd": 193104,
+            "marketcap_usd": 187104,
             "name": "Goldmint MNT Prelaunch Token",
             "network": "eth",
             "shortcut": "MNTP",
@@ -15144,7 +15145,7 @@
                 "Github": "https://github.com/mstable",
                 "Homepage": "http://mstable.org"
             },
-            "marketcap_usd": 4359472,
+            "marketcap_usd": 1711726,
             "name": "mStable Meta",
             "network": "eth",
             "shortcut": "MTA",
@@ -15163,7 +15164,7 @@
             "links": {
                 "Homepage": "http://www.monetha.io"
             },
-            "marketcap_usd": 4681353,
+            "marketcap_usd": 3108167,
             "name": "Monetha",
             "network": "eth",
             "shortcut": "MTH",
@@ -15182,7 +15183,7 @@
             "links": {
                 "Homepage": "https://www.metalpay.com"
             },
-            "marketcap_usd": 65144606,
+            "marketcap_usd": 86278153,
             "name": "Metal",
             "network": "eth",
             "shortcut": "MTL",
@@ -15201,7 +15202,7 @@
             "links": {
                 "Homepage": "https://medicalchain.com"
             },
-            "marketcap_usd": 670512,
+            "marketcap_usd": 569197,
             "name": "MedToken",
             "network": "eth",
             "shortcut": "MTN",
@@ -15335,7 +15336,7 @@
             "links": {
                 "Homepage": "http://mvlchain.io"
             },
-            "marketcap_usd": 96022968,
+            "marketcap_usd": 103186956,
             "name": "Mass Vehicle Ledger Token",
             "network": "eth",
             "shortcut": "MVL",
@@ -15355,7 +15356,7 @@
                 "Github": "https://github.com/Merculet",
                 "Homepage": "https://www.merculet.io"
             },
-            "marketcap_usd": 496252,
+            "marketcap_usd": 364084,
             "name": "Merculet",
             "network": "eth",
             "shortcut": "MVP",
@@ -15393,7 +15394,7 @@
             "links": {
                 "Homepage": "https://mysterium.network/"
             },
-            "marketcap_usd": 5246057,
+            "marketcap_usd": 5220095,
             "name": "Mysterium",
             "network": "eth",
             "shortcut": "MYST",
@@ -15432,7 +15433,7 @@
                 "Github": "https://github.com/NANJ-COIN",
                 "Homepage": "https://nanjcoin.com/"
             },
-            "marketcap_usd": 299669,
+            "marketcap_usd": 315039,
             "name": "NANJCOIN",
             "network": "eth",
             "shortcut": "NANJ",
@@ -15529,7 +15530,7 @@
             "links": {
                 "Homepage": "https://niobiumcoin.io"
             },
-            "marketcap_usd": 109065,
+            "marketcap_usd": 89666,
             "name": "Niobium Coin",
             "network": "eth",
             "shortcut": "NBC",
@@ -15588,7 +15589,7 @@
                 "Github": "https://github.com/polyswarm",
                 "Homepage": "https://polyswarm.io"
             },
-            "marketcap_usd": 13700176,
+            "marketcap_usd": 16924718,
             "name": "Nectar",
             "network": "eth",
             "shortcut": "NCT",
@@ -15724,7 +15725,7 @@
             "links": {
                 "Homepage": "http://nexo.io"
             },
-            "marketcap_usd": 553351854,
+            "marketcap_usd": 392895017,
             "name": "Nexo",
             "network": "eth",
             "shortcut": "NEXO",
@@ -15802,7 +15803,7 @@
                 "Github": "https://github.com/nknorg",
                 "Homepage": "https://nkn.org"
             },
-            "marketcap_usd": 62094180,
+            "marketcap_usd": 90576077,
             "name": "NKN",
             "network": "eth",
             "shortcut": "NKN",
@@ -15842,7 +15843,7 @@
                 "Github": "https://github.com/numerai",
                 "Homepage": "https://numer.ai"
             },
-            "marketcap_usd": 86844258,
+            "marketcap_usd": 116826641,
             "name": "Numerai",
             "network": "eth",
             "shortcut": "NMR",
@@ -15960,7 +15961,7 @@
                 "Github": "https://github.com/pundix",
                 "Homepage": "https://pundix.com"
             },
-            "marketcap_usd": 125687612,
+            "marketcap_usd": 133949059,
             "name": "Pundi X Token",
             "network": "eth",
             "shortcut": "NPXS",
@@ -16019,7 +16020,7 @@
                 "Github": "https://github.com/nucypher",
                 "Homepage": "https://nucypher.com"
             },
-            "marketcap_usd": 101175117,
+            "marketcap_usd": 106813292,
             "name": "NuCypher Network",
             "network": "eth",
             "shortcut": "NU",
@@ -16192,7 +16193,7 @@
             "links": {
                 "Homepage": "https://www.openanx.org/en"
             },
-            "marketcap_usd": 11045486,
+            "marketcap_usd": 18826379,
             "name": "OAX",
             "network": "eth",
             "shortcut": "OAX",
@@ -16252,7 +16253,7 @@
                 "Github": "https://github.com/oceanprotocol",
                 "Homepage": "https://oceanprotocol.com"
             },
-            "marketcap_usd": 102841179,
+            "marketcap_usd": 241205777,
             "name": "Ocean Token",
             "network": "eth",
             "shortcut": "OCEAN",
@@ -16271,7 +16272,7 @@
             "links": {
                 "Homepage": "http://www.ocnex.net"
             },
-            "marketcap_usd": 673175,
+            "marketcap_usd": 453298,
             "name": "Odyssey",
             "network": "eth",
             "shortcut": "OCN",
@@ -16291,7 +16292,7 @@
                 "Github": "https://github.com/octofi",
                 "Homepage": "https://octo.fi"
             },
-            "marketcap_usd": 1288408,
+            "marketcap_usd": 1060203,
             "name": "OctoFi",
             "network": "eth",
             "shortcut": "OCTO",
@@ -16351,7 +16352,7 @@
                 "Github": "https://github.com/originprotocol",
                 "Homepage": "https://www.originprotocol.com"
             },
-            "marketcap_usd": 71147679,
+            "marketcap_usd": 69749547,
             "name": "OriginToken",
             "network": "eth",
             "shortcut": "OGN",
@@ -16371,7 +16372,7 @@
                 "Github": "https://github.com/OriginProtocol/ousd-governance",
                 "Homepage": "https://governance.ousd.com"
             },
-            "marketcap_usd": 5775820,
+            "marketcap_usd": 4568560,
             "name": "Origin Dollar Governance",
             "network": "eth",
             "shortcut": "OGV",
@@ -16431,7 +16432,7 @@
                 "Github": "https://github.com/okex/okberc20token",
                 "Homepage": "https://www.okex.com/"
             },
-            "marketcap_usd": 969890641,
+            "marketcap_usd": 3080708053,
             "name": "OKB",
             "network": "eth",
             "shortcut": "OKB",
@@ -16510,7 +16511,7 @@
                 "Github": "https://github.com/omisego",
                 "Homepage": "https://omg.omise.co"
             },
-            "marketcap_usd": 223158726,
+            "marketcap_usd": 243064600,
             "name": "OmiseGO",
             "network": "eth",
             "shortcut": "OMG",
@@ -16588,7 +16589,7 @@
                 "Github": "https://github.com/onGsocial",
                 "Homepage": "https://somee.social"
             },
-            "marketcap_usd": 156806,
+            "marketcap_usd": 0,
             "name": "SoMee.Social",
             "network": "eth",
             "shortcut": "ONG",
@@ -16723,7 +16724,7 @@
                 "Github": "https://github.com/orbs-network",
                 "Homepage": "https://orbs.com"
             },
-            "marketcap_usd": 93149464,
+            "marketcap_usd": 102029850,
             "name": "Orbs",
             "network": "eth",
             "shortcut": "ORBS",
@@ -16801,7 +16802,7 @@
             "links": {
                 "Homepage": "https://www.originsport.io"
             },
-            "marketcap_usd": 2666847,
+            "marketcap_usd": 867139,
             "name": "Origin Sport",
             "network": "eth",
             "shortcut": "ORS",
@@ -16860,7 +16861,7 @@
                 "Github": "https://github.com/OpenSTFoundation",
                 "Homepage": "https://simpletoken.org"
             },
-            "marketcap_usd": 370635,
+            "marketcap_usd": 406211,
             "name": "Simple Token 'OST'",
             "network": "eth",
             "shortcut": "OST",
@@ -16919,7 +16920,7 @@
                 "Github": "https://github.com/originprotocol",
                 "Homepage": "https://ousd.com"
             },
-            "marketcap_usd": 44949191,
+            "marketcap_usd": 54479420,
             "name": "Origin Dollar",
             "network": "eth",
             "shortcut": "OUSD",
@@ -16979,7 +16980,7 @@
                 "Github": "https://github.com/orchidtechnologies/orchid",
                 "Homepage": "https://www.orchid.com"
             },
-            "marketcap_usd": 63182725,
+            "marketcap_usd": 65851872,
             "name": "Orchid",
             "network": "eth",
             "shortcut": "OXT",
@@ -17170,33 +17171,13 @@
                 }
             ]
         },
-        "erc20:eth:PAX": {
-            "address": "0x8E870D67F660D95d5be530380D0eC0bd388289E1",
-            "links": {
-                "Github": "https://github.com/paxosglobal",
-                "Homepage": "https://www.paxos.com/standard"
-            },
-            "marketcap_usd": 942628878,
-            "name": "Paxos Standard (PAX)",
-            "network": "eth",
-            "shortcut": "PAX",
-            "t1_enabled": "yes",
-            "t2_enabled": "yes",
-            "type": "erc20",
-            "wallet": [
-                {
-                    "name": "Trezor Suite",
-                    "url": "https://suite.trezor.io"
-                }
-            ]
-        },
         "erc20:eth:PAXG": {
             "address": "0x45804880De22913dAFE09f4980848ECE6EcbAf78",
             "links": {
                 "Github": "https://github.com/paxosglobal/paxos-gold-contract",
                 "Homepage": "https://www.paxos.com/paxgold"
             },
-            "marketcap_usd": 536030375,
+            "marketcap_usd": 487662967,
             "name": "Paxos Gold",
             "network": "eth",
             "shortcut": "PAXG",
@@ -17215,7 +17196,7 @@
             "links": {
                 "Homepage": "http://www.tenx.tech"
             },
-            "marketcap_usd": 3590819,
+            "marketcap_usd": 3568855,
             "name": "TenX",
             "network": "eth",
             "shortcut": "PAY",
@@ -17468,7 +17449,7 @@
             "links": {
                 "Homepage": "https://www.phitoken.io"
             },
-            "marketcap_usd": 346234,
+            "marketcap_usd": 0,
             "name": "PHI Token",
             "network": "eth",
             "shortcut": "PHI",
@@ -17487,7 +17468,7 @@
             "links": {
                 "Homepage": "https://pickle.finance/"
             },
-            "marketcap_usd": 2562812,
+            "marketcap_usd": 2689140,
             "name": "Pickle Finance",
             "network": "eth",
             "shortcut": "PICKLE",
@@ -17506,7 +17487,7 @@
             "links": {
                 "Homepage": "https://piplcoin.com"
             },
-            "marketcap_usd": 70438,
+            "marketcap_usd": 0,
             "name": "PIPL Coin",
             "network": "eth",
             "shortcut": "PIPL",
@@ -17582,7 +17563,7 @@
             "links": {
                 "Homepage": "http://pkgtoken.io"
             },
-            "marketcap_usd": 75503,
+            "marketcap_usd": 79184,
             "name": "PKG Token",
             "network": "eth",
             "shortcut": "PKG",
@@ -17601,7 +17582,7 @@
             "links": {
                 "Homepage": "https://playkey.io"
             },
-            "marketcap_usd": 70182,
+            "marketcap_usd": 65171,
             "name": "Playkey",
             "network": "eth",
             "shortcut": "PKT",
@@ -17659,7 +17640,7 @@
                 "Github": "https://github.com/twentythirty/PillarToken",
                 "Homepage": "https://www.pillarproject.io"
             },
-            "marketcap_usd": 1324382,
+            "marketcap_usd": 1387534,
             "name": "Pillar Project",
             "network": "eth",
             "shortcut": "PLR",
@@ -17698,7 +17679,7 @@
             "links": {
                 "Homepage": "https://plutus.it"
             },
-            "marketcap_usd": 17063353,
+            "marketcap_usd": 18172960,
             "name": "Pluton",
             "network": "eth",
             "shortcut": "PLU",
@@ -17717,7 +17698,7 @@
             "links": {
                 "Homepage": "https://pumapay.io"
             },
-            "marketcap_usd": 661088,
+            "marketcap_usd": 420840,
             "name": "PumaPay",
             "network": "eth",
             "shortcut": "PMA",
@@ -17756,7 +17737,7 @@
                 "Github": "https://github.com/kleros",
                 "Homepage": "https://kleros.io"
             },
-            "marketcap_usd": 18696127,
+            "marketcap_usd": 18057635,
             "name": "Pinakion",
             "network": "eth",
             "shortcut": "PNK",
@@ -17775,7 +17756,7 @@
             "links": {
                 "Homepage": "https://po.et"
             },
-            "marketcap_usd": 57715,
+            "marketcap_usd": 66098,
             "name": "Po.et Tokens",
             "network": "eth",
             "shortcut": "POE",
@@ -17832,7 +17813,7 @@
             "links": {
                 "Homepage": "https://polymath.network"
             },
-            "marketcap_usd": 240203817,
+            "marketcap_usd": 178335520,
             "name": "Polymath Network",
             "network": "eth",
             "shortcut": "POLY",
@@ -17910,7 +17891,7 @@
             "links": {
                 "Homepage": "https://powerledger.io"
             },
-            "marketcap_usd": 96355268,
+            "marketcap_usd": 104709098,
             "name": "PowerLedger",
             "network": "eth",
             "shortcut": "POWR",
@@ -17949,7 +17930,7 @@
                 "Github": "https://github.com/Bitpopulous",
                 "Homepage": "https://populous.co"
             },
-            "marketcap_usd": 3475930,
+            "marketcap_usd": 4787929,
             "name": "Populous",
             "network": "eth",
             "shortcut": "PPT",
@@ -18007,7 +17988,7 @@
             "links": {
                 "Homepage": "https://privatix.io"
             },
-            "marketcap_usd": 36757,
+            "marketcap_usd": 45253,
             "name": "Privatix",
             "network": "eth",
             "shortcut": "PRIX",
@@ -18066,7 +18047,7 @@
                 "Github": "https://github.com/propsproject",
                 "Homepage": "https://propsproject.com"
             },
-            "marketcap_usd": 537419,
+            "marketcap_usd": 824153,
             "name": "Props",
             "network": "eth",
             "shortcut": "PROPS",
@@ -18163,7 +18144,7 @@
             "links": {
                 "Homepage": "https://primas.io"
             },
-            "marketcap_usd": 504019,
+            "marketcap_usd": 659916,
             "name": "Primas",
             "network": "eth",
             "shortcut": "PST",
@@ -18222,7 +18203,7 @@
             "links": {
                 "Homepage": "https://patientory.com"
             },
-            "marketcap_usd": 204432,
+            "marketcap_usd": 483007,
             "name": "Patientory",
             "network": "eth",
             "shortcut": "PTOY",
@@ -18341,7 +18322,7 @@
                 "Github": "https://github.com/playgame-global",
                 "Homepage": "https://its.playgame.com"
             },
-            "marketcap_usd": 229958,
+            "marketcap_usd": 200007,
             "name": "PlayGame",
             "network": "eth",
             "shortcut": "PXG",
@@ -18418,7 +18399,7 @@
             "links": {
                 "Homepage": "https://liquid.plus"
             },
-            "marketcap_usd": 8040437,
+            "marketcap_usd": 9192048,
             "name": "QASH",
             "network": "eth",
             "shortcut": "QASH",
@@ -18496,7 +18477,7 @@
             "links": {
                 "Homepage": "https://quarkchain.io"
             },
-            "marketcap_usd": 70288774,
+            "marketcap_usd": 74074939,
             "name": "QuarkChain",
             "network": "eth",
             "shortcut": "QKC",
@@ -18516,7 +18497,7 @@
                 "Github": "https://github.com/quantnetwork",
                 "Homepage": "https://www.quant.network/"
             },
-            "marketcap_usd": 1937265880,
+            "marketcap_usd": 1530947563,
             "name": "Quant",
             "network": "eth",
             "shortcut": "QNT",
@@ -18575,7 +18556,7 @@
                 "Github": "https://github.com/quantstamp",
                 "Homepage": "https://quantstamp.com/"
             },
-            "marketcap_usd": 11074696,
+            "marketcap_usd": 11601312,
             "name": "Quantstamp Token",
             "network": "eth",
             "shortcut": "QSP",
@@ -18673,7 +18654,7 @@
                 "Github": "https://github.com/rokfin/eth-contracts",
                 "Homepage": "https://www.raetoken.org"
             },
-            "marketcap_usd": 7105329,
+            "marketcap_usd": 7985545,
             "name": "RAE Token",
             "network": "eth",
             "shortcut": "RAE",
@@ -18693,7 +18674,7 @@
                 "Github": "https://github.com/reflexer-labs/",
                 "Homepage": "https://reflexer.finance/"
             },
-            "marketcap_usd": 13330827,
+            "marketcap_usd": 6622639,
             "name": "Rai Reflex Index",
             "network": "eth",
             "shortcut": "RAI",
@@ -18732,7 +18713,7 @@
             "links": {
                 "Homepage": "http://token.dprating.com"
             },
-            "marketcap_usd": 314949,
+            "marketcap_usd": 344016,
             "name": "DPRating",
             "network": "eth",
             "shortcut": "RATING",
@@ -18752,7 +18733,7 @@
                 "Github": "https://github.com/rublixdev",
                 "Homepage": "https://rublix.io/"
             },
-            "marketcap_usd": 488481,
+            "marketcap_usd": 535673,
             "name": "Rublix",
             "network": "eth",
             "shortcut": "RBLX",
@@ -18791,7 +18772,7 @@
                 "Github": "https://github.com/ripio/rcn-token",
                 "Homepage": "https://ripiocredit.network"
             },
-            "marketcap_usd": 2163152,
+            "marketcap_usd": 1108878,
             "name": "Ripio Credit Network",
             "network": "eth",
             "shortcut": "RCN",
@@ -18811,7 +18792,7 @@
                 "Github": "https://github.com/raiden-network/raiden/",
                 "Homepage": "https://raiden.network"
             },
-            "marketcap_usd": 3580682,
+            "marketcap_usd": 2880243,
             "name": "Raiden Network",
             "network": "eth",
             "shortcut": "RDN",
@@ -18908,7 +18889,7 @@
                 "Github": "https://github.com/red",
                 "Homepage": "https://ico.red-lang.org"
             },
-            "marketcap_usd": 294012,
+            "marketcap_usd": 293525,
             "name": "Red Community Token",
             "network": "eth",
             "shortcut": "RED",
@@ -18948,7 +18929,7 @@
                 "Github": "http://github.com/reef-defi",
                 "Homepage": "http://reef.finance"
             },
-            "marketcap_usd": 103902135,
+            "marketcap_usd": 70777959,
             "name": "Reef Finance",
             "network": "eth",
             "shortcut": "REEF",
@@ -18986,7 +18967,7 @@
             "links": {
                 "Homepage": "https://remme.io"
             },
-            "marketcap_usd": 229320,
+            "marketcap_usd": 152526,
             "name": "Remme",
             "network": "eth",
             "shortcut": "REM",
@@ -19026,7 +19007,7 @@
                 "Github": "https://github.com/renproject",
                 "Homepage": "https://renproject.io/"
             },
-            "marketcap_usd": 121689922,
+            "marketcap_usd": 97699774,
             "name": "Republic Token",
             "network": "eth",
             "shortcut": "REN",
@@ -19045,7 +19026,7 @@
             "links": {
                 "Homepage": "https://augur.net"
             },
-            "marketcap_usd": 75174722,
+            "marketcap_usd": 100020697,
             "name": "Augur",
             "network": "eth",
             "shortcut": "REP",
@@ -19083,7 +19064,7 @@
             "links": {
                 "Homepage": "https://request.network"
             },
-            "marketcap_usd": 109511441,
+            "marketcap_usd": 113609078,
             "name": "Request Network",
             "network": "eth",
             "shortcut": "REQ",
@@ -19103,7 +19084,7 @@
                 "Github": "https://github.com/Revain",
                 "Homepage": "https://revain.org"
             },
-            "marketcap_usd": 65306287,
+            "marketcap_usd": 50618632,
             "name": "Revain",
             "network": "eth",
             "shortcut": "REV",
@@ -19142,7 +19123,7 @@
             "links": {
                 "Homepage": "https://refereum.com"
             },
-            "marketcap_usd": 29801018,
+            "marketcap_usd": 33221299,
             "name": "Refereum",
             "network": "eth",
             "shortcut": "RFR",
@@ -19219,7 +19200,7 @@
             "links": {
                 "Homepage": "http://iex.ec/"
             },
-            "marketcap_usd": 91098475,
+            "marketcap_usd": 154000623,
             "name": "IEx.ec",
             "network": "eth",
             "shortcut": "RLC",
@@ -19335,7 +19316,7 @@
             "links": {
                 "Homepage": "https://www.oneroot.io/en"
             },
-            "marketcap_usd": 466138,
+            "marketcap_usd": 532562,
             "name": "OneRoot Network",
             "network": "eth",
             "shortcut": "RNT",
@@ -19450,7 +19431,7 @@
             "links": {
                 "Homepage": "https://roobee.io/"
             },
-            "marketcap_usd": 3249133,
+            "marketcap_usd": 4479943,
             "name": "ROOBEE",
             "network": "eth",
             "shortcut": "ROOBEE",
@@ -19509,7 +19490,7 @@
                 "Github": "https://github.com/reserve-protocol/rsr-mainnet",
                 "Homepage": "https://reserve.org"
             },
-            "marketcap_usd": 269834814,
+            "marketcap_usd": 234795022,
             "name": "Reserve Rights",
             "network": "eth",
             "shortcut": "RSR",
@@ -19567,7 +19548,7 @@
             "links": {
                 "Homepage": "https://www.rotharium.io"
             },
-            "marketcap_usd": 2684480,
+            "marketcap_usd": 3022419,
             "name": "Rotharium",
             "network": "eth",
             "shortcut": "RTH",
@@ -19606,7 +19587,7 @@
             "links": {
                 "Homepage": "http://ruffchain.com"
             },
-            "marketcap_usd": 469488,
+            "marketcap_usd": 349118,
             "name": "Ruff",
             "network": "eth",
             "shortcut": "RUFF",
@@ -19664,7 +19645,7 @@
             "links": {
                 "Homepage": "https://rivetzintl.com"
             },
-            "marketcap_usd": 15264,
+            "marketcap_usd": 15562,
             "name": "Rivetz",
             "network": "eth",
             "shortcut": "RVT",
@@ -19780,7 +19761,7 @@
             "links": {
                 "Homepage": "https://saltlending.com"
             },
-            "marketcap_usd": 3777096,
+            "marketcap_usd": 6351019,
             "name": "Salt Lending Token",
             "network": "eth",
             "shortcut": "SALT",
@@ -19799,7 +19780,7 @@
             "links": {
                 "Homepage": "https://santiment.net"
             },
-            "marketcap_usd": 5247616,
+            "marketcap_usd": 3377746,
             "name": "Santiment",
             "network": "eth",
             "shortcut": "SAN",
@@ -19837,7 +19818,7 @@
             "links": {
                 "Homepage": "https://ico.nexus.social"
             },
-            "marketcap_usd": 40941,
+            "marketcap_usd": 0,
             "name": "SocialCoin",
             "network": "eth",
             "shortcut": "SCL",
@@ -19914,7 +19895,7 @@
             "links": {
                 "Homepage": "https://www.sentinel-chain.org"
             },
-            "marketcap_usd": 88114,
+            "marketcap_usd": 90109,
             "name": "Sentinel Chain",
             "network": "eth",
             "shortcut": "SENC",
@@ -20126,7 +20107,7 @@
             "links": {
                 "Homepage": "https://shibatoken.com"
             },
-            "marketcap_usd": 6622933610,
+            "marketcap_usd": 6796478899,
             "name": "SHIBA INU",
             "network": "eth",
             "shortcut": "SHIB",
@@ -20300,7 +20281,7 @@
             "links": {
                 "Homepage": "https://www.skb-coin.jp/en"
             },
-            "marketcap_usd": 303604,
+            "marketcap_usd": 364958,
             "name": "Sakura Bloom",
             "network": "eth",
             "shortcut": "SKB",
@@ -20339,7 +20320,7 @@
                 "Github": "https://github.com/Steamtradenet/smart-contract",
                 "Homepage": "https://skincoin.org"
             },
-            "marketcap_usd": 42310,
+            "marketcap_usd": 53089,
             "name": "SKIN",
             "network": "eth",
             "shortcut": "SKIN",
@@ -20435,7 +20416,7 @@
             "links": {
                 "Homepage": "https://youengine.io"
             },
-            "marketcap_usd": 137424432,
+            "marketcap_usd": 137126516,
             "name": "Smooth Love Potion",
             "network": "eth",
             "shortcut": "SLP",
@@ -20512,7 +20493,7 @@
             "links": {
                 "Homepage": "https://suncontract.org"
             },
-            "marketcap_usd": 3104164,
+            "marketcap_usd": 3613310,
             "name": "SunContract",
             "network": "eth",
             "shortcut": "SNC",
@@ -20648,7 +20629,7 @@
                 "Github": "https://github.com/status-im",
                 "Homepage": "https://status.im"
             },
-            "marketcap_usd": 96694800,
+            "marketcap_usd": 117873087,
             "name": "Status Network Token",
             "network": "eth",
             "shortcut": "SNT",
@@ -20662,45 +20643,6 @@
                 }
             ]
         },
-        "erc20:eth:SNTR": {
-            "address": "0x2859021eE7F2Cb10162E67F33Af2D22764B31aFf",
-            "links": {
-                "Homepage": "https://silentnotary.com"
-            },
-            "marketcap_usd": 0,
-            "name": "Silent Notary",
-            "network": "eth",
-            "shortcut": "SNTR",
-            "t1_enabled": "yes",
-            "t2_enabled": "yes",
-            "type": "erc20",
-            "wallet": [
-                {
-                    "name": "Trezor Suite",
-                    "url": "https://suite.trezor.io"
-                }
-            ]
-        },
-        "erc20:eth:SNX:c011": {
-            "address": "0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F",
-            "links": {
-                "Github": "https://github.com/havven/havven",
-                "Homepage": "https://synthetix.io"
-            },
-            "marketcap_usd": 734410291,
-            "name": "Synthetix Network Token",
-            "network": "eth",
-            "shortcut": "SNX",
-            "t1_enabled": "yes",
-            "t2_enabled": "yes",
-            "type": "erc20",
-            "wallet": [
-                {
-                    "name": "Trezor Suite",
-                    "url": "https://suite.trezor.io"
-                }
-            ]
-        },
         "erc20:eth:SOAR": {
             "address": "0xD65960FAcb8E4a2dFcb2C2212cb2e44a02e2a57E",
             "links": {
@@ -20725,7 +20667,7 @@
             "links": {
                 "Homepage": "https://www.allsportschain.com"
             },
-            "marketcap_usd": 2504853,
+            "marketcap_usd": 2272034,
             "name": "All Sports",
             "network": "eth",
             "shortcut": "SOC",
@@ -20783,7 +20725,7 @@
                 "Github": "https://github.com/cryptosoulgame",
                 "Homepage": "https://cryptosoul.io/"
             },
-            "marketcap_usd": 158451,
+            "marketcap_usd": 125890,
             "name": "CryptoSoul",
             "network": "eth",
             "shortcut": "SOUL",
@@ -20919,7 +20861,7 @@
             "links": {
                 "Homepage": "https://spindle.zone"
             },
-            "marketcap_usd": 87705,
+            "marketcap_usd": 23855,
             "name": "SPINDLE",
             "network": "eth",
             "shortcut": "SPD",
@@ -21016,7 +20958,7 @@
                 "Github": "https://github.com/sirin-labs/crowdsale-smart-contract",
                 "Homepage": "https://sirinlabs.com"
             },
-            "marketcap_usd": 1207199,
+            "marketcap_usd": 916240,
             "name": "Sirin Labs",
             "network": "eth",
             "shortcut": "SRN",
@@ -21050,31 +20992,12 @@
                 }
             ]
         },
-        "erc20:eth:SSH": {
-            "address": "0x6e2050CBFB3eD8A4d39b64cC9f47E711a03a5a89",
-            "links": {
-                "Homepage": "https://www.stream.space"
-            },
-            "marketcap_usd": 0,
-            "name": "StreamShares",
-            "network": "eth",
-            "shortcut": "SSH",
-            "t1_enabled": "yes",
-            "t2_enabled": "yes",
-            "type": "erc20",
-            "wallet": [
-                {
-                    "name": "Trezor Suite",
-                    "url": "https://suite.trezor.io"
-                }
-            ]
-        },
         "erc20:eth:SSP": {
             "address": "0x624d520BAB2E4aD83935Fa503fB130614374E850",
             "links": {
                 "Homepage": "https://smartshare.vip/#"
             },
-            "marketcap_usd": 64955,
+            "marketcap_usd": 150024,
             "name": "Smartshare",
             "network": "eth",
             "shortcut": "SSP",
@@ -21112,7 +21035,7 @@
             "links": {
                 "Homepage": "https://coinstarter.com"
             },
-            "marketcap_usd": 9972,
+            "marketcap_usd": 9313,
             "name": "Starter Coin",
             "network": "eth",
             "shortcut": "STAC",
@@ -21150,7 +21073,7 @@
             "links": {
                 "Homepage": "http://starbase.co"
             },
-            "marketcap_usd": 141366,
+            "marketcap_usd": 37318,
             "name": "Star Token",
             "network": "eth",
             "shortcut": "STAR",
@@ -21306,7 +21229,7 @@
                 "Github": "https://github.com/Storj",
                 "Homepage": "https://storj.io"
             },
-            "marketcap_usd": 188212148,
+            "marketcap_usd": 178806759,
             "name": "STORJ",
             "network": "eth",
             "shortcut": "STORJ",
@@ -21384,7 +21307,7 @@
             "links": {
                 "Homepage": "https://staker.network"
             },
-            "marketcap_usd": 346,
+            "marketcap_usd": 0,
             "name": "Staker",
             "network": "eth",
             "shortcut": "STR",
@@ -21443,7 +21366,7 @@
                 "Github": "https://github.com/stx-technologies/stox-token",
                 "Homepage": "https://www.stox.com"
             },
-            "marketcap_usd": 192514,
+            "marketcap_usd": 184023,
             "name": "StoxToken",
             "network": "eth",
             "shortcut": "STX",
@@ -21463,7 +21386,7 @@
                 "Github": "https://github.com/SubstratumNetwork",
                 "Homepage": "https://substratum.net"
             },
-            "marketcap_usd": 254151,
+            "marketcap_usd": 186040,
             "name": "Substratum",
             "network": "eth",
             "shortcut": "SUB",
@@ -21502,7 +21425,7 @@
                 "Github": "https://github.com/sushiswap",
                 "Homepage": "https://sushiswapclassic.org/"
             },
-            "marketcap_usd": 192919186,
+            "marketcap_usd": 288234769,
             "name": "SushiToken",
             "network": "eth",
             "shortcut": "SUSHI",
@@ -21561,7 +21484,7 @@
                 "Github": "https://github.com/swashapp/",
                 "Homepage": "https://swashapp.io/"
             },
-            "marketcap_usd": 6562959,
+            "marketcap_usd": 12397242,
             "name": "Swash Token",
             "network": "eth",
             "shortcut": "SWASH",
@@ -21580,7 +21503,7 @@
             "links": {
                 "Homepage": "http://www.swftcoin.com"
             },
-            "marketcap_usd": 5678376,
+            "marketcap_usd": 5259537,
             "name": "SwftCoin",
             "network": "eth",
             "shortcut": "SWFTC",
@@ -21614,12 +21537,31 @@
                 }
             ]
         },
+        "erc20:eth:SWRM": {
+            "address": "0x6e2050CBFB3eD8A4d39b64cC9f47E711a03a5a89",
+            "links": {
+                "Homepage": "https://www.stream.space"
+            },
+            "marketcap_usd": 0,
+            "name": "StreamShares",
+            "network": "eth",
+            "shortcut": "SWRM",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:SWT": {
             "address": "0xB9e7F8568e08d5659f5D29C4997173d84CdF2607",
             "links": {
                 "Homepage": "http://swarm.city"
             },
-            "marketcap_usd": 331278,
+            "marketcap_usd": 264688,
             "name": "Swarm City Token",
             "network": "eth",
             "shortcut": "SWT",
@@ -21677,7 +21619,7 @@
             "links": {
                 "Homepage": "http://www.spectre.ai"
             },
-            "marketcap_usd": 35050,
+            "marketcap_usd": 0,
             "name": "Spectre.ai U-Token",
             "network": "eth",
             "shortcut": "SXUT",
@@ -21768,6 +21710,26 @@
                 }
             ]
         },
+        "erc20:eth:Skey": {
+            "address": "0x06A01a4d579479Dd5D884EBf61A31727A3d8D442",
+            "links": {
+                "Github": "https://github.com/skey-network",
+                "Homepage": "https://skey.network"
+            },
+            "marketcap_usd": 3338194,
+            "name": "Skey Network",
+            "network": "eth",
+            "shortcut": "Skey",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:TALAO": {
             "address": "0x1D4cCC31dAB6EA20f461d329a0562C1c58412515",
             "links": {
@@ -21792,7 +21754,7 @@
             "links": {
                 "Homepage": "https://taklimakan.io"
             },
-            "marketcap_usd": 19916,
+            "marketcap_usd": 0,
             "name": "Taklimakan Network",
             "network": "eth",
             "shortcut": "TAN",
@@ -21950,7 +21912,7 @@
             "links": {
                 "Homepage": "https://tokenbox.io"
             },
-            "marketcap_usd": 20127,
+            "marketcap_usd": 14975,
             "name": "Tokenbox",
             "network": "eth",
             "shortcut": "TBX",
@@ -22009,7 +21971,7 @@
             "links": {
                 "Homepage": "https://www.thorecash.com"
             },
-            "marketcap_usd": 7323,
+            "marketcap_usd": 5891,
             "name": "Thore Cash",
             "network": "eth",
             "shortcut": "TCH",
@@ -22100,6 +22062,25 @@
                 }
             ]
         },
+        "erc20:eth:TDX": {
+            "address": "0x317eb4ad9cfaC6232f0046831322E895507bcBeb",
+            "links": {
+                "Homepage": "https://tidex.com/"
+            },
+            "marketcap_usd": 0,
+            "name": "Tidex Token",
+            "network": "eth",
+            "shortcut": "TDX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:TEAM": {
             "address": "0x1c79ab32C66aCAa1e9E81952B8AAa581B43e54E7",
             "links": {
@@ -22143,7 +22124,7 @@
             "links": {
                 "Homepage": "https://www.tokenomy.com"
             },
-            "marketcap_usd": 4610212,
+            "marketcap_usd": 5058206,
             "name": "Tokenomy",
             "network": "eth",
             "shortcut": "TEN",
@@ -22376,7 +22357,7 @@
             "links": {
                 "Homepage": "https://chronobase.eu/"
             },
-            "marketcap_usd": 153209,
+            "marketcap_usd": 145674,
             "name": "ChronoBase",
             "network": "eth",
             "shortcut": "TIK",
@@ -22433,7 +22414,7 @@
             "links": {
                 "Homepage": "https://www.blocktix.io"
             },
-            "marketcap_usd": 8165,
+            "marketcap_usd": 0,
             "name": "Blocktix",
             "network": "eth",
             "shortcut": "TIX",
@@ -22490,7 +22471,7 @@
             "links": {
                 "Homepage": "https://etherscan.io/token/TokenCard"
             },
-            "marketcap_usd": 2450113,
+            "marketcap_usd": 2583432,
             "name": "TokenCard",
             "network": "eth",
             "shortcut": "TKN",
@@ -22510,7 +22491,7 @@
                 "Github": "https://github.com/Tokpie/tokpie-contract",
                 "Homepage": "https://tokpie.io/"
             },
-            "marketcap_usd": 5478008,
+            "marketcap_usd": 4434791,
             "name": "TOKPIE",
             "network": "eth",
             "shortcut": "TKP",
@@ -22607,7 +22588,7 @@
             "links": {
                 "Homepage": "https://transcodium.com"
             },
-            "marketcap_usd": 31401,
+            "marketcap_usd": 28525,
             "name": "Transcodium",
             "network": "eth",
             "shortcut": "TNS",
@@ -22685,7 +22666,7 @@
             "links": {
                 "Homepage": "https://origintrail.io"
             },
-            "marketcap_usd": 83002002,
+            "marketcap_usd": 134439035,
             "name": "OriginTrail",
             "network": "eth",
             "shortcut": "TRAC",
@@ -22781,7 +22762,7 @@
                 "Github": "https://github.com/WeTrustPlatform",
                 "Homepage": "https://www.wetrust.io"
             },
-            "marketcap_usd": 180864,
+            "marketcap_usd": 184461,
             "name": "WeTrust",
             "network": "eth",
             "shortcut": "TRST",
@@ -22795,6 +22776,25 @@
                 }
             ]
         },
+        "erc20:eth:TRUCCO": {
+            "address": "0xf10E3E8F6B02B594b7C95fca59DC7E5ce7364df5",
+            "links": {
+                "Homepage": "https://trucco.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Truco Token",
+            "network": "eth",
+            "shortcut": "TRUCCO",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:TSW": {
             "address": "0x6B87999bE87358065bBdE41e8a0fe0B7b1cd2514",
             "links": {
@@ -22898,7 +22898,7 @@
                 "Github": "https://github.com/trusttoken",
                 "Homepage": "https://www.trusttoken.com"
             },
-            "marketcap_usd": 820554921,
+            "marketcap_usd": 1116979619,
             "name": "TrueUSD",
             "network": "eth",
             "shortcut": "TUSD",
@@ -22995,7 +22995,7 @@
                 "Github": "https://github.com/ubex-ai",
                 "Homepage": "https://www.ubex.com/"
             },
-            "marketcap_usd": 274997,
+            "marketcap_usd": 125184,
             "name": "UBEX Token",
             "network": "eth",
             "shortcut": "UBEX",
@@ -23014,7 +23014,7 @@
             "links": {
                 "Homepage": "https://unibright.io"
             },
-            "marketcap_usd": 32157926,
+            "marketcap_usd": 22769484,
             "name": "Unibright",
             "network": "eth",
             "shortcut": "UBT",
@@ -23091,7 +23091,7 @@
             "links": {
                 "Homepage": "https://www.upfiring.com"
             },
-            "marketcap_usd": 764252,
+            "marketcap_usd": 415184,
             "name": "Upfiring",
             "network": "eth",
             "shortcut": "UFR",
@@ -23131,7 +23131,7 @@
                 "Github": "https://github.com/umbrella-network",
                 "Homepage": "https://umb.network/"
             },
-            "marketcap_usd": 790885,
+            "marketcap_usd": 1566544,
             "name": "Umbrella",
             "network": "eth",
             "shortcut": "UMB",
@@ -23150,7 +23150,7 @@
             "links": {
                 "Homepage": "https://uniswap.org/"
             },
-            "marketcap_usd": 5269763951,
+            "marketcap_usd": 4976163328,
             "name": "Uniswap",
             "network": "eth",
             "shortcut": "UNI",
@@ -23169,7 +23169,7 @@
             "links": {
                 "Homepage": "https://uptoken.org"
             },
-            "marketcap_usd": 39773,
+            "marketcap_usd": 46974,
             "name": "UpToken",
             "network": "eth",
             "shortcut": "UP",
@@ -23188,7 +23188,7 @@
             "links": {
                 "Homepage": "https://sentinelprotocol.io"
             },
-            "marketcap_usd": 27540163,
+            "marketcap_usd": 34499041,
             "name": "Sentinel Protocol",
             "network": "eth",
             "shortcut": "UPP",
@@ -23287,7 +23287,7 @@
                 "Github": "https://github.com/centrehq/centre-tokens",
                 "Homepage": "https://www.centre.io"
             },
-            "marketcap_usd": 43023962517,
+            "marketcap_usd": 42518789234,
             "name": "USD//Coin",
             "network": "eth",
             "shortcut": "USDC",
@@ -23301,12 +23301,32 @@
                 }
             ]
         },
+        "erc20:eth:USDP": {
+            "address": "0x8E870D67F660D95d5be530380D0eC0bd388289E1",
+            "links": {
+                "Github": "https://github.com/paxosglobal",
+                "Homepage": "https://www.paxos.com/standard"
+            },
+            "marketcap_usd": 877457873,
+            "name": "Paxos Standard (PAX)",
+            "network": "eth",
+            "shortcut": "USDP",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:USDS": {
             "address": "0xA4Bdb11dc0a2bEC88d24A3aa1E6Bb17201112eBe",
             "links": {
                 "Homepage": "https://stably.io"
             },
-            "marketcap_usd": 462950,
+            "marketcap_usd": 462366,
             "name": "StableUSD",
             "network": "eth",
             "shortcut": "USDS",
@@ -23325,7 +23345,7 @@
             "links": {
                 "Homepage": "https://tether.to"
             },
-            "marketcap_usd": 69415999585,
+            "marketcap_usd": 70941600691,
             "name": "USD Tether (erc20)",
             "network": "eth",
             "shortcut": "USDT",
@@ -23365,7 +23385,7 @@
                 "Github": "https://github.com/utrustdev/",
                 "Homepage": "https://utrust.com"
             },
-            "marketcap_usd": 71785543,
+            "marketcap_usd": 58070830,
             "name": "Utrust",
             "network": "eth",
             "shortcut": "UTK",
@@ -23423,7 +23443,7 @@
             "links": {
                 "Homepage": "https://u.network/"
             },
-            "marketcap_usd": 302316,
+            "marketcap_usd": 268098,
             "name": "U Networks",
             "network": "eth",
             "shortcut": "UUU",
@@ -23443,7 +23463,7 @@
                 "Github": "https://github.com/smartvalor/ValorToken",
                 "Homepage": "https://smartvalor.com"
             },
-            "marketcap_usd": 4175274,
+            "marketcap_usd": 4484748,
             "name": "ValorToken",
             "network": "eth",
             "shortcut": "VALOR",
@@ -23483,7 +23503,7 @@
                 "Github": "https://github.com/VeriDocGlobal",
                 "Homepage": "https://www.veridocglobal.com/"
             },
-            "marketcap_usd": 2253205,
+            "marketcap_usd": 1861173,
             "name": "VeriDocGlobal",
             "network": "eth",
             "shortcut": "VDG",
@@ -23523,7 +23543,7 @@
                 "Github": "https://github.com/blockv",
                 "Homepage": "https://blockv.io"
             },
-            "marketcap_usd": 10800084,
+            "marketcap_usd": 9193229,
             "name": "BLOCKv",
             "network": "eth",
             "shortcut": "VEE",
@@ -23543,7 +23563,7 @@
                 "Github": "https://github.com/vegaprotocol",
                 "Homepage": "https://vega.xyz"
             },
-            "marketcap_usd": 40734485,
+            "marketcap_usd": 57183218,
             "name": "Vega",
             "network": "eth",
             "shortcut": "VEGA",
@@ -23600,7 +23620,7 @@
             "links": {
                 "Homepage": "https://veritas.veritaseum.com"
             },
-            "marketcap_usd": 114662928,
+            "marketcap_usd": 67691562,
             "name": "Veritaseum",
             "network": "eth",
             "shortcut": "VERI",
@@ -23619,7 +23639,7 @@
             "links": {
                 "Homepage": "https://www.viberate.com"
             },
-            "marketcap_usd": 13703693,
+            "marketcap_usd": 21389600,
             "name": "Viberate",
             "network": "eth",
             "shortcut": "VIB",
@@ -23638,7 +23658,7 @@
             "links": {
                 "Homepage": "https://www.vibehub.io"
             },
-            "marketcap_usd": 636043,
+            "marketcap_usd": 448626,
             "name": "VIBE Coin",
             "network": "eth",
             "shortcut": "VIBE",
@@ -23678,7 +23698,7 @@
                 "Github": "https://github.com/videocoin",
                 "Homepage": "https://www.videocoin.io"
             },
-            "marketcap_usd": 7151414,
+            "marketcap_usd": 4612359,
             "name": "VideoCoin",
             "network": "eth",
             "shortcut": "VID",
@@ -23737,7 +23757,7 @@
             "links": {
                 "Homepage": "https://ico.vikky.io"
             },
-            "marketcap_usd": 57685,
+            "marketcap_usd": 60643,
             "name": "VikkyToken",
             "network": "eth",
             "shortcut": "VIKKY",
@@ -23951,7 +23971,7 @@
             "links": {
                 "Homepage": "https://victoriavr.com/"
             },
-            "marketcap_usd": 8622254,
+            "marketcap_usd": 11153234,
             "name": "Victoria VR",
             "network": "eth",
             "shortcut": "VR",
@@ -24086,7 +24106,7 @@
             "links": {
                 "Homepage": "https://wab.network"
             },
-            "marketcap_usd": 263029,
+            "marketcap_usd": 276519,
             "name": "WABnetwork",
             "network": "eth",
             "shortcut": "WAB",
@@ -24105,7 +24125,7 @@
             "links": {
                 "Homepage": "https://taelpay.com"
             },
-            "marketcap_usd": 10719972,
+            "marketcap_usd": 13590697,
             "name": "Tael",
             "network": "eth",
             "shortcut": "WABI",
@@ -24224,7 +24244,7 @@
                 "Github": "https://github.com/WrappedBTC",
                 "Homepage": "https://wbtc.network"
             },
-            "marketcap_usd": 5005923961,
+            "marketcap_usd": 3841396768,
             "name": "Wrapped Bitcoin",
             "network": "eth",
             "shortcut": "WBTC",
@@ -24297,6 +24317,26 @@
                 }
             ]
         },
+        "erc20:eth:WDOGE": {
+            "address": "0x8aa9381b2544b48c26f3b850F6e07E2c5161EB3e",
+            "links": {
+                "Github": "https://github.com/WrappedBTC/bitcoin-token-smart-contracts/blob/master/ethereumV2/contracts/token/WDOGE.sol",
+                "Homepage": "https://wdoge.tech/"
+            },
+            "marketcap_usd": 0,
+            "name": "Wrapped DOGE",
+            "network": "eth",
+            "shortcut": "WDOGE",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:WEB": {
             "address": "0x840fe75ABfaDc0F2d54037829571B2782e919ce4",
             "links": {
@@ -24419,7 +24459,7 @@
             "links": {
                 "Homepage": "https://wings.ai"
             },
-            "marketcap_usd": 438057,
+            "marketcap_usd": 176076,
             "name": "WINGS",
             "network": "eth",
             "shortcut": "WINGS",
@@ -24595,7 +24635,7 @@
             "links": {
                 "Homepage": "https://wepower.network"
             },
-            "marketcap_usd": 499436,
+            "marketcap_usd": 166674,
             "name": "WePower Token",
             "network": "eth",
             "shortcut": "WPR",
@@ -24614,7 +24654,7 @@
             "links": {
                 "Homepage": "https://worldcore.eu"
             },
-            "marketcap_usd": 27825,
+            "marketcap_usd": 59023,
             "name": "Worldcore",
             "network": "eth",
             "shortcut": "WRC",
@@ -24733,7 +24773,7 @@
             "links": {
                 "Homepage": "https://x8currency.com"
             },
-            "marketcap_usd": 607929,
+            "marketcap_usd": 529029,
             "name": "X8X",
             "network": "eth",
             "shortcut": "X8X",
@@ -24771,7 +24811,7 @@
             "links": {
                 "Homepage": "http://www.xaurum.org"
             },
-            "marketcap_usd": 1482163,
+            "marketcap_usd": 1880493,
             "name": "Xaurum",
             "network": "eth",
             "shortcut": "XAUR",
@@ -24810,7 +24850,7 @@
                 "Github": "https://github.com/blitzpredict",
                 "Homepage": "https://www.blitzpredict.io"
             },
-            "marketcap_usd": 54445,
+            "marketcap_usd": 58228,
             "name": "BlitzPredict",
             "network": "eth",
             "shortcut": "XBP",
@@ -24849,7 +24889,7 @@
             "links": {
                 "Homepage": "https://www.swisscryptotokens.ch/"
             },
-            "marketcap_usd": 3067642,
+            "marketcap_usd": 3302072,
             "name": "CryptoFranc",
             "network": "eth",
             "shortcut": "XCHF",
@@ -24902,6 +24942,26 @@
                 }
             ]
         },
+        "erc20:eth:XDATA": {
+            "address": "0x0Cf0Ee63788A0849fE5297F3407f701E122cC023",
+            "links": {
+                "Github": "https://github.com/streamr-dev",
+                "Homepage": "https://www.streamr.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Streamr DATAcoin",
+            "network": "eth",
+            "shortcut": "XDATA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:XDCE": {
             "address": "0x41AB1b6fcbB2fA9DCEd81aCbdeC13Ea6315F2Bf2",
             "links": {
@@ -25081,7 +25141,7 @@
             "links": {
                 "Homepage": "https://xio.network/"
             },
-            "marketcap_usd": 460358,
+            "marketcap_usd": 244530,
             "name": "XIO Network",
             "network": "eth",
             "shortcut": "XIO",
@@ -25140,7 +25200,7 @@
                 "Github": "https://github.com/XMaxPlatform",
                 "Homepage": "https://www.xmx.com"
             },
-            "marketcap_usd": 586053,
+            "marketcap_usd": 304015,
             "name": "XMax",
             "network": "eth",
             "shortcut": "XMX",
@@ -25217,7 +25277,7 @@
             "links": {
                 "Homepage": "http://www.xov.io"
             },
-            "marketcap_usd": 4387,
+            "marketcap_usd": 4613,
             "name": "XOVBank",
             "network": "eth",
             "shortcut": "XOV",
@@ -25236,7 +25296,7 @@
             "links": {
                 "Homepage": "https://xpa.io"
             },
-            "marketcap_usd": 30973,
+            "marketcap_usd": 32562,
             "name": "XPA",
             "network": "eth",
             "shortcut": "XPA",
@@ -25296,7 +25356,7 @@
                 "Github": "https://github.com/ProtonProtocol",
                 "Homepage": "https://www.protonchain.com/"
             },
-            "marketcap_usd": 32249238,
+            "marketcap_usd": 24851023,
             "name": "Proton",
             "network": "eth",
             "shortcut": "XPR",
@@ -25315,7 +25375,7 @@
             "links": {
                 "Homepage": "https://cryptobuyer.io"
             },
-            "marketcap_usd": 12921,
+            "marketcap_usd": 0,
             "name": "Cryptobuyer Token",
             "network": "eth",
             "shortcut": "XPT",
@@ -25373,7 +25433,7 @@
                 "Github": "https://github.com/Xfers/StraitsX-tokens",
                 "Homepage": "https://xfers.com/sg/stablecoin"
             },
-            "marketcap_usd": 62481970,
+            "marketcap_usd": 59730862,
             "name": "Singapore-Dollar Backed Stablecoin",
             "network": "eth",
             "shortcut": "XSGD",
@@ -25392,7 +25452,7 @@
             "links": {
                 "Homepage": "https://xyo.network"
             },
-            "marketcap_usd": 75464119,
+            "marketcap_usd": 72604094,
             "name": "XYO",
             "network": "eth",
             "shortcut": "XYO",
@@ -25451,7 +25511,7 @@
             "links": {
                 "Homepage": "http://www.yeefoundation.com"
             },
-            "marketcap_usd": 120132,
+            "marketcap_usd": 244413,
             "name": "Yee Token",
             "network": "eth",
             "shortcut": "YEE",
@@ -25471,7 +25531,7 @@
                 "Github": "https://github.com/iearn-finance",
                 "Homepage": "https://yearn.finance/"
             },
-            "marketcap_usd": 288446827,
+            "marketcap_usd": 341339987,
             "name": "yearn.finance",
             "network": "eth",
             "shortcut": "YFI",
@@ -25491,7 +25551,7 @@
                 "Github": "https://github.com/yfii/vault",
                 "Homepage": "https://dfi.money/"
             },
-            "marketcap_usd": 49157075,
+            "marketcap_usd": 50523406,
             "name": "YFII.finance",
             "network": "eth",
             "shortcut": "YFII",
@@ -25571,7 +25631,7 @@
                 "Github": "https://github.com/zapproject",
                 "Homepage": "https://zap.store"
             },
-            "marketcap_usd": 818230,
+            "marketcap_usd": 842523,
             "name": "ZAP",
             "network": "eth",
             "shortcut": "ZAP",
@@ -25590,7 +25650,7 @@
             "links": {
                 "Homepage": "https://0chain.net"
             },
-            "marketcap_usd": 8387189,
+            "marketcap_usd": 10060329,
             "name": "0chain",
             "network": "eth",
             "shortcut": "ZCN",
@@ -25628,7 +25688,7 @@
             "links": {
                 "Homepage": "https://zsc.io/"
             },
-            "marketcap_usd": 133916,
+            "marketcap_usd": 93153,
             "name": "Zeusshield",
             "network": "eth",
             "shortcut": "ZCS",
@@ -25706,7 +25766,7 @@
                 "Github": "https://github.com/ZEUS-coin",
                 "Homepage": "https://zeusfundme.com/"
             },
-            "marketcap_usd": 14288,
+            "marketcap_usd": 0,
             "name": "ZeusNetwork",
             "network": "eth",
             "shortcut": "ZEUS",
@@ -25725,7 +25785,7 @@
             "links": {
                 "Homepage": "https://zinc.work"
             },
-            "marketcap_usd": 4915,
+            "marketcap_usd": 5020,
             "name": "ZINC",
             "network": "eth",
             "shortcut": "ZINC",
@@ -25860,7 +25920,7 @@
             "links": {
                 "Homepage": "https://zper.io"
             },
-            "marketcap_usd": 21616,
+            "marketcap_usd": 0,
             "name": "ZPER",
             "network": "eth",
             "shortcut": "ZPR",
@@ -25880,7 +25940,7 @@
                 "Github": "https://github.com/0xProject",
                 "Homepage": "https://0xproject.com"
             },
-            "marketcap_usd": 214088667,
+            "marketcap_usd": 222664444,
             "name": "0x Project",
             "network": "eth",
             "shortcut": "ZRX",
@@ -26996,7 +27056,7 @@
                 "Github": "https://github.com/eosdac",
                 "Homepage": "https://eosdac.io/"
             },
-            "marketcap_usd": 310246,
+            "marketcap_usd": 295500,
             "name": "eosDAC",
             "network": "eth",
             "shortcut": "eosDAC",
@@ -27050,6 +27110,26 @@
                 }
             ]
         },
+        "erc20:eth:iBBT": {
+            "address": "0x691c25C461DaFC47792b6E4d674FBB637bca1C6F",
+            "links": {
+                "Github": "https://github.com/Geopay/iBlockchain-Bank-and-Trust-Utility-Token",
+                "Homepage": "https://ibbt.io"
+            },
+            "marketcap_usd": 0,
+            "name": "iBBT Utility Token",
+            "network": "eth",
+            "shortcut": "iBBT",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "erc20",
+            "wallet": [
+                {
+                    "name": "Trezor Suite",
+                    "url": "https://suite.trezor.io"
+                }
+            ]
+        },
         "erc20:eth:iKNC": {
             "address": "0x1cC9567EA2eB740824a45F8026cCF8e46973234D",
             "links": {
@@ -33199,8 +33279,12 @@
             "type": "erc20",
             "wallet": [
                 {
-                    "name": "Trezor Suite",
-                    "url": "https://suite.trezor.io"
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
                 }
             ]
         },
@@ -33218,12 +33302,16 @@
             "type": "erc20",
             "wallet": [
                 {
-                    "name": "Trezor Suite",
-                    "url": "https://suite.trezor.io"
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
                 }
             ]
         },
-        "erc20:rsk:BPro": {
+        "erc20:rsk:BITP": {
             "address": "0x440CD83C160De5C96Ddb20246815eA44C7aBBCa8",
             "links": {
                 "Github": "https://github.com/money-on-chain/",
@@ -33232,7 +33320,7 @@
             "marketcap_usd": 0,
             "name": "BitPro",
             "network": "rsk",
-            "shortcut": "BPro",
+            "shortcut": "BITP",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "erc20",
@@ -33551,6 +33639,27 @@
                 }
             ]
         },
+        "eth:$BNI": {
+            "links": {
+                "Homepage": "https://bitindi.org"
+            },
+            "marketcap_usd": 0,
+            "name": "Bitindi",
+            "shortcut": "$BNI",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:$OC": {
             "links": {
                 "Homepage": "https://digitalnext.business/SocialSmartChain"
@@ -33572,13 +33681,13 @@
                 }
             ]
         },
-        "eth:0xF": {
+        "eth:0XT": {
             "links": {
-                "Homepage": "https://freighttrust.com"
+                "Homepage": "https://www.0xtrade.finance/"
             },
             "marketcap_usd": 0,
-            "name": "Freight Trust Network",
-            "shortcut": "0xF",
+            "name": "0XTade",
+            "shortcut": "0XT",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -33593,13 +33702,13 @@
                 }
             ]
         },
-        "eth:420": {
+        "eth:0xF": {
             "links": {
-                "Homepage": "https://420integrated.com"
+                "Homepage": "https://freighttrust.com"
             },
             "marketcap_usd": 0,
-            "name": "420coin",
-            "shortcut": "420",
+            "name": "Freight Trust Network",
+            "shortcut": "0xF",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -33656,11 +33765,32 @@
                 }
             ]
         },
+        "eth:ACE": {
+            "links": {
+                "Homepage": "https://ace.fusionist.io/"
+            },
+            "marketcap_usd": 0,
+            "name": "Endurance Smart Chain",
+            "shortcut": "ACE",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:AIOZ": {
             "links": {
                 "Homepage": "https://aioz.network"
             },
-            "marketcap_usd": 32129157,
+            "marketcap_usd": 33770520,
             "name": "AIOZ Network",
             "shortcut": "AIOZ",
             "t1_enabled": "yes",
@@ -33702,7 +33832,7 @@
             "links": {
                 "Homepage": "https://akroma.io"
             },
-            "marketcap_usd": 15658,
+            "marketcap_usd": 22416,
             "name": "Akroma",
             "shortcut": "AKA",
             "t1_enabled": "yes",
@@ -33719,6 +33849,132 @@
                 }
             ]
         },
+        "eth:ALOT": {
+            "links": {
+                "Homepage": "https://dexalot.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Dexalot Subnet",
+            "shortcut": "ALOT",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:ALPH": {
+            "links": {
+                "Homepage": "https://alph.network"
+            },
+            "marketcap_usd": 0,
+            "name": "Alph Network",
+            "shortcut": "ALPH",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:ALT": {
+            "links": {
+                "Homepage": "https://altcoinchain.org"
+            },
+            "marketcap_usd": 0,
+            "name": "Altcoinchain",
+            "shortcut": "ALT",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:ALYX": {
+            "links": {
+                "Homepage": "https://www.alyxchain.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Alyx",
+            "shortcut": "ALYX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:AMAX": {
+            "links": {
+                "Homepage": "https://amax.network"
+            },
+            "marketcap_usd": 0,
+            "name": "Armonia Eva Chain",
+            "shortcut": "AMAX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:AMB": {
+            "links": {
+                "Homepage": "https://airdao.io"
+            },
+            "marketcap_usd": 27921475,
+            "name": "AirDAO",
+            "shortcut": "AMB",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:AMBROS": {
             "links": {
                 "Homepage": "https://ambros.network"
@@ -33761,6 +34017,27 @@
                 }
             ]
         },
+        "eth:ANY": {
+            "links": {
+                "Homepage": "https://evm.anytype.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Anytype EVM Chain",
+            "shortcut": "ANY",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:APTA": {
             "links": {
                 "Homepage": "https://bloqs4good.com"
@@ -33803,6 +34080,48 @@
                 }
             ]
         },
+        "eth:AR\u00c9V": {
+            "links": {
+                "Homepage": ""
+            },
+            "marketcap_usd": 0,
+            "name": "Arevia",
+            "shortcut": "AR\u00c9V",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:ASA": {
+            "links": {
+                "Homepage": "https://astranaut.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Astra",
+            "shortcut": "ASA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:ASK": {
             "links": {
                 "Homepage": "https://permission.io/"
@@ -33828,7 +34147,7 @@
             "links": {
                 "Homepage": "https://astar.network/"
             },
-            "marketcap_usd": 149516327,
+            "marketcap_usd": 328182166,
             "name": "Astar",
             "shortcut": "ASTR",
             "t1_enabled": "yes",
@@ -33845,6 +34164,27 @@
                 }
             ]
         },
+        "eth:ATLR": {
+            "links": {
+                "Homepage": "https://1971.network/"
+            },
+            "marketcap_usd": 0,
+            "name": "Atelier",
+            "shortcut": "ATLR",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:ATS": {
             "links": {
                 "Homepage": "https://artis.eco"
@@ -33905,6 +34245,27 @@
                 }
             ]
         },
+        "eth:AVS": {
+            "links": {
+                "Homepage": "https://avescoin.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Aves",
+            "shortcut": "AVS",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:BCS": {
             "links": {
                 "Homepage": "https://blockchainstation.io"
@@ -33947,11 +34308,95 @@
                 }
             ]
         },
+        "eth:BFC": {
+            "links": {
+                "Homepage": "https://thebifrost.io"
+            },
+            "marketcap_usd": 94426967,
+            "name": "Bifrost",
+            "shortcut": "BFC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:BG": {
+            "links": {
+                "Homepage": "https://beagle.chat/"
+            },
+            "marketcap_usd": 0,
+            "name": "Beagle Messaging Chain",
+            "shortcut": "BG",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:BIT": {
+            "links": {
+                "Homepage": "https://mantle.xyz"
+            },
+            "marketcap_usd": 0,
+            "name": "Mantle",
+            "shortcut": "BIT",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:BITCI": {
+            "links": {
+                "Homepage": "https://www.bitcichain.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Bitcichain",
+            "shortcut": "BITCI",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:BNB": {
             "links": {
                 "Homepage": "https://www.binance.org"
             },
-            "marketcap_usd": 51094687147,
+            "marketcap_usd": 47729156144,
             "name": "Binance Smart Chain",
             "shortcut": "BNB",
             "t1_enabled": "yes",
@@ -33968,13 +34413,34 @@
                 }
             ]
         },
-        "eth:BOBA": {
+        "eth:BOA": {
             "links": {
-                "Homepage": "https://boba.network"
+                "Homepage": "https://docs.bosagora.org"
             },
-            "marketcap_usd": 0,
-            "name": "Boba Network Bobabase",
-            "shortcut": "BOBA",
+            "marketcap_usd": 10622097,
+            "name": "BOSagora",
+            "shortcut": "BOA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:BOMB": {
+            "links": {
+                "Homepage": "https://www.bombchain.com"
+            },
+            "marketcap_usd": 108635,
+            "name": "BOMB Chain",
+            "shortcut": "BOMB",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -34031,13 +34497,13 @@
                 }
             ]
         },
-        "eth:BRO": {
+        "eth:BRNKC": {
             "links": {
-                "Homepage": "https://brochain.org"
+                "Homepage": "https://bearnetwork.net"
             },
             "marketcap_usd": 0,
-            "name": "BROChain",
-            "shortcut": "BRO",
+            "name": "Bear Network Chain",
+            "shortcut": "BRNKC",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -34115,6 +34581,27 @@
                 }
             ]
         },
+        "eth:BTON": {
+            "links": {
+                "Homepage": "https://blocktoncoin.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Blockton Blockchain",
+            "shortcut": "BTON",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:BTT": {
             "links": {
                 "Homepage": "https://bittorrentchain.io/"
@@ -34136,6 +34623,48 @@
                 }
             ]
         },
+        "eth:BTY": {
+            "links": {
+                "Homepage": "https://www.bityuan.com"
+            },
+            "marketcap_usd": 0,
+            "name": "BitYuan",
+            "shortcut": "BTY",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:BXN": {
+            "links": {
+                "Homepage": "https://blackfort.exchange"
+            },
+            "marketcap_usd": 0,
+            "name": "BlackFort Exchange Network",
+            "shortcut": "BXN",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:Brise": {
             "links": {
                 "Homepage": "https://bitgert.com/"
@@ -34157,6 +34686,48 @@
                 }
             ]
         },
+        "eth:CAM:500": {
+            "links": {
+                "Homepage": "https://camino.foundation/"
+            },
+            "marketcap_usd": 0,
+            "name": "Camino C-Chain",
+            "shortcut": "CAM",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:CANTO": {
+            "links": {
+                "Homepage": "https://canto.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Canto",
+            "shortcut": "CANTO",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:CATE": {
             "links": {
                 "Homepage": "https://catechain.com"
@@ -34178,6 +34749,27 @@
                 }
             ]
         },
+        "eth:CCNA": {
+            "links": {
+                "Homepage": "https://oortech.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Oort Ascraeus",
+            "shortcut": "CCNA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:CCP": {
             "links": {
                 "Homepage": "https://www.cryptocoinpay.co"
@@ -34203,7 +34795,7 @@
             "links": {
                 "Homepage": "https://docs.celo.org/"
             },
-            "marketcap_usd": 333164130,
+            "marketcap_usd": 370021788,
             "name": "Celo",
             "shortcut": "CELO",
             "t1_enabled": "yes",
@@ -34262,6 +34854,27 @@
                 }
             ]
         },
+        "eth:CIC": {
+            "links": {
+                "Homepage": "https://www.cicchain.net"
+            },
+            "marketcap_usd": 0,
+            "name": "CIC Chain",
+            "shortcut": "CIC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:CLASS": {
             "links": {
                 "Homepage": "https://velaverse.io"
@@ -34283,12 +34896,33 @@
                 }
             ]
         },
+        "eth:CLD": {
+            "links": {
+                "Homepage": "https://cloudtx.finance"
+            },
+            "marketcap_usd": 0,
+            "name": "CloudTx",
+            "shortcut": "CLD",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:CLO": {
             "coinmarketcap_alias": "callisto-network",
             "links": {
                 "Homepage": "https://callisto.network"
             },
-            "marketcap_usd": 23364762,
+            "marketcap_usd": 9476443,
             "name": "Callisto",
             "shortcut": "CLO",
             "t1_enabled": "yes",
@@ -34326,6 +34960,48 @@
                 }
             ]
         },
+        "eth:CMEMO": {
+            "links": {
+                "Homepage": "www.memolabs.org"
+            },
+            "marketcap_usd": 0,
+            "name": "Memo Smart Chain",
+            "shortcut": "CMEMO",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:CMP": {
+            "links": {
+                "Homepage": "https://caduceus.foundation/"
+            },
+            "marketcap_usd": 0,
+            "name": "CMP-Mainnet",
+            "shortcut": "CMP",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:CNDL": {
             "links": {
                 "Homepage": "https://candlelabs.org/"
@@ -34347,6 +35023,48 @@
                 }
             ]
         },
+        "eth:CONDOR": {
+            "links": {
+                "Homepage": "https://condor.systems"
+            },
+            "marketcap_usd": 0,
+            "name": "Condor Test Network",
+            "shortcut": "CONDOR",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:CORE": {
+            "links": {
+                "Homepage": "https://www.coredao.org"
+            },
+            "marketcap_usd": 0,
+            "name": "Core Blockchain",
+            "shortcut": "CORE",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:CPAY:21337": {
             "links": {
                 "Homepage": "https://cennz.net"
@@ -34431,11 +35149,53 @@
                 }
             ]
         },
+        "eth:CRC": {
+            "links": {
+                "Homepage": "https://github.com/ethereum-pocr/pocrnet"
+            },
+            "marketcap_usd": 0,
+            "name": "PoCRNet",
+            "shortcut": "CRC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:CREDIT": {
+            "links": {
+                "Homepage": "https://creditsmartchain.com"
+            },
+            "marketcap_usd": 238095,
+            "name": "Credit Smartchain",
+            "shortcut": "CREDIT",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:CRO": {
             "links": {
                 "Homepage": "https://cronos.org/"
             },
-            "marketcap_usd": 2722455558,
+            "marketcap_usd": 2011736262,
             "name": "Cronos",
             "shortcut": "CRO",
             "t1_enabled": "yes",
@@ -34473,6 +35233,27 @@
                 }
             ]
         },
+        "eth:CTEX": {
+            "links": {
+                "Homepage": "https://ctextoken.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Ctex Scan Blockchain",
+            "shortcut": "CTEX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:CUBE": {
             "links": {
                 "Homepage": "https://www.cube.network"
@@ -34536,6 +35317,48 @@
                 }
             ]
         },
+        "eth:DEB": {
+            "links": {
+                "Homepage": "https://anduschain.io/"
+            },
+            "marketcap_usd": 0,
+            "name": "Anduschain",
+            "shortcut": "DEB",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:DEL": {
+            "links": {
+                "Homepage": "https://decimalchain.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Decimal Smart Chain",
+            "shortcut": "DEL",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:DEV": {
             "links": {
                 "Homepage": "https://docs.moonbeam.network/networks/testnet/"
@@ -34557,13 +35380,13 @@
                 }
             ]
         },
-        "eth:DGCC": {
+        "eth:DFI": {
             "links": {
-                "Homepage": "https://digestgroup.ltd"
+                "Homepage": "https://meta.defichain.com/"
             },
             "marketcap_usd": 0,
-            "name": "Digest Swarm Chain",
-            "shortcut": "DGCC",
+            "name": "DeFiChain EVM Network",
+            "shortcut": "DFI",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -34599,13 +35422,97 @@
                 }
             ]
         },
-        "eth:DTH": {
+        "eth:DKN": {
             "links": {
-                "Homepage": "https://dithereum.org"
+                "Homepage": "https://doken.dev/"
             },
             "marketcap_usd": 0,
-            "name": "Dithereum",
-            "shortcut": "DTH",
+            "name": "DoKEN Super Chain",
+            "shortcut": "DKN",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:DOGS": {
+            "links": {
+                "Homepage": "https://dogcoin.network"
+            },
+            "marketcap_usd": 0,
+            "name": "Dogcoin",
+            "shortcut": "DOGS",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:DOINX": {
+            "links": {
+                "Homepage": ""
+            },
+            "marketcap_usd": 0,
+            "name": "D-Chain",
+            "shortcut": "DOINX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:DOS": {
+            "links": {
+                "Homepage": "http://doschain.io/"
+            },
+            "marketcap_usd": 0,
+            "name": "Dos Fuji Subnet",
+            "shortcut": "DOS",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:DRAC": {
+            "links": {
+                "Homepage": "https://drac.io/"
+            },
+            "marketcap_usd": 0,
+            "name": "DRAC Network",
+            "shortcut": "DRAC",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -34662,6 +35569,27 @@
                 }
             ]
         },
+        "eth:DXT": {
+            "links": {
+                "Homepage": "https://dexit.network"
+            },
+            "marketcap_usd": 0,
+            "name": "Dexit Network",
+            "shortcut": "DXT",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:DYNO": {
             "links": {
                 "Homepage": "https://dynoprotocol.com"
@@ -34683,6 +35611,48 @@
                 }
             ]
         },
+        "eth:Deh": {
+            "links": {
+                "Homepage": "https://dehvo.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Dehvo",
+            "shortcut": "Deh",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:ECG": {
+            "links": {
+                "Homepage": "https://ssquad.games/"
+            },
+            "marketcap_usd": 0,
+            "name": "SPS",
+            "shortcut": "ECG",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:ECO": {
             "links": {
                 "Homepage": "https://ecoball.org"
@@ -34729,7 +35699,7 @@
             "links": {
                 "Homepage": "http://edgewa.re"
             },
-            "marketcap_usd": 4543987,
+            "marketcap_usd": 4689635,
             "name": "Edgeware",
             "shortcut": "EDG",
             "t1_enabled": "yes",
@@ -34746,11 +35716,32 @@
                 }
             ]
         },
+        "eth:EGAZ": {
+            "links": {
+                "Homepage": "https://eticaprotocol.org"
+            },
+            "marketcap_usd": 0,
+            "name": "Etica",
+            "shortcut": "EGAZ",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:EGEM": {
             "links": {
                 "Homepage": "https://egem.io"
             },
-            "marketcap_usd": 88557,
+            "marketcap_usd": 36379,
             "name": "EtherGem",
             "shortcut": "EGEM",
             "t1_enabled": "yes",
@@ -34788,6 +35779,27 @@
                 }
             ]
         },
+        "eth:EKTA": {
+            "links": {
+                "Homepage": "https://www.ekta.io"
+            },
+            "marketcap_usd": 239141,
+            "name": "Ekta",
+            "shortcut": "EKTA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:ELA:20": {
             "links": {
                 "Homepage": "https://www.elastos.org/"
@@ -34830,6 +35842,27 @@
                 }
             ]
         },
+        "eth:EMPIRE": {
+            "links": {
+                "Homepage": "https://www.empirenetwork.io/"
+            },
+            "marketcap_usd": 0,
+            "name": "Empire Network",
+            "shortcut": "EMPIRE",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:ENTER": {
             "links": {
                 "Homepage": "https://entercoin.net"
@@ -34898,7 +35931,7 @@
             "links": {
                 "Homepage": "https://ethereumclassic.org"
             },
-            "marketcap_usd": 3265834039,
+            "marketcap_usd": 2950948570,
             "name": "Ethereum Classic",
             "shortcut": "ETC",
             "t1_enabled": "yes",
@@ -34915,7 +35948,7 @@
             "links": {
                 "Homepage": "https://ethereum.org"
             },
-            "marketcap_usd": 189401744793,
+            "marketcap_usd": 199115648941,
             "name": "Ethereum",
             "shortcut": "ETH",
             "t1_enabled": "yes",
@@ -34928,11 +35961,32 @@
                 }
             ]
         },
+        "eth:ETHF": {
+            "links": {
+                "Homepage": "https://etherfair.org"
+            },
+            "marketcap_usd": 0,
+            "name": "ethereum Fair",
+            "shortcut": "ETHF",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:ETHO": {
             "links": {
                 "Homepage": "https://ethoprotocol.com"
             },
-            "marketcap_usd": 0,
+            "marketcap_usd": 910129,
             "name": "Etho Protocol",
             "shortcut": "ETHO",
             "t1_enabled": "yes",
@@ -34991,6 +36045,27 @@
                 }
             ]
         },
+        "eth:ETMP": {
+            "links": {
+                "Homepage": "https://etm.network"
+            },
+            "marketcap_usd": 0,
+            "name": "Ennothem",
+            "shortcut": "ETMP",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:ETND": {
             "links": {
                 "Homepage": "https://www.etnd.pro"
@@ -35117,6 +36192,27 @@
                 }
             ]
         },
+        "eth:EXL": {
+            "links": {
+                "Homepage": ""
+            },
+            "marketcap_usd": 0,
+            "name": "Excoincial Chain",
+            "shortcut": "EXL",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:EXP": {
             "links": {
                 "Homepage": "https://expanse.tech"
@@ -35180,6 +36276,27 @@
                 }
             ]
         },
+        "eth:FIL": {
+            "links": {
+                "Homepage": "https://filecoin.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Filecoin -",
+            "shortcut": "FIL",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:FIN": {
             "links": {
                 "Homepage": "https://primusmoney.com"
@@ -35201,11 +36318,74 @@
                 }
             ]
         },
+        "eth:FIRE:529": {
+            "links": {
+                "Homepage": "https://thefirechain.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Firechain",
+            "shortcut": "FIRE",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:FITFI": {
+            "links": {
+                "Homepage": "https://step.network"
+            },
+            "marketcap_usd": 0,
+            "name": "Step Network",
+            "shortcut": "FITFI",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:FLA": {
+            "links": {
+                "Homepage": "https://www.flaexchange.top"
+            },
+            "marketcap_usd": 0,
+            "name": "Flachain",
+            "shortcut": "FLA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:FLR": {
             "links": {
                 "Homepage": "https://flare.xyz"
             },
-            "marketcap_usd": 0,
+            "marketcap_usd": 467857625,
             "name": "Flare",
             "shortcut": "FLR",
             "t1_enabled": "yes",
@@ -35222,13 +36402,34 @@
                 }
             ]
         },
-        "eth:FRA": {
+        "eth:FNCY": {
             "links": {
-                "Homepage": "https://findora.org/"
+                "Homepage": "https://fncyscan.fncy.world"
             },
-            "marketcap_usd": 14045778,
-            "name": "Findora",
-            "shortcut": "FRA",
+            "marketcap_usd": 38806503,
+            "name": "FNCY",
+            "shortcut": "FNCY",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:FREN": {
+            "links": {
+                "Homepage": "https://frenchain.app"
+            },
+            "marketcap_usd": 0,
+            "name": "Frenchain",
+            "shortcut": "FREN",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -35245,9 +36446,9 @@
         },
         "eth:FSN": {
             "links": {
-                "Homepage": "https://www.fusion.org/"
+                "Homepage": "https://fusion.org"
             },
-            "marketcap_usd": 20067184,
+            "marketcap_usd": 26079174,
             "name": "Fusion",
             "shortcut": "FSN",
             "t1_enabled": "yes",
@@ -35264,6 +36465,27 @@
                 }
             ]
         },
+        "eth:FST": {
+            "links": {
+                "Homepage": "https://fantasia.technology/"
+            },
+            "marketcap_usd": 0,
+            "name": "Fantasia Chain",
+            "shortcut": "FST",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:FTM": {
             "links": {
                 "Homepage": "https://fantom.foundation"
@@ -35394,7 +36616,7 @@
             "links": {
                 "Homepage": "https://moonbeam.network/networks/moonbeam/"
             },
-            "marketcap_usd": 203962898,
+            "marketcap_usd": 255322438,
             "name": "Moonbeam",
             "shortcut": "GLMR",
             "t1_enabled": "yes",
@@ -35411,6 +36633,48 @@
                 }
             ]
         },
+        "eth:GLQ": {
+            "links": {
+                "Homepage": "https://graphlinq.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Graphlinq Blockchain",
+            "shortcut": "GLQ",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:GMMT": {
+            "links": {
+                "Homepage": "https://gmmtchain.io/"
+            },
+            "marketcap_usd": 0,
+            "name": "Giant Mammoth",
+            "shortcut": "GMMT",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:GNC": {
             "links": {
                 "Homepage": "https://genesis-gn.com"
@@ -35436,7 +36700,7 @@
             "links": {
                 "Homepage": "https://gochain.io"
             },
-            "marketcap_usd": 8860762,
+            "marketcap_usd": 9893895,
             "name": "GoChain",
             "shortcut": "GO",
             "t1_enabled": "yes",
@@ -35453,13 +36717,34 @@
                 }
             ]
         },
-        "eth:GT": {
+        "eth:GOLDT": {
             "links": {
-                "Homepage": "https://www.gatechain.io"
+                "Homepage": "https://www.hammerchain.io"
             },
             "marketcap_usd": 0,
-            "name": "GateChain",
-            "shortcut": "GT",
+            "name": "Hammer Chain",
+            "shortcut": "GOLDT",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:GZN": {
+            "links": {
+                "Homepage": "https://token.gearzero.ca/mainnet"
+            },
+            "marketcap_usd": 0,
+            "name": "Gear Zero Network",
+            "shortcut": "GZN",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -35516,6 +36801,48 @@
                 }
             ]
         },
+        "eth:HBAR:295": {
+            "links": {
+                "Homepage": "https://hedera.com"
+            },
+            "marketcap_usd": 1876574858,
+            "name": "Hedera",
+            "shortcut": "HBAR",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:HMND": {
+            "links": {
+                "Homepage": "https://humanode.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Humanode",
+            "shortcut": "HMND",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:HO": {
             "links": {
                 "Homepage": "https://halo.land/#/"
@@ -35583,7 +36910,7 @@
             "links": {
                 "Homepage": "https://hpb.io"
             },
-            "marketcap_usd": 987769,
+            "marketcap_usd": 957132,
             "name": "High Performance Blockchain",
             "shortcut": "HPB",
             "t1_enabled": "yes",
@@ -35621,6 +36948,48 @@
                 }
             ]
         },
+        "eth:HTML": {
+            "links": {
+                "Homepage": "https://htmlcoin.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Htmlcoin",
+            "shortcut": "HTML",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:HTZ": {
+            "links": {
+                "Homepage": "https://www.hertz-network.com"
+            },
+            "marketcap_usd": 124618,
+            "name": "Hertz Network",
+            "shortcut": "HTZ",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:ILT": {
             "links": {
                 "Homepage": "https://iolite.io"
@@ -35642,6 +37011,27 @@
                 }
             ]
         },
+        "eth:IMV": {
+            "links": {
+                "Homepage": "https://imversed.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Imversed",
+            "shortcut": "IMV",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:IORA": {
             "links": {
                 "Homepage": "https://iorachain.com"
@@ -35705,6 +37095,27 @@
                 }
             ]
         },
+        "eth:ISLM": {
+            "links": {
+                "Homepage": "https://islamiccoin.net"
+            },
+            "marketcap_usd": 0,
+            "name": "Haqq Network",
+            "shortcut": "ISLM",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:IVAR": {
             "links": {
                 "Homepage": "https://ivarex.com"
@@ -35726,6 +37137,48 @@
                 }
             ]
         },
+        "eth:J": {
+            "links": {
+                "Homepage": "https://j.blockcoach.com:8089"
+            },
+            "marketcap_usd": 0,
+            "name": "Metacodechain",
+            "shortcut": "J",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:JBC": {
+            "links": {
+                "Homepage": "https://jibchain.net"
+            },
+            "marketcap_usd": 0,
+            "name": "JIBCHAIN L1",
+            "shortcut": "JBC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:JEWEL:53935": {
             "links": {
                 "Homepage": "https://defikingdoms.com"
@@ -35747,6 +37200,27 @@
                 }
             ]
         },
+        "eth:JINDA": {
+            "links": {
+                "Homepage": "https://blockchain.or.th"
+            },
+            "marketcap_usd": 0,
+            "name": "TBSI",
+            "shortcut": "JINDA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:JOYS": {
             "links": {
                 "Homepage": "https://joys.digital"
@@ -35768,6 +37242,27 @@
                 }
             ]
         },
+        "eth:KAI": {
+            "links": {
+                "Homepage": "https://kardiachain.io"
+            },
+            "marketcap_usd": 28444438,
+            "name": "KardiaChain",
+            "shortcut": "KAI",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:KAR": {
             "links": {
                 "Homepage": "https://karura.network"
@@ -35793,7 +37288,7 @@
             "links": {
                 "Homepage": "https://www.kava.io"
             },
-            "marketcap_usd": 428263632,
+            "marketcap_usd": 367913718,
             "name": "Kava EVM",
             "shortcut": "KAVA",
             "t1_enabled": "yes",
@@ -35831,11 +37326,32 @@
                 }
             ]
         },
+        "eth:KEK": {
+            "links": {
+                "Homepage": "https://kekchain.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Kekchain",
+            "shortcut": "KEK",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:KLAY": {
             "links": {
                 "Homepage": "https://www.klaytn.com/"
             },
-            "marketcap_usd": 744892923,
+            "marketcap_usd": 890666429,
             "name": "Klaytn",
             "shortcut": "KLAY",
             "t1_enabled": "yes",
@@ -35894,6 +37410,27 @@
                 }
             ]
         },
+        "eth:KUB": {
+            "links": {
+                "Homepage": "https://www.bitkubchain.com/"
+            },
+            "marketcap_usd": 0,
+            "name": "Bitkub Chain",
+            "shortcut": "KUB",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:L1": {
             "links": {
                 "Homepage": "https://www.genesisl1.com"
@@ -35957,6 +37494,27 @@
                 }
             ]
         },
+        "eth:LAVA": {
+            "links": {
+                "Homepage": "https://elysiumscan.vulcanforged.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Elysium",
+            "shortcut": "LAVA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:LISINS": {
             "links": {
                 "Homepage": "https://lisinski.online"
@@ -35978,6 +37536,27 @@
                 }
             ]
         },
+        "eth:LUCID": {
+            "links": {
+                "Homepage": "https://lucidcoin.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Lucid Blockchain",
+            "shortcut": "LUCID",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:LUDAN": {
             "links": {
                 "Homepage": "https://www.ludan.org/"
@@ -35999,11 +37578,116 @@
                 }
             ]
         },
+        "eth:LYC": {
+            "links": {
+                "Homepage": "https://lycanchain.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Lycan Chain",
+            "shortcut": "LYC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:MAI": {
+            "links": {
+                "Homepage": ""
+            },
+            "marketcap_usd": 0,
+            "name": "maistestsubnet",
+            "shortcut": "MAI",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:MAP": {
+            "links": {
+                "Homepage": "https://maplabs.io"
+            },
+            "marketcap_usd": 0,
+            "name": "MAP",
+            "shortcut": "MAP",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:MARO": {
+            "links": {
+                "Homepage": "https://ma.ro/"
+            },
+            "marketcap_usd": 27306090,
+            "name": "MARO Blockchain",
+            "shortcut": "MARO",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:MAS": {
+            "links": {
+                "Homepage": "https://masterbank.org"
+            },
+            "marketcap_usd": 0,
+            "name": "Mas",
+            "shortcut": "MAS",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:MATH": {
             "links": {
                 "Homepage": "https://mathchain.org"
             },
-            "marketcap_usd": 10761824,
+            "marketcap_usd": 17614958,
             "name": "MathChain",
             "shortcut": "MATH",
             "t1_enabled": "yes",
@@ -36024,7 +37708,7 @@
             "links": {
                 "Homepage": "https://polygon.technology/"
             },
-            "marketcap_usd": 7431717654,
+            "marketcap_usd": 10673372779,
             "name": "Polygon",
             "shortcut": "MATIC",
             "t1_enabled": "yes",
@@ -36041,11 +37725,32 @@
                 }
             ]
         },
+        "eth:MEER": {
+            "links": {
+                "Homepage": "https://github.com/Qitmeer"
+            },
+            "marketcap_usd": 0,
+            "name": "Qitmeer",
+            "shortcut": "MEER",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:META": {
             "links": {
                 "Homepage": "https://metadium.com"
             },
-            "marketcap_usd": 51333840,
+            "marketcap_usd": 61668315,
             "name": "Metadium",
             "shortcut": "META",
             "t1_enabled": "yes",
@@ -36062,6 +37767,27 @@
                 }
             ]
         },
+        "eth:METAD": {
+            "links": {
+                "Homepage": "https://docs.metaplayer.one/"
+            },
+            "marketcap_usd": 0,
+            "name": "Metaplayerone",
+            "shortcut": "METAD",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:METIS": {
             "links": {
                 "Homepage": "https://www.metis.io"
@@ -36171,7 +37897,7 @@
             "links": {
                 "Homepage": "https://moonbeam.network/networks/moonriver/"
             },
-            "marketcap_usd": 59768358,
+            "marketcap_usd": 63677633,
             "name": "Moonriver",
             "shortcut": "MOVR",
             "t1_enabled": "yes",
@@ -36234,7 +37960,7 @@
             "links": {
                 "Homepage": "https://mtv.ac"
             },
-            "marketcap_usd": 4083320,
+            "marketcap_usd": 4779941,
             "name": "MultiVAC",
             "shortcut": "MTV",
             "t1_enabled": "yes",
@@ -36272,6 +37998,27 @@
                 }
             ]
         },
+        "eth:MYTH": {
+            "links": {
+                "Homepage": "https://mythicalgames.com/"
+            },
+            "marketcap_usd": 0,
+            "name": "Mythical Chain",
+            "shortcut": "MYTH",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:NEON:245022934": {
             "links": {
                 "Homepage": "https://neon-labs.org"
@@ -36297,7 +38044,7 @@
             "links": {
                 "Homepage": "https://www.newtonproject.org/"
             },
-            "marketcap_usd": 4921218,
+            "marketcap_usd": 3728171,
             "name": "Newton",
             "shortcut": "NEW",
             "t1_enabled": "yes",
@@ -36314,32 +38061,11 @@
                 }
             ]
         },
-        "eth:NEXT": {
-            "links": {
-                "Homepage": "https://www.nextsmartchain.com/"
-            },
-            "marketcap_usd": 0,
-            "name": "NEXT Smart Chain",
-            "shortcut": "NEXT",
-            "t1_enabled": "yes",
-            "t2_enabled": "yes",
-            "type": "coin",
-            "wallet": [
-                {
-                    "name": "MyCrypto",
-                    "url": "https://mycrypto.com"
-                },
-                {
-                    "name": "MyEtherWallet",
-                    "url": "https://www.myetherwallet.com"
-                }
-            ]
-        },
         "eth:NRG": {
             "links": {
                 "Homepage": "https://www.energi.world/"
             },
-            "marketcap_usd": 10456381,
+            "marketcap_usd": 12197414,
             "name": "Energi",
             "shortcut": "NRG",
             "t1_enabled": "yes",
@@ -36377,6 +38103,69 @@
                 }
             ]
         },
+        "eth:NULS": {
+            "links": {
+                "Homepage": "https://nuls.io"
+            },
+            "marketcap_usd": 27852400,
+            "name": "ENULS",
+            "shortcut": "NULS",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:NUM": {
+            "links": {
+                "Homepage": "https://numbersprotocol.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Numbers",
+            "shortcut": "NUM",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:NetZ": {
+            "links": {
+                "Homepage": "https://mainnetz.io"
+            },
+            "marketcap_usd": 0,
+            "name": "MainnetZ",
+            "shortcut": "NetZ",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:OAC": {
             "links": {
                 "Homepage": "https://scan.oasischain.io"
@@ -36398,6 +38187,48 @@
                 }
             ]
         },
+        "eth:OCTA": {
+            "links": {
+                "Homepage": "https://octa.space"
+            },
+            "marketcap_usd": 0,
+            "name": "OctaSpace",
+            "shortcut": "OCTA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:OHO": {
+            "links": {
+                "Homepage": "https://oho.ai"
+            },
+            "marketcap_usd": 0,
+            "name": "OHO",
+            "shortcut": "OHO",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:OKT": {
             "links": {
                 "Homepage": "https://www.okex.com/okc"
@@ -36444,7 +38275,7 @@
             "links": {
                 "Homepage": "https://oneledger.io"
             },
-            "marketcap_usd": 2972940,
+            "marketcap_usd": 2321403,
             "name": "OneLedger",
             "shortcut": "OLT",
             "t1_enabled": "yes",
@@ -36482,11 +38313,32 @@
                 }
             ]
         },
+        "eth:OMAX": {
+            "links": {
+                "Homepage": "https://www.omaxcoin.com/"
+            },
+            "marketcap_usd": 0,
+            "name": "Omax",
+            "shortcut": "OMAX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:OMC": {
             "links": {
                 "Homepage": "https://omchain.io"
             },
-            "marketcap_usd": 383185,
+            "marketcap_usd": 2203543,
             "name": "omChain",
             "shortcut": "OMC",
             "t1_enabled": "yes",
@@ -36507,7 +38359,7 @@
             "links": {
                 "Homepage": "https://www.harmony.one/"
             },
-            "marketcap_usd": 236145795,
+            "marketcap_usd": 283158162,
             "name": "Harmony",
             "shortcut": "ONE",
             "t1_enabled": "yes",
@@ -36528,7 +38380,7 @@
             "links": {
                 "Homepage": "https://www.harmony.one/"
             },
-            "marketcap_usd": 236145795,
+            "marketcap_usd": 283158162,
             "name": "Harmony",
             "shortcut": "ONE",
             "t1_enabled": "yes",
@@ -36549,7 +38401,7 @@
             "links": {
                 "Homepage": "https://www.harmony.one/"
             },
-            "marketcap_usd": 236145795,
+            "marketcap_usd": 283158162,
             "name": "Harmony",
             "shortcut": "ONE",
             "t1_enabled": "yes",
@@ -36570,7 +38422,7 @@
             "links": {
                 "Homepage": "https://www.harmony.one/"
             },
-            "marketcap_usd": 236145795,
+            "marketcap_usd": 283158162,
             "name": "Harmony",
             "shortcut": "ONE",
             "t1_enabled": "yes",
@@ -36591,7 +38443,7 @@
             "links": {
                 "Homepage": "https://ont.io/"
             },
-            "marketcap_usd": 190530450,
+            "marketcap_usd": 220559219,
             "name": "Ontology",
             "shortcut": "ONG",
             "t1_enabled": "yes",
@@ -36608,6 +38460,27 @@
                 }
             ]
         },
+        "eth:ONUS": {
+            "links": {
+                "Homepage": "https://onuschain.io"
+            },
+            "marketcap_usd": 42435453,
+            "name": "ONUS Chain",
+            "shortcut": "ONUS",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:OPC": {
             "links": {
                 "Homepage": "https://www.openchain.live"
@@ -36629,6 +38502,90 @@
                 }
             ]
         },
+        "eth:OPN": {
+            "links": {
+                "Homepage": ""
+            },
+            "marketcap_usd": 0,
+            "name": "Susono",
+            "shortcut": "OPN",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:ORL": {
+            "links": {
+                "Homepage": "https://orlchain.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Orlando Chain",
+            "shortcut": "ORL",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:OTP": {
+            "links": {
+                "Homepage": "https://parachain.origintrail.io"
+            },
+            "marketcap_usd": 0,
+            "name": "OriginTrail Parachain",
+            "shortcut": "OTP",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:OXYN": {
+            "links": {
+                "Homepage": "https://beta.opulent-x.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Opulent-X BETA",
+            "shortcut": "OXYN",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:OY": {
             "links": {
                 "Homepage": "https://www.oychain.io"
@@ -36671,6 +38628,27 @@
                 }
             ]
         },
+        "eth:PDC": {
+            "links": {
+                "Homepage": "https://ipdc.io"
+            },
+            "marketcap_usd": 0,
+            "name": "PDC",
+            "shortcut": "PDC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:PETH": {
             "links": {
                 "Homepage": "https://primusmoney.com"
@@ -36717,7 +38695,7 @@
             "links": {
                 "Homepage": "https://explorer.lightstreams.io"
             },
-            "marketcap_usd": 45057,
+            "marketcap_usd": 0,
             "name": "Lightstreams",
             "shortcut": "PHT",
             "t1_enabled": "yes",
@@ -36797,6 +38775,27 @@
                 }
             ]
         },
+        "eth:PLQ": {
+            "links": {
+                "Homepage": "https://planq.network"
+            },
+            "marketcap_usd": 0,
+            "name": "Planq",
+            "shortcut": "PLQ",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:PLS": {
             "links": {
                 "Homepage": "https://pulsechain.com/"
@@ -36822,7 +38821,7 @@
             "links": {
                 "Homepage": "https://poa.network"
             },
-            "marketcap_usd": 5187637,
+            "marketcap_usd": 8185146,
             "name": "POA Network Core",
             "shortcut": "POA",
             "t1_enabled": "yes",
@@ -36843,7 +38842,7 @@
             "links": {
                 "Homepage": "https://polis.tech"
             },
-            "marketcap_usd": 119191,
+            "marketcap_usd": 92704,
             "name": "Polis",
             "shortcut": "POLIS",
             "t1_enabled": "yes",
@@ -36860,6 +38859,27 @@
                 }
             ]
         },
+        "eth:POM": {
+            "links": {
+                "Homepage": "https://proofofmemes.org"
+            },
+            "marketcap_usd": 0,
+            "name": "Proof Of Memes",
+            "shortcut": "POM",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:POP": {
             "links": {
                 "Homepage": "https://popcateum.org"
@@ -36902,6 +38922,48 @@
                 }
             ]
         },
+        "eth:PSC": {
+            "links": {
+                "Homepage": "https://www.polysmartchain.com/"
+            },
+            "marketcap_usd": 0,
+            "name": "PolySmartChain",
+            "shortcut": "PSC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:PTX": {
+            "links": {
+                "Homepage": "https://www.pandoproject.org/"
+            },
+            "marketcap_usd": 0,
+            "name": "PandoProject",
+            "shortcut": "PTX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:QDC": {
             "links": {
                 "Homepage": "https://quadrans.io"
@@ -36923,11 +38985,32 @@
                 }
             ]
         },
+        "eth:QKA": {
+            "links": {
+                "Homepage": "https://qkacoin.org"
+            },
+            "marketcap_usd": 0,
+            "name": "Quokkacoin",
+            "shortcut": "QKA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:QKC:100000": {
             "links": {
                 "Homepage": "https://www.quarkchain.io"
             },
-            "marketcap_usd": 70288774,
+            "marketcap_usd": 74074939,
             "name": "QuarkChain",
             "shortcut": "QKC",
             "t1_enabled": "yes",
@@ -36948,7 +39031,7 @@
             "links": {
                 "Homepage": "https://www.quarkchain.io"
             },
-            "marketcap_usd": 70288774,
+            "marketcap_usd": 74074939,
             "name": "QuarkChain",
             "shortcut": "QKC",
             "t1_enabled": "yes",
@@ -36969,7 +39052,7 @@
             "links": {
                 "Homepage": "https://www.quarkchain.io"
             },
-            "marketcap_usd": 70288774,
+            "marketcap_usd": 74074939,
             "name": "QuarkChain",
             "shortcut": "QKC",
             "t1_enabled": "yes",
@@ -36990,7 +39073,7 @@
             "links": {
                 "Homepage": "https://www.quarkchain.io"
             },
-            "marketcap_usd": 70288774,
+            "marketcap_usd": 74074939,
             "name": "QuarkChain",
             "shortcut": "QKC",
             "t1_enabled": "yes",
@@ -37011,7 +39094,7 @@
             "links": {
                 "Homepage": "https://www.quarkchain.io"
             },
-            "marketcap_usd": 70288774,
+            "marketcap_usd": 74074939,
             "name": "QuarkChain",
             "shortcut": "QKC",
             "t1_enabled": "yes",
@@ -37032,7 +39115,7 @@
             "links": {
                 "Homepage": "https://www.quarkchain.io"
             },
-            "marketcap_usd": 70288774,
+            "marketcap_usd": 74074939,
             "name": "QuarkChain",
             "shortcut": "QKC",
             "t1_enabled": "yes",
@@ -37053,7 +39136,7 @@
             "links": {
                 "Homepage": "https://www.quarkchain.io"
             },
-            "marketcap_usd": 70288774,
+            "marketcap_usd": 74074939,
             "name": "QuarkChain",
             "shortcut": "QKC",
             "t1_enabled": "yes",
@@ -37074,7 +39157,7 @@
             "links": {
                 "Homepage": "https://www.quarkchain.io"
             },
-            "marketcap_usd": 70288774,
+            "marketcap_usd": 74074939,
             "name": "QuarkChain",
             "shortcut": "QKC",
             "t1_enabled": "yes",
@@ -37095,7 +39178,7 @@
             "links": {
                 "Homepage": "https://www.quarkchain.io"
             },
-            "marketcap_usd": 70288774,
+            "marketcap_usd": 74074939,
             "name": "QuarkChain",
             "shortcut": "QKC",
             "t1_enabled": "yes",
@@ -37133,6 +39216,27 @@
                 }
             ]
         },
+        "eth:QOM": {
+            "links": {
+                "Homepage": "https://qom.one"
+            },
+            "marketcap_usd": 0,
+            "name": "QL1",
+            "shortcut": "QOM",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:RBD": {
             "links": {
                 "Homepage": "https://www.wegochain.io"
@@ -37175,11 +39279,53 @@
                 }
             ]
         },
+        "eth:REAL": {
+            "links": {
+                "Homepage": "https://www.rclsidechain.com/"
+            },
+            "marketcap_usd": 0,
+            "name": "Realchain",
+            "shortcut": "REAL",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:REDLC": {
+            "links": {
+                "Homepage": "https://redlight.finance/"
+            },
+            "marketcap_usd": 0,
+            "name": "Redlight Chain",
+            "shortcut": "REDLC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:REI:47805": {
             "links": {
                 "Homepage": "https://rei.network/"
             },
-            "marketcap_usd": 29317148,
+            "marketcap_usd": 32752198,
             "name": "REI Network",
             "shortcut": "REI",
             "t1_enabled": "yes",
@@ -37196,11 +39342,32 @@
                 }
             ]
         },
+        "eth:RESIN": {
+            "links": {
+                "Homepage": "https://resincoin.dev"
+            },
+            "marketcap_usd": 0,
+            "name": "ResinCoin",
+            "shortcut": "RESIN",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:RING": {
             "links": {
                 "Homepage": "https://darwinia.network/"
             },
-            "marketcap_usd": 7465585,
+            "marketcap_usd": 7420230,
             "name": "Darwinia Network",
             "shortcut": "RING",
             "t1_enabled": "yes",
@@ -37259,32 +39426,11 @@
                 }
             ]
         },
-        "eth:ROSE": {
-            "links": {
-                "Homepage": "https://docs.oasis.dev/general/developer-resources/overview"
-            },
-            "marketcap_usd": 0,
-            "name": "Emerald Paratime",
-            "shortcut": "ROSE",
-            "t1_enabled": "yes",
-            "t2_enabled": "yes",
-            "type": "coin",
-            "wallet": [
-                {
-                    "name": "MyCrypto",
-                    "url": "https://mycrypto.com"
-                },
-                {
-                    "name": "MyEtherWallet",
-                    "url": "https://www.myetherwallet.com"
-                }
-            ]
-        },
         "eth:RPG": {
             "links": {
                 "Homepage": "https://rangersprotocol.com"
             },
-            "marketcap_usd": 1399497,
+            "marketcap_usd": 1063873,
             "name": "Rangers Protocol",
             "shortcut": "RPG",
             "t1_enabled": "yes",
@@ -37322,6 +39468,27 @@
                 }
             ]
         },
+        "eth:SAMA": {
+            "links": {
+                "Homepage": "https://moonsama.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Exosama Network",
+            "shortcut": "SAMA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:SDN": {
             "links": {
                 "Homepage": "https://shiden.astar.network/"
@@ -37343,6 +39510,27 @@
                 }
             ]
         },
+        "eth:SEED": {
+            "links": {
+                "Homepage": "https://www.seedcoin.network/"
+            },
+            "marketcap_usd": 0,
+            "name": "SeedCoin-Network",
+            "shortcut": "SEED",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:SETM": {
             "links": {
                 "Homepage": "https://setheum.xyz"
@@ -37427,11 +39615,32 @@
                 }
             ]
         },
+        "eth:SINSO": {
+            "links": {
+                "Homepage": "https://sinso.io"
+            },
+            "marketcap_usd": 0,
+            "name": "AmStar",
+            "shortcut": "SINSO",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:SKU": {
             "links": {
                 "Homepage": "https://clover.finance/sakura"
             },
-            "marketcap_usd": 904244,
+            "marketcap_usd": 687504,
             "name": "Sakura",
             "shortcut": "SKU",
             "t1_enabled": "yes",
@@ -37452,7 +39661,7 @@
             "links": {
                 "Homepage": "https://smartmesh.io"
             },
-            "marketcap_usd": 2032204,
+            "marketcap_usd": 2755986,
             "name": "SmartMesh",
             "shortcut": "SMT",
             "t1_enabled": "yes",
@@ -37553,6 +39762,27 @@
                 }
             ]
         },
+        "eth:SRDX": {
+            "links": {
+                "Homepage": "https://mysardis.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Sardis",
+            "shortcut": "SRDX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:SRN": {
             "links": {
                 "Homepage": "https://surnet.org"
@@ -37574,6 +39804,69 @@
                 }
             ]
         },
+        "eth:STAND": {
+            "links": {
+                "Homepage": "https://goldsmartchain.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Gold Smart Chain",
+            "shortcut": "STAND",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:STOS": {
+            "links": {
+                "Homepage": "https://www.thestratos.org"
+            },
+            "marketcap_usd": 13276679,
+            "name": "Stratos",
+            "shortcut": "STOS",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:SVRN": {
+            "links": {
+                "Homepage": "https://soverun.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Soverun",
+            "shortcut": "SVRN",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:SX": {
             "links": {
                 "Homepage": "https://www.sx.technology"
@@ -37599,7 +39892,7 @@
             "links": {
                 "Homepage": "https://seelen.pro/"
             },
-            "marketcap_usd": 2742038,
+            "marketcap_usd": 3511278,
             "name": "Seele",
             "shortcut": "Seele",
             "t1_enabled": "yes",
@@ -37616,6 +39909,48 @@
                 }
             ]
         },
+        "eth:SmuX": {
+            "links": {
+                "Homepage": "https://www.streamux.cloud"
+            },
+            "marketcap_usd": 0,
+            "name": "StreamuX Blockchain",
+            "shortcut": "SmuX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:T-EKTA": {
+            "links": {
+                "Homepage": "https://www.ekta.io"
+            },
+            "marketcap_usd": 0,
+            "name": "T-EKTA",
+            "shortcut": "T-EKTA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:TAO": {
             "links": {
                 "Homepage": "https://tao.network"
@@ -37763,6 +40098,27 @@
                 }
             ]
         },
+        "eth:TMY": {
+            "links": {
+                "Homepage": "https://tmychain.org/"
+            },
+            "marketcap_usd": 0,
+            "name": "TMY Chain",
+            "shortcut": "TMY",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:TOMB": {
             "links": {
                 "Homepage": "https://tombchain.com/"
@@ -37788,7 +40144,7 @@
             "links": {
                 "Homepage": "https://tomochain.com"
             },
-            "marketcap_usd": 38639467,
+            "marketcap_usd": 40653633,
             "name": "TomoChain",
             "shortcut": "TOMO",
             "t1_enabled": "yes",
@@ -37893,7 +40249,7 @@
             "links": {
                 "Homepage": "https://thundercore.com"
             },
-            "marketcap_usd": 46482691,
+            "marketcap_usd": 53233013,
             "name": "ThunderCore",
             "shortcut": "TT",
             "t1_enabled": "yes",
@@ -37910,6 +40266,48 @@
                 }
             ]
         },
+        "eth:TWL": {
+            "links": {
+                "Homepage": "https://twala.io/"
+            },
+            "marketcap_usd": 0,
+            "name": "Jellie",
+            "shortcut": "TWL",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:TXDC": {
+            "links": {
+                "Homepage": "https://xinfin.org"
+            },
+            "marketcap_usd": 0,
+            "name": "XDC Apothem Network",
+            "shortcut": "TXDC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:TXL": {
             "links": {
                 "Homepage": "https://autobahn.network"
@@ -37977,7 +40375,7 @@
             "links": {
                 "Homepage": "https://ubiqsmart.com"
             },
-            "marketcap_usd": 1797469,
+            "marketcap_usd": 1302549,
             "name": "Ubiq",
             "shortcut": "UBQ",
             "t1_enabled": "yes",
@@ -37994,6 +40392,48 @@
                 }
             ]
         },
+        "eth:ULX": {
+            "links": {
+                "Homepage": "https://ultron.foundation"
+            },
+            "marketcap_usd": 0,
+            "name": "Ultron",
+            "shortcut": "ULX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:UNQ": {
+            "links": {
+                "Homepage": "https://unique.network"
+            },
+            "marketcap_usd": 0,
+            "name": "Unique",
+            "shortcut": "UNQ",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:UZMI": {
             "links": {
                 "Homepage": "https://uzmigames.com.br/"
@@ -38036,6 +40476,48 @@
                 }
             ]
         },
+        "eth:VET": {
+            "links": {
+                "Homepage": "https://vechain.org"
+            },
+            "marketcap_usd": 2002440234,
+            "name": "VeChain",
+            "shortcut": "VET",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:VETH": {
+            "links": {
+                "Homepage": "https://www.openvessel.io"
+            },
+            "marketcap_usd": 0,
+            "name": "OpenVessel",
+            "shortcut": "VETH",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:VLX": {
             "links": {
                 "Homepage": "https://velas.com"
@@ -38078,6 +40560,27 @@
                 }
             ]
         },
+        "eth:VNT": {
+            "links": {
+                "Homepage": "https://ventionscan.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Vention Smart Chain",
+            "shortcut": "VNT",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:VS:888888": {
             "links": {
                 "Homepage": "https://www.v.network"
@@ -38099,6 +40602,27 @@
                 }
             ]
         },
+        "eth:VSC": {
+            "links": {
+                "Homepage": "https://vsc-dataseed.vyvo.org"
+            },
+            "marketcap_usd": 0,
+            "name": "Vyvo Smart Chain",
+            "shortcut": "VSC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:W3G": {
             "links": {
                 "Homepage": "https://web3games.org/"
@@ -38145,7 +40669,7 @@
             "links": {
                 "Homepage": "https://www.wanscan.org"
             },
-            "marketcap_usd": 34185865,
+            "marketcap_usd": 58286398,
             "name": "Wanchain",
             "shortcut": "WAN",
             "t1_enabled": "yes",
@@ -38187,9 +40711,30 @@
                 }
             ]
         },
+        "eth:WEMIX": {
+            "links": {
+                "Homepage": "https://wemix.com"
+            },
+            "marketcap_usd": 525753922,
+            "name": "WEMIX3.0",
+            "shortcut": "WEMIX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:WGM": {
             "links": {
-                "Homepage": "https://trywagmi.xyz"
+                "Homepage": "https://subnets-test.avax.network/wagmi/details"
             },
             "marketcap_usd": 0,
             "name": "WAGMI",
@@ -38234,7 +40779,7 @@
                 "Homepage": "https://xinfin.org"
             },
             "marketcap_usd": 0,
-            "name": "XinFin Network",
+            "name": "XinFin XDC Network",
             "shortcut": "XDC",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
@@ -38267,6 +40812,48 @@
                 }
             ]
         },
+        "eth:XETA": {
+            "links": {
+                "Homepage": "https://xanachain.xana.net/"
+            },
+            "marketcap_usd": 0,
+            "name": "XANAChain",
+            "shortcut": "XETA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:XODEX": {
+            "links": {
+                "Homepage": "https://xo-dex.com"
+            },
+            "marketcap_usd": 0,
+            "name": "XODEX",
+            "shortcut": "XODEX",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:XT": {
             "links": {
                 "Homepage": "https://xsc.pub/"
@@ -38309,6 +40896,27 @@
                 }
             ]
         },
+        "eth:XZO": {
+            "links": {
+                "Homepage": "https://exzo.network"
+            },
+            "marketcap_usd": 0,
+            "name": "Exzo Network",
+            "shortcut": "XZO",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:YCC": {
             "links": {
                 "Homepage": "https://www.yuan.org"
@@ -38351,6 +40959,27 @@
                 }
             ]
         },
+        "eth:ZENIQ": {
+            "links": {
+                "Homepage": "https://www.zeniq.dev/"
+            },
+            "marketcap_usd": 0,
+            "name": "Zeniq",
+            "shortcut": "ZENIQ",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:ZENITH": {
             "links": {
                 "Homepage": "https://www.zenithchain.co/"
@@ -38376,7 +41005,7 @@
             "links": {
                 "Homepage": "https://www.singularity.gold"
             },
-            "marketcap_usd": 103580,
+            "marketcap_usd": 84248,
             "name": "Singularity ZERO",
             "shortcut": "ZERO",
             "t1_enabled": "yes",
@@ -38393,6 +41022,48 @@
                 }
             ]
         },
+        "eth:ZETA": {
+            "links": {
+                "Homepage": "https://docs.zetachain.com/"
+            },
+            "marketcap_usd": 0,
+            "name": "ZetaChain",
+            "shortcut": "ZETA",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:ZTH:427": {
+            "links": {
+                "Homepage": ""
+            },
+            "marketcap_usd": 0,
+            "name": "Zeeth Chain",
+            "shortcut": "ZTH",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:ZYX": {
             "links": {
                 "Homepage": "https://zyx.network/"
@@ -38477,6 +41148,48 @@
                 }
             ]
         },
+        "eth:eBTC": {
+            "links": {
+                "Homepage": "https://bitcoinevm.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Bitcoin EVM",
+            "shortcut": "eBTC",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:hP2": {
+            "links": {
+                "Homepage": "https://p12.network"
+            },
+            "marketcap_usd": 0,
+            "name": "P12 Chain",
+            "shortcut": "hP2",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:jfin": {
             "links": {
                 "Homepage": "https://jfinchain.com"
@@ -38502,7 +41215,7 @@
             "links": {
                 "Homepage": "https://www.platon.network"
             },
-            "marketcap_usd": 20556182,
+            "marketcap_usd": 78424786,
             "name": "PlatON",
             "shortcut": "lat",
             "t1_enabled": "yes",
@@ -38540,6 +41253,69 @@
                 }
             ]
         },
+        "eth:mALGO": {
+            "links": {
+                "Homepage": "https://milkomeda.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Milkomeda A1",
+            "shortcut": "mALGO",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:mc": {
+            "links": {
+                "Homepage": "https://moac.io"
+            },
+            "marketcap_usd": 0,
+            "name": "MOAC",
+            "shortcut": "mc",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:nSAN": {
+            "links": {
+                "Homepage": "https://sanr.app"
+            },
+            "marketcap_usd": 0,
+            "name": "SanR Chain",
+            "shortcut": "nSAN",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
         "eth:pCKB": {
             "links": {
                 "Homepage": "https://www.nervos.org"
@@ -38582,13 +41358,13 @@
                 }
             ]
         },
-        "eth:tGOR": {
+        "eth:tBVE": {
             "links": {
-                "Homepage": "https://goerli.net/#about"
+                "Homepage": "https://beverlyhills.ethdevops.io"
             },
             "marketcap_usd": 0,
-            "name": "G\u00f6rli",
-            "shortcut": "tGOR",
+            "name": "Beverly Hills",
+            "shortcut": "tBVE",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -38603,13 +41379,13 @@
                 }
             ]
         },
-        "eth:tKOR": {
+        "eth:tCRC": {
             "links": {
-                "Homepage": "https://optimism.io"
+                "Homepage": "https://github.com/ethereum-pocr/kerleano"
             },
             "marketcap_usd": 0,
-            "name": "Optimism Kovan",
-            "shortcut": "tKOR",
+            "name": "Kerleano",
+            "shortcut": "tCRC",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -38624,13 +41400,139 @@
                 }
             ]
         },
-        "eth:tKOV": {
+        "eth:tETH:11155111": {
+            "links": {
+                "Homepage": "https://sepolia.otterscan.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Sepolia",
+            "shortcut": "tETH",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:tETH:3": {
+            "links": {
+                "Homepage": "https://github.com/ethereum/ropsten"
+            },
+            "marketcap_usd": 0,
+            "name": "Ropsten",
+            "shortcut": "tETH",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:tETH:4": {
+            "links": {
+                "Homepage": "https://www.rinkeby.io"
+            },
+            "marketcap_usd": 0,
+            "name": "Rinkeby",
+            "shortcut": "tETH",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:tETH:42": {
             "links": {
                 "Homepage": "https://kovan-testnet.github.io/website"
             },
             "marketcap_usd": 0,
             "name": "Kovan",
-            "shortcut": "tKOV",
+            "shortcut": "tETH",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:tETH:5": {
+            "links": {
+                "Homepage": "https://goerli.net/#about"
+            },
+            "marketcap_usd": 0,
+            "name": "Goerli",
+            "shortcut": "tETH",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:tKEK": {
+            "links": {
+                "Homepage": "https://kekchain.com"
+            },
+            "marketcap_usd": 0,
+            "name": "Kekchain (kektest)",
+            "shortcut": "tKEK",
+            "t1_enabled": "yes",
+            "t2_enabled": "yes",
+            "type": "coin",
+            "wallet": [
+                {
+                    "name": "MyCrypto",
+                    "url": "https://mycrypto.com"
+                },
+                {
+                    "name": "MyEtherWallet",
+                    "url": "https://www.myetherwallet.com"
+                }
+            ]
+        },
+        "eth:tMAP": {
+            "links": {
+                "Homepage": "https://maplabs.io"
+            },
+            "marketcap_usd": 0,
+            "name": "MAP Makalu",
+            "shortcut": "tMAP",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -38666,13 +41568,13 @@
                 }
             ]
         },
-        "eth:tRIN": {
+        "eth:tWIRE": {
             "links": {
-                "Homepage": "https://www.rinkeby.io"
+                "Homepage": "https://wireshape.org"
             },
             "marketcap_usd": 0,
-            "name": "Rinkeby",
-            "shortcut": "tRIN",
+            "name": "Floripa",
+            "shortcut": "tWIRE",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -38687,30 +41589,13 @@
                 }
             ]
         },
-        "eth:tROP": {
+        "eth:taro": {
             "links": {
-                "Homepage": "https://github.com/ethereum/ropsten"
+                "Homepage": "https://j2o.io"
             },
             "marketcap_usd": 0,
-            "name": "Ropsten",
-            "shortcut": "tROP",
-            "t1_enabled": "yes",
-            "t2_enabled": "yes",
-            "type": "coin",
-            "wallet": [
-                {
-                    "name": "Trezor Suite",
-                    "url": "https://suite.trezor.io"
-                }
-            ]
-        },
-        "eth:tSEP": {
-            "links": {
-                "Homepage": "https://sepolia.otterscan.io"
-            },
-            "marketcap_usd": 0,
-            "name": "Sepolia",
-            "shortcut": "tSEP",
+            "name": "J2O Taro",
+            "shortcut": "taro",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -38727,10 +41612,10 @@
         },
         "eth:xDAI:100": {
             "links": {
-                "Homepage": "https://developers.gnosischain.com"
+                "Homepage": "https://docs.gnosischain.com"
             },
-            "marketcap_usd": 10886195,
-            "name": "Gnosis Chain",
+            "marketcap_usd": 6301880,
+            "name": "Gnosis",
             "shortcut": "xDAI",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
@@ -38750,8 +41635,8 @@
             "links": {
                 "Homepage": "https://www.xdaichain.com/for-developers/optimism-optimistic-rollups-on-gc"
             },
-            "marketcap_usd": 10886195,
-            "name": "Optimism on Gnosis Chain",
+            "marketcap_usd": 6301880,
+            "name": "Optimism on Gnosis",
             "shortcut": "xDAI",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
@@ -38767,13 +41652,13 @@
                 }
             ]
         },
-        "eth:\u03a6": {
+        "eth:xlon": {
             "links": {
-                "Homepage": "https://phi.network"
+                "Homepage": "https://xlon.org"
             },
             "marketcap_usd": 0,
-            "name": "PHI Network",
-            "shortcut": "\u03a6",
+            "name": "Excelon",
+            "shortcut": "xlon",
             "t1_enabled": "yes",
             "t2_enabled": "yes",
             "type": "coin",
@@ -38814,7 +41699,7 @@
                 "Github": "https://github.com/input-output-hk/cardano-node",
                 "Homepage": "https://www.cardano.org"
             },
-            "marketcap_usd": 13465469418,
+            "marketcap_usd": 12578496280,
             "name": "Cardano",
             "shortcut": "ADA",
             "t1_enabled": "no",
@@ -38831,7 +41716,7 @@
             "links": {
                 "Homepage": "https://binance.org"
             },
-            "marketcap_usd": 51094687147,
+            "marketcap_usd": 47729156144,
             "name": "Binance Chain",
             "shortcut": "BNB",
             "t1_enabled": "no",
@@ -38849,7 +41734,7 @@
                 "Github": "https://github.com/EOSIO/eos",
                 "Homepage": "https://eos.io"
             },
-            "marketcap_usd": 1145362807,
+            "marketcap_usd": 1253975568,
             "name": "EOS",
             "shortcut": "EOS",
             "t1_enabled": "no",
@@ -38867,7 +41752,7 @@
                 "Github": "https://github.com/maidsafe",
                 "Homepage": "https://maidsafe.net"
             },
-            "marketcap_usd": 62465583,
+            "marketcap_usd": 58807837,
             "name": "MaidSafeCoin",
             "shortcut": "MAID",
             "t1_enabled": "yes",
@@ -38880,7 +41765,7 @@
                 "Github": "https://github.com/OmniLayer",
                 "Homepage": "https://www.omnilayer.org"
             },
-            "marketcap_usd": 900903,
+            "marketcap_usd": 551822,
             "name": "Omni",
             "shortcut": "OMNI",
             "t1_enabled": "yes",
@@ -38892,7 +41777,7 @@
             "links": {
                 "Homepage": "https://tether.to"
             },
-            "marketcap_usd": 69415999585,
+            "marketcap_usd": 70941600691,
             "name": "Tether",
             "shortcut": "USDT",
             "t1_enabled": "yes",
@@ -38905,7 +41790,7 @@
                 "Github": "https://github.com/stellar/stellar-core",
                 "Homepage": "https://www.stellar.org"
             },
-            "marketcap_usd": 2772490697,
+            "marketcap_usd": 2316269327,
             "name": "Stellar",
             "shortcut": "XLM",
             "t1_enabled": "yes",
@@ -38931,7 +41816,7 @@
                 "Github": "https://github.com/monero-project/monero",
                 "Homepage": "https://getmonero.org"
             },
-            "marketcap_usd": 2729162888,
+            "marketcap_usd": 2733395377,
             "name": "Monero",
             "shortcut": "XMR",
             "t1_enabled": "no",
@@ -38949,7 +41834,7 @@
                 "Github": "https://github.com/ripple/rippled",
                 "Homepage": "https://ripple.com"
             },
-            "marketcap_usd": 22723856105,
+            "marketcap_usd": 19193526787,
             "name": "Ripple",
             "shortcut": "XRP",
             "t1_enabled": "no",
@@ -38971,7 +41856,7 @@
                 "Github": "https://github.com/tezos/tezos",
                 "Homepage": "https://tezos.com"
             },
-            "marketcap_usd": 1274246127,
+            "marketcap_usd": 1094195402,
             "name": "Tezos",
             "shortcut": "XTZ",
             "t1_enabled": "no",
@@ -38979,8 +41864,8 @@
             "type": "coin",
             "wallet": [
                 {
-                    "name": "SimpleStaking",
-                    "url": "https://simplestaking.com"
+                    "name": "Briskett",
+                    "url": "https://briskett.app"
                 }
             ]
         },
@@ -39074,7 +41959,7 @@
             "links": {
                 "Homepage": "https://nemplatform.com"
             },
-            "marketcap_usd": 343868874,
+            "marketcap_usd": 475266269,
             "name": "NEM",
             "shortcut": "XEM",
             "t1_enabled": "yes",
@@ -39089,12 +41974,12 @@
         }
     },
     "info": {
-        "marketcap_supported": "108.72 %",
-        "marketcap_usd": 1091938540074,
-        "t1_coins": 1969,
-        "t2_coins": 1975,
-        "total_marketcap_usd": 1004395134375,
-        "updated_at": 1667386190,
-        "updated_at_readable": "Wed Nov  2 11:49:50 2022"
+        "marketcap_supported": "103.22 %",
+        "marketcap_usd": 1102849874078,
+        "t1_coins": 2106,
+        "t2_coins": 2112,
+        "total_marketcap_usd": 1068459286951,
+        "updated_at": 1677585029,
+        "updated_at_readable": "Tue Feb 28 12:50:29 2023"
     }
 }
diff --git a/common/defs/ethereum/chains b/common/defs/ethereum/chains
index 4ba4ca129c..805ae42ecc 160000
--- a/common/defs/ethereum/chains
+++ b/common/defs/ethereum/chains
@@ -1 +1 @@
-Subproject commit 4ba4ca129c4d8b1b01179bfa50ad74c2a5b51b72
+Subproject commit 805ae42ecc53aa6493949b1e9c1da41e036c1845
diff --git a/common/defs/ethereum/tokens b/common/defs/ethereum/tokens
index 6a7ec4967b..0eeaf9b9f1 160000
--- a/common/defs/ethereum/tokens
+++ b/common/defs/ethereum/tokens
@@ -1 +1 @@
-Subproject commit 6a7ec4967b797f90e024296ef27c58480bf1b8ca
+Subproject commit 0eeaf9b9f13b5e6538da26d079e2b968dc8bb23f
diff --git a/common/defs/fido/apple.json b/common/defs/fido/apple.json
new file mode 100644
index 0000000000..26c3e1f02f
--- /dev/null
+++ b/common/defs/fido/apple.json
@@ -0,0 +1,5 @@
+{
+  "name": "Apple",
+  "webauthn": ["apple.com"],
+  "use_self_attestation": false
+}
diff --git a/common/defs/fido/apple.png b/common/defs/fido/apple.png
new file mode 100644
index 0000000000..8145a493d5
Binary files /dev/null and b/common/defs/fido/apple.png differ
diff --git a/common/defs/fido/google.json b/common/defs/fido/google.json
index c3a08976d5..a8071c30fe 100644
--- a/common/defs/fido/google.json
+++ b/common/defs/fido/google.json
@@ -6,5 +6,6 @@
       "label": "google.com"
     }
   ],
-  "webauthn": ["google.com"]
+  "webauthn": ["google.com"],
+  "use_self_attestation": false
 }
diff --git a/common/defs/misc/misc.json b/common/defs/misc/misc.json
index e2486aa87e..bc6f8f17ae 100644
--- a/common/defs/misc/misc.json
+++ b/common/defs/misc/misc.json
@@ -87,7 +87,7 @@
         }
     },
     {
-        "name": "Cardano Testnet",
+        "name": "Cardano Preview Testnet",
         "shortcut": "tADA",
         "slip44": 1815,
         "curve": "ed25519",
diff --git a/common/defs/support.json b/common/defs/support.json
index 74ed794e1c..f67b1caf60 100644
--- a/common/defs/support.json
+++ b/common/defs/support.json
@@ -59,10 +59,7 @@
       "eth:PIRL": true,
       "eth:RBTC": true,
       "eth:UBQ": true,
-      "eth:tKOV": true,
       "eth:tRBTC": true,
-      "eth:tRIN": true,
-      "eth:tROP": true,
       "misc:ADA": true,
       "misc:BNB": true,
       "misc:EOS": true,
@@ -96,7 +93,6 @@
       "bitcoin:ZEC": true,
       "eth:ETC": true,
       "eth:ETH:1": true,
-      "eth:tROP": true,
       "misc:XRP": true,
       "misc:tXRP": true
     },
@@ -159,8 +155,8 @@
       "bitcoin:tQTUM": "1.8.1",
       "bitcoin:tRVN": "1.10.0",
       "bitcoin:tSMART": "1.7.1",
-      "erc20:avax:AVAX": "1.11.2",
       "erc20:avax:USDT": "1.11.2",
+      "erc20:avax:WAVAX": "1.11.3",
       "erc20:esn:DGT": "1.7.1",
       "erc20:esn:TOPM": "1.7.1",
       "erc20:etc:BEC": "1.6.2",
@@ -196,9 +192,7 @@
       "erc20:eth:ADL": "1.6.2",
       "erc20:eth:ADST": "1.6.2",
       "erc20:eth:ADT": "1.6.2",
-      "erc20:eth:ADX": "1.6.2",
       "erc20:eth:ADX-LOYALTY": "1.9.5",
-      "erc20:eth:ADXL": "1.9.5",
       "erc20:eth:AE": "1.6.2",
       "erc20:eth:AEUR": "1.9.0",
       "erc20:eth:AFA": "1.8.0",
@@ -487,6 +481,7 @@
       "erc20:eth:DALC": "1.6.2",
       "erc20:eth:DAN": "1.6.2",
       "erc20:eth:DAT": "1.6.2",
+      "erc20:eth:DATA": "1.11.3",
       "erc20:eth:DATABroker": "1.6.2",
       "erc20:eth:DATX": "1.8.0",
       "erc20:eth:DAV": "1.6.2",
@@ -699,6 +694,7 @@
       "erc20:eth:GIF": "1.6.2",
       "erc20:eth:GIM": "1.6.2",
       "erc20:eth:GIRL": "1.8.4",
+      "erc20:eth:GIV": "1.11.3",
       "erc20:eth:GL": "1.9.1",
       "erc20:eth:GLA": "1.8.0",
       "erc20:eth:GMB": "1.11.2",
@@ -720,6 +716,7 @@
       "erc20:eth:GSE": "1.6.3",
       "erc20:eth:GST2": "1.9.0",
       "erc20:eth:GTC": "1.6.2",
+      "erc20:eth:GTEC": "1.11.3",
       "erc20:eth:GTH": "1.11.2",
       "erc20:eth:GTKT": "1.6.2",
       "erc20:eth:GTO": "1.6.2",
@@ -887,7 +884,7 @@
       "erc20:eth:LOOK": "1.6.3",
       "erc20:eth:LOOKS": "1.11.2",
       "erc20:eth:LOOM": "1.6.2",
-      "erc20:eth:LOOMOLD": "1.10.3",
+      "erc20:eth:LOOM:deprecated": "1.11.3",
       "erc20:eth:LOVE": "1.6.3",
       "erc20:eth:LPT": "1.6.2",
       "erc20:eth:LQD": "1.9.0",
@@ -922,7 +919,6 @@
       "erc20:eth:MEME": "1.9.5",
       "erc20:eth:MESG": "1.8.4",
       "erc20:eth:MEST": "1.6.2",
-      "erc20:eth:MET": "1.8.0",
       "erc20:eth:METM": "1.8.0",
       "erc20:eth:MFG": "1.6.2",
       "erc20:eth:MFT": "1.6.3",
@@ -1070,7 +1066,6 @@
       "erc20:eth:PATENTS": "1.6.2",
       "erc20:eth:PATH": "1.6.2",
       "erc20:eth:PATR": "1.9.0",
-      "erc20:eth:PAX": "1.8.0",
       "erc20:eth:PAXG": "1.8.4",
       "erc20:eth:PAY": "1.6.2",
       "erc20:eth:PBL": "1.6.2",
@@ -1269,8 +1264,7 @@
       "erc20:eth:SNM": "1.6.2",
       "erc20:eth:SNOV": "1.6.2",
       "erc20:eth:SNT": "1.6.2",
-      "erc20:eth:SNTR": "1.8.0",
-      "erc20:eth:SNX:c011": "1.10.3",
+      "erc20:eth:SNX": "1.11.3",
       "erc20:eth:SOAR": "1.8.0",
       "erc20:eth:SOC": "1.8.0",
       "erc20:eth:SOCKS": "1.9.0",
@@ -1294,7 +1288,6 @@
       "erc20:eth:SPZ": "1.9.0",
       "erc20:eth:SRN": "1.6.2",
       "erc20:eth:SRX": "1.8.4",
-      "erc20:eth:SSH": "1.6.2",
       "erc20:eth:SSP": "1.8.0",
       "erc20:eth:STABIT": "1.6.3",
       "erc20:eth:STAC": "1.6.2",
@@ -1325,6 +1318,7 @@
       "erc20:eth:SWASH": "1.10.4",
       "erc20:eth:SWFTC": "1.8.0",
       "erc20:eth:SWM": "1.6.2",
+      "erc20:eth:SWRM": "1.11.3",
       "erc20:eth:SWT": "1.6.2",
       "erc20:eth:SXDT": "1.6.2",
       "erc20:eth:SXR": "1.9.0",
@@ -1333,6 +1327,7 @@
       "erc20:eth:SYS": "1.10.6",
       "erc20:eth:SYSX": "1.9.5",
       "erc20:eth:SenSatorI": "1.6.2",
+      "erc20:eth:Skey": "1.11.3",
       "erc20:eth:TALAO": "1.8.0",
       "erc20:eth:TAN": "1.9.0",
       "erc20:eth:TAU": "1.6.2",
@@ -1350,6 +1345,7 @@
       "erc20:eth:TCST": "1.8.4",
       "erc20:eth:TCT": "1.8.4",
       "erc20:eth:TDH": "1.6.2",
+      "erc20:eth:TDX": "1.11.3",
       "erc20:eth:TEAM": "1.8.0",
       "erc20:eth:TECH": "1.9.0",
       "erc20:eth:TEN": "1.8.0",
@@ -1390,6 +1386,7 @@
       "erc20:eth:TRCT": "1.8.0",
       "erc20:eth:TRDT": "1.8.0",
       "erc20:eth:TRST": "1.6.2",
+      "erc20:eth:TRUCCO": "1.11.3",
       "erc20:eth:TRYB": "1.9.0",
       "erc20:eth:TSW": "1.6.3",
       "erc20:eth:TTA": "1.8.0",
@@ -1420,6 +1417,7 @@
       "erc20:eth:USD-G": "1.9.0",
       "erc20:eth:USDC": "1.7.1",
       "erc20:eth:USDM": "1.6.2",
+      "erc20:eth:USDP": "1.11.3",
       "erc20:eth:USDS": "1.8.0",
       "erc20:eth:USDT": "1.8.0",
       "erc20:eth:USDx": "1.9.0",
@@ -1478,6 +1476,7 @@
       "erc20:eth:WCK": "1.9.0",
       "erc20:eth:WCN": "1.6.2",
       "erc20:eth:WCT": "1.6.2",
+      "erc20:eth:WDOGE": "1.11.3",
       "erc20:eth:WEB": "1.8.0",
       "erc20:eth:WETH": "1.6.2",
       "erc20:eth:WHEN": "1.6.2",
@@ -1512,6 +1511,7 @@
       "erc20:eth:XCHF": "1.8.0",
       "erc20:eth:XCL": "1.9.0",
       "erc20:eth:XCLR": "1.8.0",
+      "erc20:eth:XDATA": "1.11.3",
       "erc20:eth:XDCE": "1.8.0",
       "erc20:eth:XES": "1.8.0",
       "erc20:eth:XET": "1.8.0",
@@ -1638,6 +1638,7 @@
       "erc20:eth:eosDAC": "1.6.2",
       "erc20:eth:fstETHDAI": "1.9.1",
       "erc20:eth:iBAT": "1.9.0",
+      "erc20:eth:iBBT": "1.11.3",
       "erc20:eth:iBNB": "1.9.0",
       "erc20:eth:iBTC": "1.9.0",
       "erc20:eth:iCEX": "1.9.0",
@@ -1996,8 +1997,8 @@
       "erc20:rop:RLC": "1.11.2",
       "erc20:rop:dqr30": "1.8.0",
       "erc20:rsk:ARSCB": "1.10.4",
+      "erc20:rsk:BITP": "1.11.3",
       "erc20:rsk:BOBCB": "1.10.4",
-      "erc20:rsk:BPro": "1.10.4",
       "erc20:rsk:BRLCB": "1.10.4",
       "erc20:rsk:BRZ": "1.10.4",
       "erc20:rsk:BTCCB": "1.10.4",
@@ -2046,88 +2047,142 @@
       "erc20:ubq:SPHR": "1.10.6",
       "erc20:ubq:SPHRC": "1.10.6",
       "erc20:ubq:TGE1": "1.10.6",
+      "eth:$BNI": "1.11.3",
       "eth:$OC": "1.10.5",
+      "eth:0XT": "1.11.3",
       "eth:0xF": "1.9.4",
-      "eth:420": "1.9.5",
       "eth:AAC": "1.10.6",
       "eth:ACA": "1.9.5",
+      "eth:ACE": "1.11.3",
       "eth:AIOZ": "1.11.2",
       "eth:AITD": "1.11.2",
       "eth:AKA": "1.6.3",
+      "eth:ALOT": "1.11.3",
+      "eth:ALPH": "1.11.3",
+      "eth:ALT": "1.11.3",
+      "eth:ALYX": "1.11.3",
+      "eth:AMAX": "1.11.3",
+      "eth:AMB": "1.11.3",
       "eth:AMBROS": "1.11.2",
       "eth:AME": "1.11.2",
+      "eth:ANY": "1.11.3",
       "eth:APTA": "1.11.3",
       "eth:AQUA": "1.8.2",
+      "eth:AR\u00c9V": "1.11.3",
+      "eth:ASA": "1.11.3",
       "eth:ASK": "1.10.4",
       "eth:ASTR": "1.11.2",
+      "eth:ATLR": "1.11.3",
       "eth:ATS": "1.8.0",
       "eth:AUX": "1.8.4",
       "eth:AVAX": "1.9.5",
+      "eth:AVS": "1.11.3",
       "eth:BCS": "1.10.6",
       "eth:BELLY": "1.11.2",
+      "eth:BFC": "1.11.3",
+      "eth:BG": "1.11.3",
+      "eth:BIT": "1.11.3",
+      "eth:BITCI": "1.11.3",
       "eth:BNB": "1.9.4",
-      "eth:BOBA": "1.11.2",
+      "eth:BOA": "1.11.3",
+      "eth:BOMB": "1.11.3",
       "eth:BOY": "1.10.6",
       "eth:BRB": "1.11.2",
-      "eth:BRO": "1.10.6",
+      "eth:BRNKC": "1.11.3",
       "eth:BTA": "1.10.4",
       "eth:BTCIX": "1.10.5",
       "eth:BTM": "1.10.5",
+      "eth:BTON": "1.11.3",
       "eth:BTT": "1.10.4",
+      "eth:BTY": "1.11.3",
+      "eth:BXN": "1.11.3",
       "eth:Brise": "1.11.2",
+      "eth:CAM:500": "1.11.3",
+      "eth:CANTO": "1.11.3",
       "eth:CATE": "1.10.3",
+      "eth:CCNA": "1.11.3",
       "eth:CCP": "1.10.6",
       "eth:CELO": "1.9.5",
       "eth:CEM": "1.11.2",
       "eth:CFX": "1.10.6",
+      "eth:CIC": "1.11.3",
       "eth:CLASS": "1.10.6",
+      "eth:CLD": "1.11.3",
       "eth:CLO": "1.6.2",
       "eth:CLV": "1.10.3",
+      "eth:CMEMO": "1.11.3",
+      "eth:CMP": "1.11.3",
       "eth:CNDL": "1.11.2",
+      "eth:CONDOR": "1.11.3",
+      "eth:CORE": "1.11.3",
       "eth:CPAY:21337": "1.11.2",
       "eth:CPAY:3000": "1.11.2",
       "eth:CPAY:3001": "1.11.2",
       "eth:CRAB": "1.10.5",
+      "eth:CRC": "1.11.3",
+      "eth:CREDIT": "1.11.3",
       "eth:CRO": "1.10.5",
       "eth:CSB": "1.11.2",
+      "eth:CTEX": "1.11.3",
       "eth:CUBE": "1.11.2",
       "eth:CWN": "1.11.2",
       "eth:DAX": "1.10.3",
+      "eth:DEB": "1.11.3",
+      "eth:DEL": "1.11.3",
       "eth:DEV": "1.10.4",
-      "eth:DGCC": "1.11.2",
+      "eth:DFI": "1.11.3",
       "eth:DIODE": "1.9.5",
-      "eth:DTH": "1.10.6",
+      "eth:DKN": "1.11.3",
+      "eth:DOGS": "1.11.3",
+      "eth:DOINX": "1.11.3",
+      "eth:DOS": "1.11.3",
+      "eth:DRAC": "1.11.3",
       "eth:DWU": "1.10.3",
       "eth:DX": "1.11.2",
+      "eth:DXT": "1.11.3",
       "eth:DYNO": "1.10.6",
+      "eth:Deh": "1.11.3",
+      "eth:ECG": "1.11.3",
       "eth:ECO": "1.10.4",
       "eth:ECS": "1.10.6",
       "eth:EDG": "1.10.3",
+      "eth:EGAZ": "1.11.3",
       "eth:EGEM": "1.6.2",
       "eth:EIDI": "1.10.6",
+      "eth:EKTA": "1.11.3",
       "eth:ELA:20": "1.10.3",
       "eth:ELV": "1.10.4",
+      "eth:EMPIRE": "1.11.3",
       "eth:ENTER": "1.10.6",
       "eth:ES": "1.10.3",
       "eth:ESN": "1.6.3",
       "eth:ETC": "1.6.2",
       "eth:ETH:1": "1.6.2",
+      "eth:ETHF": "1.11.3",
       "eth:ETHO": "1.6.3",
       "eth:ETI": "1.8.2",
       "eth:ETL": "1.10.3",
+      "eth:ETMP": "1.11.3",
       "eth:ETND": "1.11.2",
       "eth:EUN": "1.11.2",
       "eth:EVA": "1.10.6",
       "eth:EVC": "1.10.3",
       "eth:EVMOS": "1.10.6",
       "eth:EWT": "1.9.4",
+      "eth:EXL": "1.11.3",
       "eth:EXP": "1.6.2",
       "eth:EZC": "1.11.2",
       "eth:FETH": "1.10.3",
+      "eth:FIL": "1.11.3",
       "eth:FIN": "1.9.4",
+      "eth:FIRE:529": "1.11.3",
+      "eth:FITFI": "1.11.3",
+      "eth:FLA": "1.11.3",
       "eth:FLR": "1.9.5",
-      "eth:FRA": "1.11.2",
+      "eth:FNCY": "1.11.3",
+      "eth:FREN": "1.11.3",
       "eth:FSN": "1.10.3",
+      "eth:FST": "1.11.3",
       "eth:FTM": "1.9.4",
       "eth:FUSE": "1.9.4",
       "eth:FX": "1.11.2",
@@ -2135,37 +2190,61 @@
       "eth:GCD": "1.11.2",
       "eth:GEN": "1.10.3",
       "eth:GLMR": "1.10.3",
+      "eth:GLQ": "1.11.3",
+      "eth:GMMT": "1.11.3",
       "eth:GNC": "1.10.6",
       "eth:GO": "1.6.2",
-      "eth:GT": "1.10.3",
+      "eth:GOLDT": "1.11.3",
+      "eth:GZN": "1.11.3",
       "eth:GooD": "1.10.3",
       "eth:HAIC": "1.10.3",
+      "eth:HBAR:295": "1.11.3",
+      "eth:HMND": "1.11.3",
       "eth:HO": "1.10.5",
       "eth:HOO": "1.11.2",
       "eth:HOP": "1.10.5",
       "eth:HPB": "1.8.2",
       "eth:HT": "1.9.5",
+      "eth:HTML": "1.11.3",
+      "eth:HTZ": "1.11.3",
       "eth:ILT": "1.9.4",
+      "eth:IMV": "1.11.3",
       "eth:IORA": "1.10.6",
       "eth:IOTX": "1.10.3",
       "eth:IPOS": "1.9.4",
+      "eth:ISLM": "1.11.3",
       "eth:IVAR": "1.11.2",
+      "eth:J": "1.11.3",
+      "eth:JBC": "1.11.3",
       "eth:JEWEL:53935": "1.10.6",
+      "eth:JINDA": "1.11.3",
       "eth:JOYS": "1.9.5",
+      "eth:KAI": "1.11.3",
       "eth:KAR": "1.9.5",
       "eth:KAVA": "1.11.2",
       "eth:KCS": "1.10.3",
+      "eth:KEK": "1.11.3",
       "eth:KLAY": "1.9.5",
       "eth:KSX": "1.11.2",
       "eth:KTO:2559": "1.10.3",
+      "eth:KUB": "1.11.3",
       "eth:L1": "1.10.5",
       "eth:L99": "1.10.4",
       "eth:LA": "1.10.6",
+      "eth:LAVA": "1.11.3",
       "eth:LISINS": "1.11.2",
+      "eth:LUCID": "1.11.3",
       "eth:LUDAN": "1.11.2",
+      "eth:LYC": "1.11.3",
+      "eth:MAI": "1.11.3",
+      "eth:MAP": "1.11.3",
+      "eth:MARO": "1.11.3",
+      "eth:MAS": "1.11.3",
       "eth:MATH": "1.9.5",
       "eth:MATIC": "1.9.4",
+      "eth:MEER": "1.11.3",
       "eth:META": "1.8.2",
+      "eth:METAD": "1.11.3",
       "eth:METIS": "1.10.5",
       "eth:MINTME": "1.10.3",
       "eth:MIX": "1.7.2",
@@ -2176,37 +2255,54 @@
       "eth:MTT": "1.10.3",
       "eth:MTV": "1.11.2",
       "eth:MUSIC": "1.6.3",
+      "eth:MYTH": "1.11.3",
       "eth:NEON:245022934": "1.10.4",
       "eth:NEW": "1.9.5",
-      "eth:NEXT": "1.10.5",
       "eth:NRG": "1.9.4",
       "eth:NTT": "1.10.5",
+      "eth:NULS": "1.11.3",
+      "eth:NUM": "1.11.3",
+      "eth:NetZ": "1.11.3",
       "eth:OAC": "1.11.2",
+      "eth:OCTA": "1.11.3",
+      "eth:OHO": "1.11.3",
       "eth:OKT": "1.9.5",
       "eth:OLO": "1.10.3",
       "eth:OLT": "1.10.4",
       "eth:OM": "1.11.2",
+      "eth:OMAX": "1.11.3",
       "eth:OMC": "1.11.2",
       "eth:ONE:1666600000": "1.9.5",
       "eth:ONE:1666600001": "1.9.5",
       "eth:ONE:1666600002": "1.9.5",
       "eth:ONE:1666600003": "1.9.5",
       "eth:ONG": "1.10.3",
+      "eth:ONUS": "1.11.3",
       "eth:OPC": "1.11.2",
+      "eth:OPN": "1.11.3",
+      "eth:ORL": "1.11.3",
+      "eth:OTP": "1.11.3",
+      "eth:OXYN": "1.11.3",
       "eth:OY": "1.10.6",
       "eth:PALM": "1.9.5",
+      "eth:PDC": "1.11.3",
       "eth:PETH": "1.10.3",
       "eth:PFT:909": "1.11.2",
       "eth:PHT": "1.9.4",
       "eth:PHX": "1.10.6",
       "eth:PIRL": "1.6.3",
       "eth:PIX": "1.10.5",
+      "eth:PLQ": "1.11.3",
       "eth:PLS": "1.10.4",
       "eth:POA": "1.9.4",
       "eth:POLIS": "1.10.6",
+      "eth:POM": "1.11.3",
       "eth:POP": "1.10.4",
       "eth:PRB": "1.10.6",
+      "eth:PSC": "1.11.3",
+      "eth:PTX": "1.11.3",
       "eth:QDC": "1.11.2",
+      "eth:QKA": "1.11.3",
       "eth:QKC:100000": "1.10.3",
       "eth:QKC:100001": "1.10.3",
       "eth:QKC:100002": "1.10.3",
@@ -2217,29 +2313,41 @@
       "eth:QKC:100007": "1.10.3",
       "eth:QKC:100008": "1.10.3",
       "eth:QKI": "1.10.3",
+      "eth:QOM": "1.11.3",
       "eth:RBD": "1.9.4",
       "eth:RBTC": "1.6.2",
+      "eth:REAL": "1.11.3",
+      "eth:REDLC": "1.11.3",
       "eth:REI:47805": "1.10.6",
+      "eth:RESIN": "1.11.3",
       "eth:RING": "1.11.2",
       "eth:RNA": "1.10.3",
       "eth:ROC:1288": "1.11.2",
-      "eth:ROSE": "1.10.5",
       "eth:RPG": "1.10.5",
       "eth:RUPX": "1.9.5",
+      "eth:SAMA": "1.11.3",
       "eth:SDN": "1.10.4",
+      "eth:SEED": "1.11.3",
       "eth:SETM": "1.10.6",
       "eth:SFL": "1.11.2",
       "eth:SGB": "1.10.3",
       "eth:SHIB": "1.10.5",
+      "eth:SINSO": "1.11.3",
       "eth:SKU": "1.10.3",
       "eth:SMT": "1.11.2",
       "eth:SNT": "1.10.6",
       "eth:SOTER:68": "1.11.2",
       "eth:SPARK": "1.10.5",
       "eth:SPOA": "1.10.5",
+      "eth:SRDX": "1.11.3",
       "eth:SRN": "1.10.4",
+      "eth:STAND": "1.11.3",
+      "eth:STOS": "1.11.3",
+      "eth:SVRN": "1.11.3",
       "eth:SX": "1.11.2",
       "eth:Seele": "1.10.5",
+      "eth:SmuX": "1.11.3",
+      "eth:T-EKTA": "1.11.3",
       "eth:TAO": "1.9.4",
       "eth:TBG": "1.9.5",
       "eth:TCH": "1.9.4",
@@ -2249,6 +2357,7 @@
       "eth:TFI": "1.9.5",
       "eth:TLC": "1.11.2",
       "eth:TLOS:40": "1.10.3",
+      "eth:TMY": "1.11.3",
       "eth:TOMB": "1.11.2",
       "eth:TOMO:88": "1.10.6",
       "eth:TOYS": "1.9.5",
@@ -2258,52 +2367,77 @@
       "eth:TST": "1.9.4",
       "eth:TT": "1.9.4",
       "eth:TUBQ": "1.9.4",
+      "eth:TWL": "1.11.3",
       "eth:TXDC": "1.9.5",
       "eth:TXL": "1.11.2",
       "eth:U+25B3": "1.9.4",
       "eth:UBC": "1.10.6",
       "eth:UBQ": "1.6.2",
+      "eth:ULX": "1.11.3",
+      "eth:UNQ": "1.11.3",
       "eth:UZMI": "1.10.5",
       "eth:VAL": "1.9.4",
+      "eth:VET": "1.11.3",
+      "eth:VETH": "1.11.3",
       "eth:VLX": "1.10.4",
       "eth:VNDT": "1.11.2",
+      "eth:VNT": "1.11.3",
       "eth:VS:888888": "1.10.6",
+      "eth:VSC": "1.11.3",
       "eth:W3G": "1.10.6",
       "eth:W3Q:333": "1.10.6",
       "eth:WAN": "1.10.3",
       "eth:WEB": "1.9.4",
+      "eth:WEMIX": "1.11.3",
       "eth:WGM": "1.10.6",
       "eth:WTT": "1.10.5",
       "eth:XDC": "1.9.5",
       "eth:XERO": "1.9.4",
+      "eth:XETA": "1.11.3",
+      "eth:XODEX": "1.11.3",
       "eth:XT": "1.11.2",
       "eth:XVM": "1.11.2",
+      "eth:XZO": "1.11.3",
       "eth:YCC": "1.11.2",
       "eth:YETI": "1.9.4",
+      "eth:ZENIQ": "1.11.3",
       "eth:ZENITH": "1.11.2",
       "eth:ZERO": "1.10.5",
+      "eth:ZETA": "1.11.3",
+      "eth:ZTH:427": "1.11.3",
       "eth:ZYX": "1.10.4",
       "eth:atp": "1.10.5",
       "eth:cTH": "1.10.3",
       "eth:cet": "1.10.3",
+      "eth:eBTC": "1.11.3",
+      "eth:hP2": "1.11.3",
       "eth:jfin": "1.11.2",
       "eth:lat": "1.10.6",
       "eth:mADA": "1.11.2",
+      "eth:mALGO": "1.11.3",
+      "eth:mc": "1.11.3",
+      "eth:nSAN": "1.11.3",
       "eth:pCKB": "1.11.2",
       "eth:peggle": "1.9.5",
       "eth:tATS": "1.8.0",
       "eth:tAVAX": "1.9.5",
       "eth:tBNB": "1.9.4",
+      "eth:tBVE": "1.11.3",
       "eth:tCELO:44787": "1.9.5",
       "eth:tCELO:62320": "1.9.5",
       "eth:tCFLR": "1.9.5",
+      "eth:tCRC": "1.11.3",
       "eth:tDBM": "1.9.4",
-      "eth:tGOR": "1.11.2",
+      "eth:tETH:11155111": "1.11.3",
+      "eth:tETH:3": "1.11.3",
+      "eth:tETH:4": "1.11.3",
+      "eth:tETH:42": "1.11.3",
+      "eth:tETH:5": "1.11.3",
       "eth:tKAL": "1.9.4",
+      "eth:tKEK": "1.11.3",
       "eth:tKLAY": "1.9.5",
-      "eth:tKOR": "1.9.5",
       "eth:tKOT": "1.9.4",
-      "eth:tKOV": "1.6.2",
+      "eth:tMAP": "1.11.3",
       "eth:tMATH": "1.9.5",
       "eth:tMATIC": "1.9.4",
       "eth:tMETC": "1.9.4",
@@ -2311,16 +2445,15 @@
       "eth:tNRG": "1.9.4",
       "eth:tPHT": "1.9.4",
       "eth:tRBTC": "1.6.2",
-      "eth:tRIN": "1.6.2",
-      "eth:tROP": "1.6.2",
-      "eth:tSEP": "1.10.6",
       "eth:tVT": "1.9.4",
+      "eth:tWIRE": "1.11.3",
+      "eth:taro": "1.11.3",
       "eth:thtt": "1.9.5",
       "eth:tmACA": "1.9.5",
       "eth:tsDIODE": "1.9.5",
       "eth:xDAI:100": "1.9.4",
       "eth:xDAI:300": "1.11.2",
-      "eth:\u03a6": "1.11.2",
+      "eth:xlon": "1.11.3",
       "eth:\u25c8": "1.11.2",
       "misc:MAID": "1.7.2",
       "misc:OMNI": "1.7.2",
@@ -2340,8 +2473,10 @@
       "erc20:etc:PLAY": "(AUTO) duplicate key",
       "erc20:eth:A18:ba7d": "(AUTO) duplicate key",
       "erc20:eth:A18:bde8": "(AUTO) duplicate key",
-      "erc20:eth:ANT": "(AUTO) duplicate key",
-      "erc20:eth:ANT (old)": "(AUTO) duplicate key",
+      "erc20:eth:ADX:4470": "(AUTO) duplicate key",
+      "erc20:eth:ADX:ade0": "(AUTO) duplicate key",
+      "erc20:eth:ANT:960b": "(AUTO) duplicate key",
+      "erc20:eth:ANT:a117": "(AUTO) duplicate key",
       "erc20:eth:ATH": "(AUTO) duplicate key",
       "erc20:eth:ATH (AIgatha Token)": "(AUTO) duplicate key",
       "erc20:eth:ATS": "duplicate key with eth:ATS",
@@ -2399,8 +2534,6 @@
       "erc20:eth:CTT:e3fa": "(AUTO) duplicate key",
       "erc20:eth:DAO:0f51": "(AUTO) duplicate key",
       "erc20:eth:DAO:bb9b": "(AUTO) duplicate key",
-      "erc20:eth:DATA:0cf0": "(AUTO) duplicate key",
-      "erc20:eth:DATA:8f69": "(AUTO) duplicate key",
       "erc20:eth:DEPO": "(AUTO) duplicate key",
       "erc20:eth:DEPO (Depository Network)": "(AUTO) duplicate key",
       "erc20:eth:DGTX:1c83": "(AUTO) duplicate key",
@@ -2476,6 +2609,8 @@
       "erc20:eth:MDS:92b7": "(AUTO) duplicate key",
       "erc20:eth:MESH:01f2": "(AUTO) duplicate key",
       "erc20:eth:MESH:f030": "(AUTO) duplicate key",
+      "erc20:eth:MET:2ebd": "(AUTO) duplicate key",
+      "erc20:eth:MET:a3d5": "(AUTO) duplicate key",
       "erc20:eth:MIT": "(AUTO) duplicate key",
       "erc20:eth:MIT (Mychatcoin)": "(AUTO) duplicate key",
       "erc20:eth:MOC": "(AUTO) duplicate key",
@@ -2597,31 +2732,72 @@
       "eth:ATH:1620": "duplicate key",
       "eth:ATH:43110": "duplicate key",
       "eth:BCH": "duplicate of bitcoin:BCH",
+      "eth:BOBA:1294": "duplicate key",
+      "eth:BOBA:301": "duplicate key",
+      "eth:BOBA:43288": "duplicate key",
+      "eth:BOBA:56288": "duplicate key",
+      "eth:BOBA:97288": "duplicate key",
+      "eth:BRO:1039": "duplicate key",
+      "eth:BRO:108801": "duplicate key",
       "eth:BTX": "duplicate key",
-      "eth:CPAY:1337": "deprecated",
+      "eth:CAM:501": "duplicate key",
+      "eth:CCN:970": "duplicate key",
+      "eth:CCN:9700": "duplicate key",
+      "eth:CCN:971": "duplicate key",
+      "eth:DOGE": "duplicate key",
       "eth:ELA:22": "duplicate of ELA-ETH-sidechain",
       "eth:ELLA:64": "duplicate symbol",
       "eth:ELLA:7027": "duplicate symbol",
       "eth:EOS": "mainnet exists",
       "eth:ETH:10": "duplicate key",
+      "eth:ETH:10086": "duplicate key",
+      "eth:ETH:116": "duplicate key",
       "eth:ETH:1313161554": "duplicate key",
       "eth:ETH:1313161556": "duplicate key",
       "eth:ETH:1337802": "eth collision",
+      "eth:ETH:1337803": "duplicate key",
       "eth:ETH:288": "duplicate key",
+      "eth:ETH:324": "duplicate key",
       "eth:ETH:42161": "duplicate key",
       "eth:ETH:42170": "eth collision",
+      "eth:ETH:50001": "duplicate key",
+      "eth:ETH:534352": "duplicate key",
       "eth:ETH:5551": "eth collision",
       "eth:ETH:73927": "duplicate key",
+      "eth:ETH:8453": "duplicate key",
       "eth:ETH:980": "eth collision",
+      "eth:FIRE:5290": "duplicate key",
+      "eth:FRA:2152": "duplicate key",
+      "eth:FRA:2154": "duplicate key",
       "eth:GAR:91": "duplicate key",
       "eth:GAR:92": "duplicate key",
       "eth:GAR:93": "duplicate key",
+      "eth:GT:10024": "duplicate key",
+      "eth:GT:86": "duplicate key",
       "eth:GTH:192837465": "duplicate key",
       "eth:GTH:486217935": "exclude testnet",
+      "eth:HBAR:297": "duplicate key",
+      "eth:HBAR:298": "duplicate key",
       "eth:JEWEL:335": "exclude testnet",
       "eth:KTO:8285": "exclude testnet",
+      "eth:MCD:217": "duplicate key",
+      "eth:MCD:67390": "duplicate key",
+      "eth:METAL:381931": "duplicate key",
+      "eth:METAL:381932": "duplicate key",
       "eth:NEON:245022926": "duplicate key",
+      "eth:OAS:19011": "duplicate key",
+      "eth:OAS:2400": "duplicate key",
+      "eth:OAS:248": "duplicate key",
+      "eth:OAS:5555": "duplicate key",
+      "eth:OAS:7225878": "duplicate key",
+      "eth:OAS:876": "duplicate key",
+      "eth:ONE:1666900000": "duplicate key",
       "eth:PFT:808": "testnet",
+      "eth:PI:2099156": "duplicate key",
+      "eth:PI:8007736": "duplicate key",
+      "eth:POSI:900000": "duplicate key",
+      "eth:POSI:920000": "duplicate key",
+      "eth:POSI:920001": "duplicate key",
       "eth:Q": "causing problems in altcoin detection",
       "eth:QKC:110000": "exclude testnet",
       "eth:QKC:110001": "exclude testnet",
@@ -2632,14 +2808,28 @@
       "eth:QKC:110006": "exclude testnet",
       "eth:QKC:110007": "exclude testnet",
       "eth:QKC:110008": "exclude testnet",
+      "eth:QTZ:8881": "duplicate key",
+      "eth:QTZ:8883": "duplicate key",
       "eth:REI:55555": "duplicate key",
       "eth:ROC:1286": "deprecated",
+      "eth:ROSE:23294": "duplicate key",
+      "eth:ROSE:42262": "duplicate key",
+      "eth:SHM:8080": "duplicate key",
+      "eth:SHM:8081": "duplicate key",
+      "eth:SHM:8082": "duplicate key",
       "eth:SHYFT": "slip44 out of range",
       "eth:SOTER:218": "deprecated",
       "eth:SYS": "duplicate key",
+      "eth:T-FSN": "(AUTO) exclude testnet",
+      "eth:TARA:841": "duplicate key",
+      "eth:TARA:842": "(AUTO) exclude testnet",
       "eth:TAero": "(AUTO) exclude testnet",
+      "eth:TBITCI": "(AUTO) exclude testnet",
+      "eth:TBXN": "(AUTO) exclude testnet",
       "eth:TCRO": "(AUTO) exclude testnet",
       "eth:TELE:8001": "(AUTO) exclude testnet",
+      "eth:TEST": "(AUTO) exclude testnet",
+      "eth:TEXL": "(AUTO) exclude testnet",
       "eth:TFUEL:361": "incompatible",
       "eth:TFUEL:363": "(AUTO) exclude testnet",
       "eth:TFUEL:364": "(AUTO) exclude testnet",
@@ -2655,56 +2845,128 @@
       "eth:TKM:70103": "duplicate key",
       "eth:TLA": "(AUTO) exclude testnet",
       "eth:TLOS:41": "(AUTO) exclude testnet",
+      "eth:TOKI:8654": "duplicate key",
+      "eth:TOKI:8655": "(AUTO) exclude testnet",
       "eth:TOMO:89": "(AUTO) exclude testnet",
       "eth:TOP": "causing problems in altcoin detection",
       "eth:TOPC": "(AUTO) exclude testnet",
+      "eth:TPBX:404040": "duplicate key",
+      "eth:TPBX:4141": "(AUTO) exclude testnet",
+      "eth:TPI:10067275": "(AUTO) exclude testnet",
+      "eth:TPI:16658437": "(AUTO) exclude testnet",
+      "eth:TRES:6065": "(AUTO) exclude testnet",
+      "eth:TRES:6066": "duplicate key",
       "eth:TSCAS": "(AUTO) exclude testnet",
+      "eth:TSETH": "(AUTO) exclude testnet",
+      "eth:USD:2018": "duplicate key",
+      "eth:USD:2020": "duplicate key",
       "eth:VS:666666": "exclude testnet",
       "eth:W3Q:3334": "duplicate key",
+      "eth:ZTH:859": "duplicate key",
+      "eth:sFUEL:1482601649": "duplicate key",
+      "eth:sFUEL:1564830818": "duplicate key",
+      "eth:sFUEL:2046399126": "duplicate key",
+      "eth:sFUEL:503129905": "duplicate key",
+      "eth:t$BNI": "(AUTO) exclude testnet",
       "eth:tAAC": "(AUTO) exclude testnet",
       "eth:tACA": "(AUTO) exclude testnet",
       "eth:tAGOR": "testnet",
       "eth:tAIOZ": "(AUTO) exclude testnet",
       "eth:tAITD": "(AUTO) exclude testnet",
       "eth:tALOT": "(AUTO) exclude testnet",
-      "eth:tAMBROS": "(AUTO) exclude testnet",
-      "eth:tARETH": "(AUTO) exclude testnet",
+      "eth:tALYX": "(AUTO) exclude testnet",
+      "eth:tAMAX": "(AUTO) exclude testnet",
+      "eth:tAMB": "(AUTO) exclude testnet",
+      "eth:tASA": "(AUTO) exclude testnet",
+      "eth:tATN:65010000": "(AUTO) exclude testnet",
+      "eth:tATN:65100000": "(AUTO) exclude testnet",
+      "eth:tATOS": "(AUTO) exclude testnet",
       "eth:tAVIS": "(AUTO) exclude testnet",
+      "eth:tAcol": "(AUTO) exclude testnet",
       "eth:tBCHT": "(AUTO) exclude testnet",
       "eth:tBCS": "(AUTO) exclude testnet",
       "eth:tBELLY": "(AUTO) exclude testnet",
-      "eth:tBOBA": "(AUTO) exclude testnet",
+      "eth:tBFC": "(AUTO) exclude testnet",
+      "eth:tBIT": "(AUTO) exclude testnet",
+      "eth:tBLG": "(AUTO) exclude testnet",
+      "eth:tBOBA:1297": "(AUTO) exclude testnet",
+      "eth:tBOBA:4051": "(AUTO) exclude testnet",
+      "eth:tBOBA:4328": "(AUTO) exclude testnet",
+      "eth:tBOBA:9728": "(AUTO) exclude testnet",
+      "eth:tBOC": "(AUTO) exclude testnet",
+      "eth:tBOMB": "(AUTO) exclude testnet",
+      "eth:tBRNKC": "(AUTO) exclude testnet",
+      "eth:tBRO": "(AUTO) exclude testnet",
       "eth:tBTM": "(AUTO) exclude testnet",
       "eth:tBTT": "(AUTO) exclude testnet",
+      "eth:tC2FLR": "(AUTO) exclude testnet",
+      "eth:tCANTO": "(AUTO) exclude testnet",
       "eth:tCFX": "(AUTO) exclude testnet",
+      "eth:tCHZ": "(AUTO) exclude testnet",
+      "eth:tCICT": "(AUTO) exclude testnet",
       "eth:tCKB:71393": "(AUTO) exclude testnet",
       "eth:tCKB:868455272153094": "(AUTO) exclude testnet",
+      "eth:tCLD": "(AUTO) exclude testnet",
+      "eth:tCLO": "(AUTO) exclude testnet",
       "eth:tCLV": "(AUTO) exclude testnet",
       "eth:tCMP": "(AUTO) exclude testnet",
+      "eth:tCNT": "(AUTO) exclude testnet",
+      "eth:tCORE": "(AUTO) exclude testnet",
       "eth:tCTE": "testnet",
       "eth:tCUBET": "(AUTO) exclude testnet",
       "eth:tCWN": "(AUTO) exclude testnet",
+      "eth:tDB": "(AUTO) exclude testnet",
+      "eth:tDEL": "(AUTO) exclude testnet",
+      "eth:tDFI": "(AUTO) exclude testnet",
+      "eth:tDOGE": "(AUTO) exclude testnet",
+      "eth:tDOGS": "(AUTO) exclude testnet",
       "eth:tDTH": "(AUTO) exclude testnet",
       "eth:tDX": "(AUTO) exclude testnet",
       "eth:tDYNO": "(AUTO) exclude testnet",
       "eth:tECE": "(AUTO) exclude testnet",
+      "eth:tECG": "(AUTO) exclude testnet",
       "eth:tECO": "(AUTO) exclude testnet",
       "eth:tECS": "(AUTO) exclude testnet",
       "eth:tEDG": "(AUTO) exclude testnet",
+      "eth:tEDX": "(AUTO) exclude testnet",
       "eth:tELA:21": "(AUTO) exclude testnet",
       "eth:tELA:23": "(AUTO) exclude testnet",
       "eth:tEOS": "(AUTO) exclude testnet",
+      "eth:tETH:115": "(AUTO) exclude testnet",
       "eth:tETH:1313161555": "(AUTO) exclude testnet",
+      "eth:tETH:1337": "(AUTO) exclude testnet",
+      "eth:tETH:1402": "(AUTO) exclude testnet",
+      "eth:tETH:1422": "(AUTO) exclude testnet",
       "eth:tETH:28": "(AUTO) exclude testnet",
       "eth:tETH:280": "(AUTO) exclude testnet",
+      "eth:tETH:28528": "(AUTO) exclude testnet",
+      "eth:tETH:2888": "(AUTO) exclude testnet",
       "eth:tETH:420": "(AUTO) exclude testnet",
+      "eth:tETH:421611": "duplicate key",
+      "eth:tETH:534353": "(AUTO) exclude testnet",
       "eth:tETH:5553": "(AUTO) exclude testnet",
+      "eth:tETH:5777": "duplicate key",
+      "eth:tETH:69": "duplicate key",
+      "eth:tETH:84531": "(AUTO) exclude testnet",
+      "eth:tETH:956": "(AUTO) exclude testnet",
+      "eth:tETMP": "(AUTO) exclude testnet",
       "eth:tEUN": "(AUTO) exclude testnet",
+      "eth:tEVM": "(AUTO) exclude testnet",
       "eth:tEVMOS": "(AUTO) exclude testnet",
       "eth:tEZC": "(AUTO) exclude testnet",
-      "eth:tFETH": "(AUTO) exclude testnet",
+      "eth:tFIL:3141": "(AUTO) exclude testnet",
+      "eth:tFIL:31415": "(AUTO) exclude testnet",
+      "eth:tFIL:314159": "(AUTO) exclude testnet",
+      "eth:tFIL:3141592": "(AUTO) exclude testnet",
+      "eth:tFIL:31415926": "(AUTO) exclude testnet",
+      "eth:tFIRE:917": "(AUTO) exclude testnet",
+      "eth:tFIRE:9170": "(AUTO) exclude testnet",
+      "eth:tFITFI": "(AUTO) exclude testnet",
+      "eth:tFNCY": "(AUTO) exclude testnet",
       "eth:tFRA": "(AUTO) exclude testnet",
       "eth:tFTM": "(AUTO) exclude testnet",
+      "eth:tFTN": "(AUTO) exclude testnet",
+      "eth:tFtREN": "(AUTO) exclude testnet",
       "eth:tGAR:900": "(AUTO) exclude testnet",
       "eth:tGAR:901": "(AUTO) exclude testnet",
       "eth:tGAR:902": "(AUTO) exclude testnet",
@@ -2712,20 +2974,34 @@
       "eth:tGCD": "(AUTO) exclude testnet",
       "eth:tGO": "(AUTO) exclude testnet",
       "eth:tGT": "(AUTO) exclude testnet",
+      "eth:tGTFX": "(AUTO) exclude testnet",
       "eth:tGTH": "(AUTO) exclude testnet",
+      "eth:tGZN": "(AUTO) exclude testnet",
       "eth:tGooD": "(AUTO) exclude testnet",
+      "eth:tHBAR": "(AUTO) exclude testnet",
+      "eth:tHIK": "(AUTO) exclude testnet",
       "eth:tHOO": "(AUTO) exclude testnet",
+      "eth:tHPN": "(AUTO) exclude testnet",
       "eth:tHYM": "(AUTO) exclude testnet",
+      "eth:tIDE": "(AUTO) exclude testnet",
+      "eth:tIMV": "(AUTO) exclude testnet",
       "eth:tIOTX": "(AUTO) exclude testnet",
+      "eth:tISLMT": "(AUTO) exclude testnet",
       "eth:tIVAR": "(AUTO) exclude testnet",
+      "eth:tJINDA": "(AUTO) exclude testnet",
       "eth:tKAIBA": "(AUTO) exclude testnet",
       "eth:tKAR": "(AUTO) exclude testnet",
       "eth:tKCS": "(AUTO) exclude testnet",
       "eth:tKSX": "(AUTO) exclude testnet",
+      "eth:tKUB": "(AUTO) exclude testnet",
       "eth:tL1test": "(AUTO) exclude testnet",
+      "eth:tLAMB": "(AUTO) exclude testnet",
+      "eth:tLAVA": "(AUTO) exclude testnet",
       "eth:tMDGLT": "(AUTO) exclude testnet",
+      "eth:tMEER-T": "(AUTO) exclude testnet",
       "eth:tMESHT": "(AUTO) exclude testnet",
-      "eth:tMETIS": "(AUTO) exclude testnet",
+      "eth:tMETIS:588": "(AUTO) exclude testnet",
+      "eth:tMETIS:599": "(AUTO) exclude testnet",
       "eth:tMTR": "(AUTO) exclude testnet",
       "eth:tMTTest": "(AUTO) exclude testnet",
       "eth:tMYN": "(AUTO) exclude testnet",
@@ -2733,6 +3009,10 @@
       "eth:tNEON": "(AUTO) exclude testnet",
       "eth:tNMAC": "(AUTO) exclude testnet",
       "eth:tNTTH": "(AUTO) exclude testnet",
+      "eth:tNULS": "(AUTO) exclude testnet",
+      "eth:tNUM": "(AUTO) exclude testnet",
+      "eth:tNetZ": "(AUTO) exclude testnet",
+      "eth:tOAS": "(AUTO) exclude testnet",
       "eth:tOKT": "(AUTO) exclude testnet",
       "eth:tOLO": "(AUTO) exclude testnet",
       "eth:tOLT": "(AUTO) exclude testnet",
@@ -2741,6 +3021,8 @@
       "eth:tONE:1666700002": "(AUTO) exclude testnet",
       "eth:tONE:1666700003": "(AUTO) exclude testnet",
       "eth:tONG": "(AUTO) exclude testnet",
+      "eth:tONUS": "(AUTO) exclude testnet",
+      "eth:tOONE": "(AUTO) exclude testnet",
       "eth:tORING": "(AUTO) exclude testnet",
       "eth:tOY": "(AUTO) exclude testnet",
       "eth:tPALM": "(AUTO) exclude testnet",
@@ -2749,38 +3031,66 @@
       "eth:tPLS:941": "(AUTO) exclude testnet",
       "eth:tPLS:942": "(AUTO) exclude testnet",
       "eth:tPOLIS": "(AUTO) exclude testnet",
+      "eth:tPOSI": "(AUTO) exclude testnet",
       "eth:tPRB": "(AUTO) exclude testnet",
       "eth:tPRING": "(AUTO) exclude testnet",
+      "eth:tPRX": "(AUTO) exclude testnet",
+      "eth:tPTX": "(AUTO) exclude testnet",
       "eth:tQ": "causing problems in altcoin detection",
       "eth:tQDC": "(AUTO) exclude testnet",
+      "eth:tQET": "(AUTO) exclude testnet",
+      "eth:tQOM": "(AUTO) exclude testnet",
       "eth:tREI": "(AUTO) exclude testnet",
-      "eth:tRNA": "(AUTO) exclude testnet",
       "eth:tROSE": "(AUTO) exclude testnet",
       "eth:tRPG": "(AUTO) exclude testnet",
       "eth:tSFL": "(AUTO) exclude testnet",
+      "eth:tSHT": "(AUTO) exclude testnet",
       "eth:tSHYFTT": "(AUTO) exclude testnet",
+      "eth:tSINSO": "(AUTO) exclude testnet",
       "eth:tSNS": "(AUTO) exclude testnet",
+      "eth:tSRDX": "(AUTO) exclude testnet",
+      "eth:tSTAND": "(AUTO) exclude testnet",
+      "eth:tSTOS": "(AUTO) exclude testnet",
+      "eth:tSVRN": "(AUTO) exclude testnet",
       "eth:tSX": "(AUTO) exclude testnet",
       "eth:tSYS": "(AUTO) exclude testnet",
+      "eth:tU2U": "(AUTO) exclude testnet",
       "eth:tUBC": "(AUTO) exclude testnet",
+      "eth:tULX": "(AUTO) exclude testnet",
+      "eth:tUNQ": "(AUTO) exclude testnet",
+      "eth:tUSD": "(AUTO) exclude testnet",
+      "eth:tVET": "(AUTO) exclude testnet",
       "eth:tVIL": "(AUTO) exclude testnet",
+      "eth:tVNT": "(AUTO) exclude testnet",
       "eth:tW3G": "(AUTO) exclude testnet",
       "eth:tW3Q": "(AUTO) exclude testnet",
       "eth:tWAN": "(AUTO) exclude testnet",
+      "eth:tWEMIX": "(AUTO) exclude testnet",
       "eth:tWLK": "(AUTO) exclude testnet",
       "eth:tXPR": "(AUTO) exclude testnet",
       "eth:tXVM": "(AUTO) exclude testnet",
       "eth:tZCR": "(AUTO) exclude testnet",
+      "eth:tZEN": "(AUTO) exclude testnet",
       "eth:tZERO": "(AUTO) exclude testnet",
+      "eth:tZKST": "(AUTO) exclude testnet",
+      "eth:taZETA": "(AUTO) exclude testnet",
       "eth:tatp": "(AUTO) exclude testnet",
       "eth:tcett": "(AUTO) exclude testnet",
       "eth:tkiETH": "(AUTO) exclude testnet",
       "eth:tlat:2203181": "(AUTO) exclude testnet",
       "eth:tlat:2206132": "(AUTO) exclude testnet",
       "eth:tmTAda": "(AUTO) exclude testnet",
+      "eth:tmTAlgo": "(AUTO) exclude testnet",
+      "eth:tmc": "(AUTO) exclude testnet",
       "eth:tpCKB": "(AUTO) exclude testnet",
+      "eth:trAna": "(AUTO) exclude testnet",
+      "eth:tsFUEL": "(AUTO) exclude testnet",
       "eth:tusd": "(AUTO) exclude testnet",
+      "eth:txDAI:100100": "(AUTO) exclude testnet",
+      "eth:txDAI:10200": "(AUTO) exclude testnet",
       "eth:xDAI:200": "duplicate key",
+      "eth:\u03a6:144": "duplicate key",
+      "eth:\u03a6:4181": "duplicate key",
       "misc:ADA": "not implemented",
       "misc:BNB": "not implemented",
       "misc:EOS": "not implemented",
@@ -2849,8 +3159,8 @@
       "bitcoin:tQTUM": "2.1.1",
       "bitcoin:tRVN": "2.4.0",
       "bitcoin:tSMART": "2.0.8",
-      "erc20:avax:AVAX": "2.5.2",
       "erc20:avax:USDT": "2.5.2",
+      "erc20:avax:WAVAX": "2.5.4",
       "erc20:esn:DGT": "2.0.8",
       "erc20:esn:TOPM": "2.0.8",
       "erc20:etc:BEC": "2.0.7",
@@ -2886,9 +3196,7 @@
       "erc20:eth:ADL": "2.0.7",
       "erc20:eth:ADST": "2.0.7",
       "erc20:eth:ADT": "2.0.7",
-      "erc20:eth:ADX": "2.0.7",
       "erc20:eth:ADX-LOYALTY": "2.3.7",
-      "erc20:eth:ADXL": "2.3.7",
       "erc20:eth:AE": "2.0.7",
       "erc20:eth:AEUR": "2.3.0",
       "erc20:eth:AFA": "2.0.10",
@@ -3177,6 +3485,7 @@
       "erc20:eth:DALC": "2.0.7",
       "erc20:eth:DAN": "2.0.7",
       "erc20:eth:DAT": "2.0.7",
+      "erc20:eth:DATA": "2.5.4",
       "erc20:eth:DATABroker": "2.0.7",
       "erc20:eth:DATX": "2.0.11",
       "erc20:eth:DAV": "2.0.7",
@@ -3389,6 +3698,7 @@
       "erc20:eth:GIF": "2.0.7",
       "erc20:eth:GIM": "2.0.7",
       "erc20:eth:GIRL": "2.1.8",
+      "erc20:eth:GIV": "2.5.4",
       "erc20:eth:GL": "2.3.1",
       "erc20:eth:GLA": "2.0.10",
       "erc20:eth:GMB": "2.5.2",
@@ -3410,6 +3720,7 @@
       "erc20:eth:GSE": "2.0.8",
       "erc20:eth:GST2": "2.3.0",
       "erc20:eth:GTC": "2.0.7",
+      "erc20:eth:GTEC": "2.5.4",
       "erc20:eth:GTH": "2.5.2",
       "erc20:eth:GTKT": "2.0.7",
       "erc20:eth:GTO": "2.0.7",
@@ -3577,7 +3888,7 @@
       "erc20:eth:LOOK": "2.0.8",
       "erc20:eth:LOOKS": "2.5.2",
       "erc20:eth:LOOM": "2.0.7",
-      "erc20:eth:LOOMOLD": "2.4.2",
+      "erc20:eth:LOOM:deprecated": "2.5.4",
       "erc20:eth:LOVE": "2.0.8",
       "erc20:eth:LPT": "2.0.7",
       "erc20:eth:LQD": "2.3.0",
@@ -3612,7 +3923,6 @@
       "erc20:eth:MEME": "2.3.7",
       "erc20:eth:MESG": "2.1.8",
       "erc20:eth:MEST": "2.0.7",
-      "erc20:eth:MET": "2.0.10",
       "erc20:eth:METM": "2.0.10",
       "erc20:eth:MFG": "2.0.7",
       "erc20:eth:MFT": "2.0.8",
@@ -3760,7 +4070,6 @@
       "erc20:eth:PATENTS": "2.0.7",
       "erc20:eth:PATH": "2.0.7",
       "erc20:eth:PATR": "2.3.0",
-      "erc20:eth:PAX": "2.0.10",
       "erc20:eth:PAXG": "2.1.8",
       "erc20:eth:PAY": "2.0.7",
       "erc20:eth:PBL": "2.0.7",
@@ -3959,8 +4268,7 @@
       "erc20:eth:SNM": "2.0.7",
       "erc20:eth:SNOV": "2.0.7",
       "erc20:eth:SNT": "2.0.7",
-      "erc20:eth:SNTR": "2.0.10",
-      "erc20:eth:SNX:c011": "2.4.2",
+      "erc20:eth:SNX": "2.5.4",
       "erc20:eth:SOAR": "2.0.11",
       "erc20:eth:SOC": "2.0.10",
       "erc20:eth:SOCKS": "2.3.0",
@@ -3984,7 +4292,6 @@
       "erc20:eth:SPZ": "2.3.0",
       "erc20:eth:SRN": "2.0.7",
       "erc20:eth:SRX": "2.1.8",
-      "erc20:eth:SSH": "2.0.7",
       "erc20:eth:SSP": "2.0.10",
       "erc20:eth:STABIT": "2.0.8",
       "erc20:eth:STAC": "2.0.7",
@@ -4015,6 +4322,7 @@
       "erc20:eth:SWASH": "2.4.3",
       "erc20:eth:SWFTC": "2.0.10",
       "erc20:eth:SWM": "2.0.7",
+      "erc20:eth:SWRM": "2.5.4",
       "erc20:eth:SWT": "2.0.7",
       "erc20:eth:SXDT": "2.0.7",
       "erc20:eth:SXR": "2.3.0",
@@ -4023,6 +4331,7 @@
       "erc20:eth:SYS": "2.4.4",
       "erc20:eth:SYSX": "2.3.7",
       "erc20:eth:SenSatorI": "2.0.7",
+      "erc20:eth:Skey": "2.5.4",
       "erc20:eth:TALAO": "2.0.10",
       "erc20:eth:TAN": "2.3.0",
       "erc20:eth:TAU": "2.0.7",
@@ -4040,6 +4349,7 @@
       "erc20:eth:TCST": "2.1.8",
       "erc20:eth:TCT": "2.1.8",
       "erc20:eth:TDH": "2.0.7",
+      "erc20:eth:TDX": "2.5.4",
       "erc20:eth:TEAM": "2.0.10",
       "erc20:eth:TECH": "2.3.0",
       "erc20:eth:TEN": "2.0.10",
@@ -4080,6 +4390,7 @@
       "erc20:eth:TRCT": "2.0.10",
       "erc20:eth:TRDT": "2.0.10",
       "erc20:eth:TRST": "2.0.7",
+      "erc20:eth:TRUCCO": "2.5.4",
       "erc20:eth:TRYB": "2.3.0",
       "erc20:eth:TSW": "2.0.8",
       "erc20:eth:TTA": "2.0.10",
@@ -4110,6 +4421,7 @@
       "erc20:eth:USD-G": "2.3.0",
       "erc20:eth:USDC": "2.0.8",
       "erc20:eth:USDM": "2.0.7",
+      "erc20:eth:USDP": "2.5.4",
       "erc20:eth:USDS": "2.0.11",
       "erc20:eth:USDT": "2.0.10",
       "erc20:eth:USDx": "2.3.0",
@@ -4168,6 +4480,7 @@
       "erc20:eth:WCK": "2.3.0",
       "erc20:eth:WCN": "2.0.7",
       "erc20:eth:WCT": "2.0.7",
+      "erc20:eth:WDOGE": "2.5.4",
       "erc20:eth:WEB": "2.0.10",
       "erc20:eth:WETH": "2.0.7",
       "erc20:eth:WHEN": "2.0.7",
@@ -4202,6 +4515,7 @@
       "erc20:eth:XCHF": "2.0.11",
       "erc20:eth:XCL": "2.3.0",
       "erc20:eth:XCLR": "2.0.10",
+      "erc20:eth:XDATA": "2.5.4",
       "erc20:eth:XDCE": "2.0.10",
       "erc20:eth:XES": "2.0.10",
       "erc20:eth:XET": "2.0.10",
@@ -4328,6 +4642,7 @@
       "erc20:eth:eosDAC": "2.0.7",
       "erc20:eth:fstETHDAI": "2.3.1",
       "erc20:eth:iBAT": "2.3.0",
+      "erc20:eth:iBBT": "2.5.4",
       "erc20:eth:iBNB": "2.3.0",
       "erc20:eth:iBTC": "2.3.0",
       "erc20:eth:iCEX": "2.3.0",
@@ -4686,8 +5001,8 @@
       "erc20:rop:RLC": "2.5.2",
       "erc20:rop:dqr30": "2.0.10",
       "erc20:rsk:ARSCB": "2.4.3",
+      "erc20:rsk:BITP": "2.5.4",
       "erc20:rsk:BOBCB": "2.4.3",
-      "erc20:rsk:BPro": "2.4.3",
       "erc20:rsk:BRLCB": "2.4.3",
       "erc20:rsk:BRZ": "2.4.3",
       "erc20:rsk:BTCCB": "2.4.3",
@@ -4736,88 +5051,142 @@
       "erc20:ubq:SPHR": "2.4.4",
       "erc20:ubq:SPHRC": "2.4.4",
       "erc20:ubq:TGE1": "2.4.4",
+      "eth:$BNI": "2.5.4",
       "eth:$OC": "2.4.4",
+      "eth:0XT": "2.5.4",
       "eth:0xF": "2.3.5",
-      "eth:420": "2.3.7",
       "eth:AAC": "2.4.4",
       "eth:ACA": "2.3.7",
+      "eth:ACE": "2.5.4",
       "eth:AIOZ": "2.5.2",
       "eth:AITD": "2.5.2",
       "eth:AKA": "2.0.8",
+      "eth:ALOT": "2.5.4",
+      "eth:ALPH": "2.5.4",
+      "eth:ALT": "2.5.4",
+      "eth:ALYX": "2.5.4",
+      "eth:AMAX": "2.5.4",
+      "eth:AMB": "2.5.4",
       "eth:AMBROS": "2.5.2",
       "eth:AME": "2.5.2",
+      "eth:ANY": "2.5.4",
       "eth:APTA": "2.5.3",
       "eth:AQUA": "2.1.1",
+      "eth:AR\u00c9V": "2.5.4",
+      "eth:ASA": "2.5.4",
       "eth:ASK": "2.4.3",
       "eth:ASTR": "2.5.2",
+      "eth:ATLR": "2.5.4",
       "eth:ATS": "2.0.11",
       "eth:AUX": "2.1.6",
       "eth:AVAX": "2.3.7",
+      "eth:AVS": "2.5.4",
       "eth:BCS": "2.4.4",
       "eth:BELLY": "2.5.2",
+      "eth:BFC": "2.5.4",
+      "eth:BG": "2.5.4",
+      "eth:BIT": "2.5.4",
+      "eth:BITCI": "2.5.4",
       "eth:BNB": "2.3.5",
-      "eth:BOBA": "2.5.2",
+      "eth:BOA": "2.5.4",
+      "eth:BOMB": "2.5.4",
       "eth:BOY": "2.4.4",
       "eth:BRB": "2.5.2",
-      "eth:BRO": "2.4.4",
+      "eth:BRNKC": "2.5.4",
       "eth:BTA": "2.4.3",
       "eth:BTCIX": "2.4.4",
       "eth:BTM": "2.4.4",
+      "eth:BTON": "2.5.4",
       "eth:BTT": "2.4.3",
+      "eth:BTY": "2.5.4",
+      "eth:BXN": "2.5.4",
       "eth:Brise": "2.5.2",
+      "eth:CAM:500": "2.5.4",
+      "eth:CANTO": "2.5.4",
       "eth:CATE": "2.4.2",
+      "eth:CCNA": "2.5.4",
       "eth:CCP": "2.4.4",
       "eth:CELO": "2.3.7",
       "eth:CEM": "2.5.2",
       "eth:CFX": "2.4.4",
+      "eth:CIC": "2.5.4",
       "eth:CLASS": "2.4.4",
+      "eth:CLD": "2.5.4",
       "eth:CLO": "2.0.7",
       "eth:CLV": "2.4.2",
+      "eth:CMEMO": "2.5.4",
+      "eth:CMP": "2.5.4",
       "eth:CNDL": "2.5.2",
+      "eth:CONDOR": "2.5.4",
+      "eth:CORE": "2.5.4",
       "eth:CPAY:21337": "2.5.2",
       "eth:CPAY:3000": "2.5.2",
       "eth:CPAY:3001": "2.5.2",
       "eth:CRAB": "2.4.4",
+      "eth:CRC": "2.5.4",
+      "eth:CREDIT": "2.5.4",
       "eth:CRO": "2.4.4",
       "eth:CSB": "2.5.2",
+      "eth:CTEX": "2.5.4",
       "eth:CUBE": "2.5.2",
       "eth:CWN": "2.5.2",
       "eth:DAX": "2.4.2",
+      "eth:DEB": "2.5.4",
+      "eth:DEL": "2.5.4",
       "eth:DEV": "2.4.3",
-      "eth:DGCC": "2.5.2",
+      "eth:DFI": "2.5.4",
       "eth:DIODE": "2.3.7",
-      "eth:DTH": "2.4.4",
+      "eth:DKN": "2.5.4",
+      "eth:DOGS": "2.5.4",
+      "eth:DOINX": "2.5.4",
+      "eth:DOS": "2.5.4",
+      "eth:DRAC": "2.5.4",
       "eth:DWU": "2.4.2",
       "eth:DX": "2.5.2",
+      "eth:DXT": "2.5.4",
       "eth:DYNO": "2.4.4",
+      "eth:Deh": "2.5.4",
+      "eth:ECG": "2.5.4",
       "eth:ECO": "2.4.3",
       "eth:ECS": "2.4.4",
       "eth:EDG": "2.4.2",
+      "eth:EGAZ": "2.5.4",
       "eth:EGEM": "2.0.7",
       "eth:EIDI": "2.4.4",
+      "eth:EKTA": "2.5.4",
       "eth:ELA:20": "2.4.2",
       "eth:ELV": "2.4.3",
+      "eth:EMPIRE": "2.5.4",
       "eth:ENTER": "2.4.4",
       "eth:ES": "2.4.2",
       "eth:ESN": "2.0.8",
       "eth:ETC": "2.0.7",
       "eth:ETH:1": "2.0.7",
+      "eth:ETHF": "2.5.4",
       "eth:ETHO": "2.0.8",
       "eth:ETI": "2.1.1",
       "eth:ETL": "2.4.2",
+      "eth:ETMP": "2.5.4",
       "eth:ETND": "2.5.2",
       "eth:EUN": "2.5.2",
       "eth:EVA": "2.4.4",
       "eth:EVC": "2.4.2",
       "eth:EVMOS": "2.4.4",
       "eth:EWT": "2.3.5",
+      "eth:EXL": "2.5.4",
       "eth:EXP": "2.0.7",
       "eth:EZC": "2.5.2",
       "eth:FETH": "2.4.2",
+      "eth:FIL": "2.5.4",
       "eth:FIN": "2.3.5",
+      "eth:FIRE:529": "2.5.4",
+      "eth:FITFI": "2.5.4",
+      "eth:FLA": "2.5.4",
       "eth:FLR": "2.3.7",
-      "eth:FRA": "2.5.2",
+      "eth:FNCY": "2.5.4",
+      "eth:FREN": "2.5.4",
       "eth:FSN": "2.4.2",
+      "eth:FST": "2.5.4",
       "eth:FTM": "2.3.5",
       "eth:FUSE": "2.3.5",
       "eth:FX": "2.5.2",
@@ -4825,37 +5194,61 @@
       "eth:GCD": "2.5.2",
       "eth:GEN": "2.4.2",
       "eth:GLMR": "2.4.2",
+      "eth:GLQ": "2.5.4",
+      "eth:GMMT": "2.5.4",
       "eth:GNC": "2.4.4",
       "eth:GO": "2.0.7",
-      "eth:GT": "2.4.2",
+      "eth:GOLDT": "2.5.4",
+      "eth:GZN": "2.5.4",
       "eth:GooD": "2.4.2",
       "eth:HAIC": "2.4.2",
+      "eth:HBAR:295": "2.5.4",
+      "eth:HMND": "2.5.4",
       "eth:HO": "2.4.4",
       "eth:HOO": "2.5.2",
       "eth:HOP": "2.4.4",
       "eth:HPB": "2.1.1",
       "eth:HT": "2.3.7",
+      "eth:HTML": "2.5.4",
+      "eth:HTZ": "2.5.4",
       "eth:ILT": "2.3.5",
+      "eth:IMV": "2.5.4",
       "eth:IORA": "2.4.4",
       "eth:IOTX": "2.4.2",
       "eth:IPOS": "2.3.5",
+      "eth:ISLM": "2.5.4",
       "eth:IVAR": "2.5.2",
+      "eth:J": "2.5.4",
+      "eth:JBC": "2.5.4",
       "eth:JEWEL:53935": "2.4.4",
+      "eth:JINDA": "2.5.4",
       "eth:JOYS": "2.3.7",
+      "eth:KAI": "2.5.4",
       "eth:KAR": "2.3.7",
       "eth:KAVA": "2.5.2",
       "eth:KCS": "2.4.2",
+      "eth:KEK": "2.5.4",
       "eth:KLAY": "2.3.7",
       "eth:KSX": "2.5.2",
       "eth:KTO:2559": "2.4.2",
+      "eth:KUB": "2.5.4",
       "eth:L1": "2.4.4",
       "eth:L99": "2.4.3",
       "eth:LA": "2.4.4",
+      "eth:LAVA": "2.5.4",
       "eth:LISINS": "2.5.2",
+      "eth:LUCID": "2.5.4",
       "eth:LUDAN": "2.5.2",
+      "eth:LYC": "2.5.4",
+      "eth:MAI": "2.5.4",
+      "eth:MAP": "2.5.4",
+      "eth:MARO": "2.5.4",
+      "eth:MAS": "2.5.4",
       "eth:MATH": "2.3.7",
       "eth:MATIC": "2.3.5",
+      "eth:MEER": "2.5.4",
       "eth:META": "2.1.1",
+      "eth:METAD": "2.5.4",
       "eth:METIS": "2.4.4",
       "eth:MINTME": "2.4.2",
       "eth:MIX": "2.0.10",
@@ -4866,37 +5259,54 @@
       "eth:MTT": "2.4.2",
       "eth:MTV": "2.5.2",
       "eth:MUSIC": "2.0.8",
+      "eth:MYTH": "2.5.4",
       "eth:NEON:245022934": "2.4.3",
       "eth:NEW": "2.3.7",
-      "eth:NEXT": "2.4.4",
       "eth:NRG": "2.3.5",
       "eth:NTT": "2.4.4",
+      "eth:NULS": "2.5.4",
+      "eth:NUM": "2.5.4",
+      "eth:NetZ": "2.5.4",
       "eth:OAC": "2.5.2",
+      "eth:OCTA": "2.5.4",
+      "eth:OHO": "2.5.4",
       "eth:OKT": "2.3.7",
       "eth:OLO": "2.4.2",
       "eth:OLT": "2.4.3",
       "eth:OM": "2.5.2",
+      "eth:OMAX": "2.5.4",
       "eth:OMC": "2.5.2",
       "eth:ONE:1666600000": "2.3.7",
       "eth:ONE:1666600001": "2.3.7",
       "eth:ONE:1666600002": "2.3.7",
       "eth:ONE:1666600003": "2.3.7",
       "eth:ONG": "2.4.2",
+      "eth:ONUS": "2.5.4",
       "eth:OPC": "2.5.2",
+      "eth:OPN": "2.5.4",
+      "eth:ORL": "2.5.4",
+      "eth:OTP": "2.5.4",
+      "eth:OXYN": "2.5.4",
       "eth:OY": "2.4.4",
       "eth:PALM": "2.4.3",
+      "eth:PDC": "2.5.4",
       "eth:PETH": "2.4.2",
       "eth:PFT:909": "2.5.2",
       "eth:PHT": "2.3.5",
       "eth:PHX": "2.4.4",
       "eth:PIRL": "2.0.8",
       "eth:PIX": "2.4.4",
+      "eth:PLQ": "2.5.4",
       "eth:PLS": "2.4.3",
       "eth:POA": "2.3.5",
       "eth:POLIS": "2.4.4",
+      "eth:POM": "2.5.4",
       "eth:POP": "2.4.3",
       "eth:PRB": "2.4.4",
+      "eth:PSC": "2.5.4",
+      "eth:PTX": "2.5.4",
       "eth:QDC": "2.5.2",
+      "eth:QKA": "2.5.4",
       "eth:QKC:100000": "2.4.2",
       "eth:QKC:100001": "2.4.2",
       "eth:QKC:100002": "2.4.2",
@@ -4907,29 +5317,41 @@
       "eth:QKC:100007": "2.4.2",
       "eth:QKC:100008": "2.4.2",
       "eth:QKI": "2.4.2",
+      "eth:QOM": "2.5.4",
       "eth:RBD": "2.3.5",
       "eth:RBTC": "2.0.7",
+      "eth:REAL": "2.5.4",
+      "eth:REDLC": "2.5.4",
       "eth:REI:47805": "2.4.4",
+      "eth:RESIN": "2.5.4",
       "eth:RING": "2.5.2",
       "eth:RNA": "2.4.2",
       "eth:ROC:1288": "2.5.2",
-      "eth:ROSE": "2.4.4",
       "eth:RPG": "2.4.4",
       "eth:RUPX": "2.3.7",
+      "eth:SAMA": "2.5.4",
       "eth:SDN": "2.4.3",
+      "eth:SEED": "2.5.4",
       "eth:SETM": "2.4.4",
       "eth:SFL": "2.5.2",
       "eth:SGB": "2.4.2",
       "eth:SHIB": "2.4.4",
+      "eth:SINSO": "2.5.4",
       "eth:SKU": "2.4.2",
       "eth:SMT": "2.5.2",
       "eth:SNT": "2.4.4",
       "eth:SOTER:68": "2.5.2",
       "eth:SPARK": "2.4.4",
       "eth:SPOA": "2.4.4",
+      "eth:SRDX": "2.5.4",
       "eth:SRN": "2.4.3",
+      "eth:STAND": "2.5.4",
+      "eth:STOS": "2.5.4",
+      "eth:SVRN": "2.5.4",
       "eth:SX": "2.5.2",
       "eth:Seele": "2.4.4",
+      "eth:SmuX": "2.5.4",
+      "eth:T-EKTA": "2.5.4",
       "eth:TAO": "2.3.5",
       "eth:TBG": "2.3.7",
       "eth:TCH": "2.3.5",
@@ -4939,6 +5361,7 @@
       "eth:TFI": "2.3.7",
       "eth:TLC": "2.5.2",
       "eth:TLOS:40": "2.4.2",
+      "eth:TMY": "2.5.4",
       "eth:TOMB": "2.5.2",
       "eth:TOMO:88": "2.4.4",
       "eth:TOYS": "2.3.7",
@@ -4948,52 +5371,77 @@
       "eth:TST": "2.3.5",
       "eth:TT": "2.3.5",
       "eth:TUBQ": "2.3.5",
+      "eth:TWL": "2.5.4",
       "eth:TXDC": "2.3.7",
       "eth:TXL": "2.5.2",
       "eth:U+25B3": "2.3.5",
       "eth:UBC": "2.4.4",
       "eth:UBQ": "2.0.7",
+      "eth:ULX": "2.5.4",
+      "eth:UNQ": "2.5.4",
       "eth:UZMI": "2.4.4",
       "eth:VAL": "2.3.5",
+      "eth:VET": "2.5.4",
+      "eth:VETH": "2.5.4",
       "eth:VLX": "2.4.3",
       "eth:VNDT": "2.5.2",
+      "eth:VNT": "2.5.4",
       "eth:VS:888888": "2.4.4",
+      "eth:VSC": "2.5.4",
       "eth:W3G": "2.4.4",
       "eth:W3Q:333": "2.4.4",
       "eth:WAN": "2.4.2",
       "eth:WEB": "2.3.5",
+      "eth:WEMIX": "2.5.4",
       "eth:WGM": "2.4.4",
       "eth:WTT": "2.4.4",
       "eth:XDC": "2.3.7",
       "eth:XERO": "2.3.5",
+      "eth:XETA": "2.5.4",
+      "eth:XODEX": "2.5.4",
       "eth:XT": "2.5.2",
       "eth:XVM": "2.5.2",
+      "eth:XZO": "2.5.4",
       "eth:YCC": "2.5.2",
       "eth:YETI": "2.3.5",
+      "eth:ZENIQ": "2.5.4",
       "eth:ZENITH": "2.5.2",
       "eth:ZERO": "2.4.4",
+      "eth:ZETA": "2.5.4",
+      "eth:ZTH:427": "2.5.4",
       "eth:ZYX": "2.4.3",
       "eth:atp": "2.4.4",
       "eth:cTH": "2.4.2",
       "eth:cet": "2.4.2",
+      "eth:eBTC": "2.5.4",
+      "eth:hP2": "2.5.4",
       "eth:jfin": "2.5.2",
       "eth:lat": "2.4.4",
       "eth:mADA": "2.5.2",
+      "eth:mALGO": "2.5.4",
+      "eth:mc": "2.5.4",
+      "eth:nSAN": "2.5.4",
       "eth:pCKB": "2.5.2",
       "eth:peggle": "2.3.7",
       "eth:tATS": "2.0.11",
       "eth:tAVAX": "2.3.7",
       "eth:tBNB": "2.3.5",
+      "eth:tBVE": "2.5.4",
       "eth:tCELO:44787": "2.3.7",
       "eth:tCELO:62320": "2.3.7",
       "eth:tCFLR": "2.3.7",
+      "eth:tCRC": "2.5.4",
       "eth:tDBM": "2.3.5",
-      "eth:tGOR": "2.5.2",
+      "eth:tETH:11155111": "2.5.4",
+      "eth:tETH:3": "2.5.4",
+      "eth:tETH:4": "2.5.4",
+      "eth:tETH:42": "2.5.4",
+      "eth:tETH:5": "2.5.4",
       "eth:tKAL": "2.3.5",
+      "eth:tKEK": "2.5.4",
       "eth:tKLAY": "2.3.7",
-      "eth:tKOR": "2.3.7",
       "eth:tKOT": "2.3.5",
-      "eth:tKOV": "2.0.7",
+      "eth:tMAP": "2.5.4",
       "eth:tMATH": "2.3.7",
       "eth:tMATIC": "2.3.5",
       "eth:tMETC": "2.3.5",
@@ -5001,16 +5449,15 @@
       "eth:tNRG": "2.3.5",
       "eth:tPHT": "2.3.5",
       "eth:tRBTC": "2.0.7",
-      "eth:tRIN": "2.0.7",
-      "eth:tROP": "2.0.7",
-      "eth:tSEP": "2.4.4",
       "eth:tVT": "2.3.5",
+      "eth:tWIRE": "2.5.4",
+      "eth:taro": "2.5.4",
       "eth:thtt": "2.3.7",
       "eth:tmACA": "2.3.7",
       "eth:tsDIODE": "2.3.7",
       "eth:xDAI:100": "2.3.5",
       "eth:xDAI:300": "2.5.2",
-      "eth:\u03a6": "2.5.2",
+      "eth:xlon": "2.5.4",
       "eth:\u25c8": "2.5.2",
       "misc:ADA": "2.0.8",
       "misc:BNB": "2.1.5",
@@ -5038,8 +5485,10 @@
       "erc20:etc:PLAY": "(AUTO) duplicate key",
       "erc20:eth:A18:ba7d": "(AUTO) duplicate key",
       "erc20:eth:A18:bde8": "(AUTO) duplicate key",
-      "erc20:eth:ANT": "(AUTO) duplicate key",
-      "erc20:eth:ANT (old)": "(AUTO) duplicate key",
+      "erc20:eth:ADX:4470": "(AUTO) duplicate key",
+      "erc20:eth:ADX:ade0": "(AUTO) duplicate key",
+      "erc20:eth:ANT:960b": "(AUTO) duplicate key",
+      "erc20:eth:ANT:a117": "(AUTO) duplicate key",
       "erc20:eth:ATH": "(AUTO) duplicate key",
       "erc20:eth:ATH (AIgatha Token)": "(AUTO) duplicate key",
       "erc20:eth:ATS": "duplicate key with eth:ATS",
@@ -5097,8 +5546,6 @@
       "erc20:eth:CTT:e3fa": "(AUTO) duplicate key",
       "erc20:eth:DAO:0f51": "(AUTO) duplicate key",
       "erc20:eth:DAO:bb9b": "(AUTO) duplicate key",
-      "erc20:eth:DATA:0cf0": "(AUTO) duplicate key",
-      "erc20:eth:DATA:8f69": "(AUTO) duplicate key",
       "erc20:eth:DEPO": "(AUTO) duplicate key",
       "erc20:eth:DEPO (Depository Network)": "(AUTO) duplicate key",
       "erc20:eth:DGTX:1c83": "(AUTO) duplicate key",
@@ -5174,6 +5621,8 @@
       "erc20:eth:MDS:92b7": "(AUTO) duplicate key",
       "erc20:eth:MESH:01f2": "(AUTO) duplicate key",
       "erc20:eth:MESH:f030": "(AUTO) duplicate key",
+      "erc20:eth:MET:2ebd": "(AUTO) duplicate key",
+      "erc20:eth:MET:a3d5": "(AUTO) duplicate key",
       "erc20:eth:MIT": "(AUTO) duplicate key",
       "erc20:eth:MIT (Mychatcoin)": "(AUTO) duplicate key",
       "erc20:eth:MOC": "(AUTO) duplicate key",
@@ -5295,31 +5744,72 @@
       "eth:ATH:1620": "duplicate key",
       "eth:ATH:43110": "duplicate key",
       "eth:BCH": "duplicate of bitcoin:BCH",
+      "eth:BOBA:1294": "duplicate key",
+      "eth:BOBA:301": "duplicate key",
+      "eth:BOBA:43288": "duplicate key",
+      "eth:BOBA:56288": "duplicate key",
+      "eth:BOBA:97288": "duplicate key",
+      "eth:BRO:1039": "duplicate key",
+      "eth:BRO:108801": "duplicate key",
       "eth:BTX": "duplicate key",
-      "eth:CPAY:1337": "deprecated",
+      "eth:CAM:501": "duplicate key",
+      "eth:CCN:970": "duplicate key",
+      "eth:CCN:9700": "duplicate key",
+      "eth:CCN:971": "duplicate key",
+      "eth:DOGE": "duplicate key",
       "eth:ELA:22": "duplicate of ELA-ETH-sidechain",
       "eth:ELLA:64": "duplicate symbol",
       "eth:ELLA:7027": "duplicate symbol",
       "eth:EOS": "mainnet exists",
       "eth:ETH:10": "duplicate key",
+      "eth:ETH:10086": "duplicate key",
+      "eth:ETH:116": "duplicate key",
       "eth:ETH:1313161554": "duplicate key",
       "eth:ETH:1313161556": "duplicate key",
       "eth:ETH:1337802": "eth collision",
+      "eth:ETH:1337803": "duplicate key",
       "eth:ETH:288": "duplicate key",
+      "eth:ETH:324": "duplicate key",
       "eth:ETH:42161": "duplicate key",
       "eth:ETH:42170": "eth collision",
+      "eth:ETH:50001": "duplicate key",
+      "eth:ETH:534352": "duplicate key",
       "eth:ETH:5551": "eth collision",
       "eth:ETH:73927": "duplicate key",
+      "eth:ETH:8453": "duplicate key",
       "eth:ETH:980": "eth collision",
+      "eth:FIRE:5290": "duplicate key",
+      "eth:FRA:2152": "duplicate key",
+      "eth:FRA:2154": "duplicate key",
       "eth:GAR:91": "duplicate key",
       "eth:GAR:92": "duplicate key",
       "eth:GAR:93": "duplicate key",
+      "eth:GT:10024": "duplicate key",
+      "eth:GT:86": "duplicate key",
       "eth:GTH:192837465": "duplicate key",
       "eth:GTH:486217935": "exclude testnet",
+      "eth:HBAR:297": "duplicate key",
+      "eth:HBAR:298": "duplicate key",
       "eth:JEWEL:335": "exclude testnet",
       "eth:KTO:8285": "exclude testnet",
+      "eth:MCD:217": "duplicate key",
+      "eth:MCD:67390": "duplicate key",
+      "eth:METAL:381931": "duplicate key",
+      "eth:METAL:381932": "duplicate key",
       "eth:NEON:245022926": "duplicate key",
+      "eth:OAS:19011": "duplicate key",
+      "eth:OAS:2400": "duplicate key",
+      "eth:OAS:248": "duplicate key",
+      "eth:OAS:5555": "duplicate key",
+      "eth:OAS:7225878": "duplicate key",
+      "eth:OAS:876": "duplicate key",
+      "eth:ONE:1666900000": "duplicate key",
       "eth:PFT:808": "testnet",
+      "eth:PI:2099156": "duplicate key",
+      "eth:PI:8007736": "duplicate key",
+      "eth:POSI:900000": "duplicate key",
+      "eth:POSI:920000": "duplicate key",
+      "eth:POSI:920001": "duplicate key",
       "eth:Q": "causing problems in altcoin detection",
       "eth:QKC:110000": "exclude testnet",
       "eth:QKC:110001": "exclude testnet",
@@ -5330,14 +5820,28 @@
       "eth:QKC:110006": "exclude testnet",
       "eth:QKC:110007": "exclude testnet",
       "eth:QKC:110008": "exclude testnet",
+      "eth:QTZ:8881": "duplicate key",
+      "eth:QTZ:8883": "duplicate key",
       "eth:REI:55555": "duplicate key",
       "eth:ROC:1286": "deprecated",
+      "eth:ROSE:23294": "duplicate key",
+      "eth:ROSE:42262": "duplicate key",
+      "eth:SHM:8080": "duplicate key",
+      "eth:SHM:8081": "duplicate key",
+      "eth:SHM:8082": "duplicate key",
       "eth:SHYFT": "slip44 out of range",
       "eth:SOTER:218": "deprecated",
       "eth:SYS": "duplicate key",
+      "eth:T-FSN": "(AUTO) exclude testnet",
+      "eth:TARA:841": "duplicate key",
+      "eth:TARA:842": "(AUTO) exclude testnet",
       "eth:TAero": "(AUTO) exclude testnet",
+      "eth:TBITCI": "(AUTO) exclude testnet",
+      "eth:TBXN": "(AUTO) exclude testnet",
       "eth:TCRO": "(AUTO) exclude testnet",
       "eth:TELE:8001": "(AUTO) exclude testnet",
+      "eth:TEST": "(AUTO) exclude testnet",
+      "eth:TEXL": "(AUTO) exclude testnet",
       "eth:TFUEL:361": "incompatible",
       "eth:TFUEL:363": "(AUTO) exclude testnet",
       "eth:TFUEL:364": "(AUTO) exclude testnet",
@@ -5353,56 +5857,128 @@
       "eth:TKM:70103": "duplicate key",
       "eth:TLA": "(AUTO) exclude testnet",
       "eth:TLOS:41": "(AUTO) exclude testnet",
+      "eth:TOKI:8654": "duplicate key",
+      "eth:TOKI:8655": "(AUTO) exclude testnet",
       "eth:TOMO:89": "(AUTO) exclude testnet",
       "eth:TOP": "causing problems in altcoin detection",
       "eth:TOPC": "(AUTO) exclude testnet",
+      "eth:TPBX:404040": "duplicate key",
+      "eth:TPBX:4141": "(AUTO) exclude testnet",
+      "eth:TPI:10067275": "(AUTO) exclude testnet",
+      "eth:TPI:16658437": "(AUTO) exclude testnet",
+      "eth:TRES:6065": "(AUTO) exclude testnet",
+      "eth:TRES:6066": "duplicate key",
       "eth:TSCAS": "(AUTO) exclude testnet",
+      "eth:TSETH": "(AUTO) exclude testnet",
+      "eth:USD:2018": "duplicate key",
+      "eth:USD:2020": "duplicate key",
       "eth:VS:666666": "exclude testnet",
       "eth:W3Q:3334": "duplicate key",
+      "eth:ZTH:859": "duplicate key",
+      "eth:sFUEL:1482601649": "duplicate key",
+      "eth:sFUEL:1564830818": "duplicate key",
+      "eth:sFUEL:2046399126": "duplicate key",
+      "eth:sFUEL:503129905": "duplicate key",
+      "eth:t$BNI": "(AUTO) exclude testnet",
       "eth:tAAC": "(AUTO) exclude testnet",
       "eth:tACA": "(AUTO) exclude testnet",
       "eth:tAGOR": "testnet",
       "eth:tAIOZ": "(AUTO) exclude testnet",
       "eth:tAITD": "(AUTO) exclude testnet",
       "eth:tALOT": "(AUTO) exclude testnet",
-      "eth:tAMBROS": "(AUTO) exclude testnet",
-      "eth:tARETH": "(AUTO) exclude testnet",
+      "eth:tALYX": "(AUTO) exclude testnet",
+      "eth:tAMAX": "(AUTO) exclude testnet",
+      "eth:tAMB": "(AUTO) exclude testnet",
+      "eth:tASA": "(AUTO) exclude testnet",
+      "eth:tATN:65010000": "(AUTO) exclude testnet",
+      "eth:tATN:65100000": "(AUTO) exclude testnet",
+      "eth:tATOS": "(AUTO) exclude testnet",
       "eth:tAVIS": "(AUTO) exclude testnet",
+      "eth:tAcol": "(AUTO) exclude testnet",
       "eth:tBCHT": "(AUTO) exclude testnet",
       "eth:tBCS": "(AUTO) exclude testnet",
       "eth:tBELLY": "(AUTO) exclude testnet",
-      "eth:tBOBA": "(AUTO) exclude testnet",
+      "eth:tBFC": "(AUTO) exclude testnet",
+      "eth:tBIT": "(AUTO) exclude testnet",
+      "eth:tBLG": "(AUTO) exclude testnet",
+      "eth:tBOBA:1297": "(AUTO) exclude testnet",
+      "eth:tBOBA:4051": "(AUTO) exclude testnet",
+      "eth:tBOBA:4328": "(AUTO) exclude testnet",
+      "eth:tBOBA:9728": "(AUTO) exclude testnet",
+      "eth:tBOC": "(AUTO) exclude testnet",
+      "eth:tBOMB": "(AUTO) exclude testnet",
+      "eth:tBRNKC": "(AUTO) exclude testnet",
+      "eth:tBRO": "(AUTO) exclude testnet",
       "eth:tBTM": "(AUTO) exclude testnet",
       "eth:tBTT": "(AUTO) exclude testnet",
+      "eth:tC2FLR": "(AUTO) exclude testnet",
+      "eth:tCANTO": "(AUTO) exclude testnet",
       "eth:tCFX": "(AUTO) exclude testnet",
+      "eth:tCHZ": "(AUTO) exclude testnet",
+      "eth:tCICT": "(AUTO) exclude testnet",
       "eth:tCKB:71393": "(AUTO) exclude testnet",
       "eth:tCKB:868455272153094": "(AUTO) exclude testnet",
+      "eth:tCLD": "(AUTO) exclude testnet",
+      "eth:tCLO": "(AUTO) exclude testnet",
       "eth:tCLV": "(AUTO) exclude testnet",
       "eth:tCMP": "(AUTO) exclude testnet",
+      "eth:tCNT": "(AUTO) exclude testnet",
+      "eth:tCORE": "(AUTO) exclude testnet",
       "eth:tCTE": "testnet",
       "eth:tCUBET": "(AUTO) exclude testnet",
       "eth:tCWN": "(AUTO) exclude testnet",
+      "eth:tDB": "(AUTO) exclude testnet",
+      "eth:tDEL": "(AUTO) exclude testnet",
+      "eth:tDFI": "(AUTO) exclude testnet",
+      "eth:tDOGE": "(AUTO) exclude testnet",
+      "eth:tDOGS": "(AUTO) exclude testnet",
       "eth:tDTH": "(AUTO) exclude testnet",
       "eth:tDX": "(AUTO) exclude testnet",
       "eth:tDYNO": "(AUTO) exclude testnet",
       "eth:tECE": "(AUTO) exclude testnet",
+      "eth:tECG": "(AUTO) exclude testnet",
       "eth:tECO": "(AUTO) exclude testnet",
       "eth:tECS": "(AUTO) exclude testnet",
       "eth:tEDG": "(AUTO) exclude testnet",
+      "eth:tEDX": "(AUTO) exclude testnet",
       "eth:tELA:21": "(AUTO) exclude testnet",
       "eth:tELA:23": "(AUTO) exclude testnet",
       "eth:tEOS": "(AUTO) exclude testnet",
+      "eth:tETH:115": "(AUTO) exclude testnet",
       "eth:tETH:1313161555": "(AUTO) exclude testnet",
+      "eth:tETH:1337": "(AUTO) exclude testnet",
+      "eth:tETH:1402": "(AUTO) exclude testnet",
+      "eth:tETH:1422": "(AUTO) exclude testnet",
       "eth:tETH:28": "(AUTO) exclude testnet",
       "eth:tETH:280": "(AUTO) exclude testnet",
+      "eth:tETH:28528": "(AUTO) exclude testnet",
+      "eth:tETH:2888": "(AUTO) exclude testnet",
       "eth:tETH:420": "(AUTO) exclude testnet",
+      "eth:tETH:421611": "duplicate key",
+      "eth:tETH:534353": "(AUTO) exclude testnet",
       "eth:tETH:5553": "(AUTO) exclude testnet",
+      "eth:tETH:5777": "duplicate key",
+      "eth:tETH:69": "duplicate key",
+      "eth:tETH:84531": "(AUTO) exclude testnet",
+      "eth:tETH:956": "(AUTO) exclude testnet",
+      "eth:tETMP": "(AUTO) exclude testnet",
       "eth:tEUN": "(AUTO) exclude testnet",
+      "eth:tEVM": "(AUTO) exclude testnet",
       "eth:tEVMOS": "(AUTO) exclude testnet",
       "eth:tEZC": "(AUTO) exclude testnet",
-      "eth:tFETH": "(AUTO) exclude testnet",
+      "eth:tFIL:3141": "(AUTO) exclude testnet",
+      "eth:tFIL:31415": "(AUTO) exclude testnet",
+      "eth:tFIL:314159": "(AUTO) exclude testnet",
+      "eth:tFIL:3141592": "(AUTO) exclude testnet",
+      "eth:tFIL:31415926": "(AUTO) exclude testnet",
+      "eth:tFIRE:917": "(AUTO) exclude testnet",
+      "eth:tFIRE:9170": "(AUTO) exclude testnet",
+      "eth:tFITFI": "(AUTO) exclude testnet",
+      "eth:tFNCY": "(AUTO) exclude testnet",
       "eth:tFRA": "(AUTO) exclude testnet",
       "eth:tFTM": "(AUTO) exclude testnet",
+      "eth:tFTN": "(AUTO) exclude testnet",
+      "eth:tFtREN": "(AUTO) exclude testnet",
       "eth:tGAR:900": "(AUTO) exclude testnet",
       "eth:tGAR:901": "(AUTO) exclude testnet",
       "eth:tGAR:902": "(AUTO) exclude testnet",
@@ -5410,20 +5986,34 @@
       "eth:tGCD": "(AUTO) exclude testnet",
       "eth:tGO": "(AUTO) exclude testnet",
       "eth:tGT": "(AUTO) exclude testnet",
+      "eth:tGTFX": "(AUTO) exclude testnet",
       "eth:tGTH": "(AUTO) exclude testnet",
+      "eth:tGZN": "(AUTO) exclude testnet",
       "eth:tGooD": "(AUTO) exclude testnet",
+      "eth:tHBAR": "(AUTO) exclude testnet",
+      "eth:tHIK": "(AUTO) exclude testnet",
       "eth:tHOO": "(AUTO) exclude testnet",
+      "eth:tHPN": "(AUTO) exclude testnet",
       "eth:tHYM": "(AUTO) exclude testnet",
+      "eth:tIDE": "(AUTO) exclude testnet",
+      "eth:tIMV": "(AUTO) exclude testnet",
       "eth:tIOTX": "(AUTO) exclude testnet",
+      "eth:tISLMT": "(AUTO) exclude testnet",
       "eth:tIVAR": "(AUTO) exclude testnet",
+      "eth:tJINDA": "(AUTO) exclude testnet",
       "eth:tKAIBA": "(AUTO) exclude testnet",
       "eth:tKAR": "(AUTO) exclude testnet",
       "eth:tKCS": "(AUTO) exclude testnet",
       "eth:tKSX": "(AUTO) exclude testnet",
+      "eth:tKUB": "(AUTO) exclude testnet",
       "eth:tL1test": "(AUTO) exclude testnet",
+      "eth:tLAMB": "(AUTO) exclude testnet",
+      "eth:tLAVA": "(AUTO) exclude testnet",
       "eth:tMDGLT": "(AUTO) exclude testnet",
+      "eth:tMEER-T": "(AUTO) exclude testnet",
       "eth:tMESHT": "(AUTO) exclude testnet",
-      "eth:tMETIS": "(AUTO) exclude testnet",
+      "eth:tMETIS:588": "(AUTO) exclude testnet",
+      "eth:tMETIS:599": "(AUTO) exclude testnet",
       "eth:tMTR": "(AUTO) exclude testnet",
       "eth:tMTTest": "(AUTO) exclude testnet",
       "eth:tMYN": "(AUTO) exclude testnet",
@@ -5431,6 +6021,10 @@
       "eth:tNEON": "(AUTO) exclude testnet",
       "eth:tNMAC": "(AUTO) exclude testnet",
       "eth:tNTTH": "(AUTO) exclude testnet",
+      "eth:tNULS": "(AUTO) exclude testnet",
+      "eth:tNUM": "(AUTO) exclude testnet",
+      "eth:tNetZ": "(AUTO) exclude testnet",
+      "eth:tOAS": "(AUTO) exclude testnet",
       "eth:tOKT": "(AUTO) exclude testnet",
       "eth:tOLO": "(AUTO) exclude testnet",
       "eth:tOLT": "(AUTO) exclude testnet",
@@ -5439,6 +6033,8 @@
       "eth:tONE:1666700002": "(AUTO) exclude testnet",
       "eth:tONE:1666700003": "(AUTO) exclude testnet",
       "eth:tONG": "(AUTO) exclude testnet",
+      "eth:tONUS": "(AUTO) exclude testnet",
+      "eth:tOONE": "(AUTO) exclude testnet",
       "eth:tORING": "(AUTO) exclude testnet",
       "eth:tOY": "(AUTO) exclude testnet",
       "eth:tPALM": "(AUTO) exclude testnet",
@@ -5447,38 +6043,66 @@
       "eth:tPLS:941": "(AUTO) exclude testnet",
       "eth:tPLS:942": "(AUTO) exclude testnet",
       "eth:tPOLIS": "(AUTO) exclude testnet",
+      "eth:tPOSI": "(AUTO) exclude testnet",
       "eth:tPRB": "(AUTO) exclude testnet",
       "eth:tPRING": "(AUTO) exclude testnet",
+      "eth:tPRX": "(AUTO) exclude testnet",
+      "eth:tPTX": "(AUTO) exclude testnet",
       "eth:tQ": "causing problems in altcoin detection",
       "eth:tQDC": "(AUTO) exclude testnet",
+      "eth:tQET": "(AUTO) exclude testnet",
+      "eth:tQOM": "(AUTO) exclude testnet",
       "eth:tREI": "(AUTO) exclude testnet",
-      "eth:tRNA": "(AUTO) exclude testnet",
       "eth:tROSE": "(AUTO) exclude testnet",
       "eth:tRPG": "(AUTO) exclude testnet",
       "eth:tSFL": "(AUTO) exclude testnet",
+      "eth:tSHT": "(AUTO) exclude testnet",
       "eth:tSHYFTT": "(AUTO) exclude testnet",
+      "eth:tSINSO": "(AUTO) exclude testnet",
       "eth:tSNS": "(AUTO) exclude testnet",
+      "eth:tSRDX": "(AUTO) exclude testnet",
+      "eth:tSTAND": "(AUTO) exclude testnet",
+      "eth:tSTOS": "(AUTO) exclude testnet",
+      "eth:tSVRN": "(AUTO) exclude testnet",
       "eth:tSX": "(AUTO) exclude testnet",
       "eth:tSYS": "(AUTO) exclude testnet",
+      "eth:tU2U": "(AUTO) exclude testnet",
       "eth:tUBC": "(AUTO) exclude testnet",
+      "eth:tULX": "(AUTO) exclude testnet",
+      "eth:tUNQ": "(AUTO) exclude testnet",
+      "eth:tUSD": "(AUTO) exclude testnet",
+      "eth:tVET": "(AUTO) exclude testnet",
       "eth:tVIL": "(AUTO) exclude testnet",
+      "eth:tVNT": "(AUTO) exclude testnet",
       "eth:tW3G": "(AUTO) exclude testnet",
       "eth:tW3Q": "(AUTO) exclude testnet",
       "eth:tWAN": "(AUTO) exclude testnet",
+      "eth:tWEMIX": "(AUTO) exclude testnet",
       "eth:tWLK": "(AUTO) exclude testnet",
       "eth:tXPR": "(AUTO) exclude testnet",
       "eth:tXVM": "(AUTO) exclude testnet",
       "eth:tZCR": "(AUTO) exclude testnet",
+      "eth:tZEN": "(AUTO) exclude testnet",
       "eth:tZERO": "(AUTO) exclude testnet",
+      "eth:tZKST": "(AUTO) exclude testnet",
+      "eth:taZETA": "(AUTO) exclude testnet",
       "eth:tatp": "(AUTO) exclude testnet",
       "eth:tcett": "(AUTO) exclude testnet",
       "eth:tkiETH": "(AUTO) exclude testnet",
       "eth:tlat:2203181": "(AUTO) exclude testnet",
       "eth:tlat:2206132": "(AUTO) exclude testnet",
       "eth:tmTAda": "(AUTO) exclude testnet",
+      "eth:tmTAlgo": "(AUTO) exclude testnet",
+      "eth:tmc": "(AUTO) exclude testnet",
       "eth:tpCKB": "(AUTO) exclude testnet",
+      "eth:trAna": "(AUTO) exclude testnet",
+      "eth:tsFUEL": "(AUTO) exclude testnet",
       "eth:tusd": "(AUTO) exclude testnet",
+      "eth:txDAI:100100": "(AUTO) exclude testnet",
+      "eth:txDAI:10200": "(AUTO) exclude testnet",
       "eth:xDAI:200": "duplicate key",
+      "eth:\u03a6:144": "duplicate key",
+      "eth:\u03a6:4181": "duplicate key",
       "misc:LSK": "Incompatible mainnet hard-fork"
     }
   }
diff --git a/common/protob/messages-management.proto b/common/protob/messages-management.proto
index eb732fc6db..cc87c93387 100644
--- a/common/protob/messages-management.proto
+++ b/common/protob/messages-management.proto
@@ -27,6 +27,15 @@ enum SafetyCheckLevel {
     PromptTemporarily = 2;  // like PromptAlways but reverts to Strict after reboot
 }
 
+
+/**
+ * Format of the homescreen image
+ */
+enum HomescreenFormat {
+    Toif144x144 = 1;
+    Jpeg240x240 = 2;
+}
+
 /**
  * Request: Reset device to default state and ask for device details
  * @start
@@ -112,6 +121,8 @@ message Features {
     optional uint32 display_rotation = 39;      // in degrees from North
     optional bool experimental_features = 40;   // are experimental message types enabled?
     optional bool busy = 41;                    // is the device busy, showing "Do not disconnect"?
+    optional HomescreenFormat homescreen_format = 42;   // format of the homescreen, 1 = TOIf 144x144, 2 = jpg 240x240
+    optional bool hide_passphrase_from_host = 43;   // should we hide the passphrase when it comes from host?
 }
 
 /**
@@ -158,6 +169,7 @@ message ApplySettings {
     optional bool passphrase_always_on_device = 8;  // do not prompt for passphrase, enforce device entry
     optional SafetyCheckLevel safety_checks = 9;  // Safety check level, set to Prompt to limit path namespace enforcement
     optional bool experimental_features = 10;  // enable experimental message types
+    optional bool hide_passphrase_from_host = 11;  // do not show passphrase coming from host
 }
 
 /**
diff --git a/common/tests/fixtures/ethereum/sign_tx_eip1559.json b/common/tests/fixtures/ethereum/sign_tx_eip1559.json
index 239c6b07cd..d562539153 100644
--- a/common/tests/fixtures/ethereum/sign_tx_eip1559.json
+++ b/common/tests/fixtures/ethereum/sign_tx_eip1559.json
@@ -139,6 +139,25 @@
                 "sig_r": "3a5e8fa47bfdb758837643485b2951f6c54894996f124dce6282662289ebcf79",
                 "sig_s": "5b5b9e0f9af273466cc1e991cb86fadb2abedeb4de150163a8dbf348422b5fe2"
             }
+        },
+        {
+            "name": "long_fees",
+            "parameters": {
+                "data": "",
+                "path": "m/44'/60'/0'/0/0",
+                "to_address": "0x1d1c328764a41bda0492b66baa30c4a339ff85ef",
+                "chain_id": 1,
+                "nonce": "0x0",
+                "gas_limit": "0x141414141414141414",
+                "max_gas_fee": "0x14141414141414141414",
+                "max_priority_fee": "0x11111111111111111",
+                "value": "0xa"
+            },
+            "result": {
+                "sig_v": 0,
+                "sig_r": "3f3bfa6762b33819f268a98744803e1876aa440a6fd2ebef90cfd606bb893429",
+                "sig_s": "241e1128a715a5386c3b6d0998f9f42c21ee080568fbf2c642a05916c30737e2"
+            }
         }
     ]
 }
diff --git a/common/tests/fixtures/ethereum/signmessage.json b/common/tests/fixtures/ethereum/signmessage.json
index 41f6df6794..6c55ef24a5 100644
--- a/common/tests/fixtures/ethereum/signmessage.json
+++ b/common/tests/fixtures/ethereum/signmessage.json
@@ -83,6 +83,16 @@
                 "address": "0x73d0385F4d8E00C5e6504C6030F47BF6212736A8",
                 "sig": "fa9d60644436f27eb88956a50893e9a47f67c42fb1b57a44bde4c6e127ab777e0c23b234b6ec9327ffd0620daaa514243ebb5a3652a1bac2d720e0f5555b2e071c"
             }
+        },
+        {
+            "parameters": {
+                "msg": "This is an example of a signed message at a different path.",
+                "path": "m/45'/60/2/1/1"
+            },
+            "result": {
+                "address": "0x3beC5F707Ef56057354f4c062C53cd089E8Ea02C",
+                "sig": "27c75ccd53136ef1c470784d16440c798effbff4928fcee36a9080c2e929ce3f727aabcd4a0de88881ae02003bd16bc9d3f199d78266c41596db14fac134b44f1c"
+            }
         }
     ]
 }
diff --git a/common/tools/cointool.py b/common/tools/cointool.py
index 68960affc0..1de68cadf9 100755
--- a/common/tools/cointool.py
+++ b/common/tools/cointool.py
@@ -329,10 +329,11 @@ def check_dups(buckets: CoinBuckets, print_at_level: int = logging.WARNING) -> b
             and not coin_info.is_token(coin)
         ]  # we do not count override-marked coins as duplicates here
         cleared = not any(coin.get("duplicate") for coin in bucket)
+        eth_testnet = symbol == "teth"
 
         # string generation
         dup_str = ", ".join(coin_str(coin) for coin in bucket)
-        if len(nontokens) > 1:
+        if len(nontokens) > 1 and not eth_testnet:
             # Two or more colliding nontokens. This is always fatal.
             # XXX consider allowing two nontokens as long as only one is supported?
             level = logging.ERROR
diff --git a/core/.changelog.d/1922.changed b/core/.changelog.d/1922.changed
new file mode 100644
index 0000000000..4ddc100bf1
--- /dev/null
+++ b/core/.changelog.d/1922.changed
@@ -0,0 +1 @@
+Switched to redesigned, Rust-based user interface.
diff --git a/core/.changelog.d/2205.changed b/core/.changelog.d/2205.changed
new file mode 100644
index 0000000000..799b01ec2a
--- /dev/null
+++ b/core/.changelog.d/2205.changed
@@ -0,0 +1 @@
+Ignore channel ID in U2F.
diff --git a/core/.changelog.d/2611.changed b/core/.changelog.d/2611.changed
new file mode 100644
index 0000000000..af96c4c568
--- /dev/null
+++ b/core/.changelog.d/2611.changed
@@ -0,0 +1 @@
+Updated FAT FS library to R0.15
diff --git a/core/.changelog.d/2623.added b/core/.changelog.d/2623.added
new file mode 100644
index 0000000000..3857a6bb9e
--- /dev/null
+++ b/core/.changelog.d/2623.added
@@ -0,0 +1 @@
+Add model info to image and check when installing bootloader, prevent bootloader downgrade
diff --git a/core/.changelog.d/2682.added b/core/.changelog.d/2682.added
new file mode 100644
index 0000000000..265e0d1f31
--- /dev/null
+++ b/core/.changelog.d/2682.added
@@ -0,0 +1 @@
+Allow proposed Casa m/45' multisig paths for Bitcoin and Ethereum.
diff --git a/core/.changelog.d/2746.changed b/core/.changelog.d/2746.changed
new file mode 100644
index 0000000000..e336fbfb53
--- /dev/null
+++ b/core/.changelog.d/2746.changed
@@ -0,0 +1 @@
+Ethereum's EIP-712 signing no longer restricts the maximum field size to 1024 bytes.
diff --git a/core/.changelog.d/2818.added b/core/.changelog.d/2818.added
new file mode 100644
index 0000000000..82d3873401
--- /dev/null
+++ b/core/.changelog.d/2818.added
@@ -0,0 +1 @@
+Add address confirmation screen to EIP712 signing flow
diff --git a/core/.changelog.d/2834.changed b/core/.changelog.d/2834.changed
new file mode 100644
index 0000000000..8713fe9ccc
--- /dev/null
+++ b/core/.changelog.d/2834.changed
@@ -0,0 +1 @@
+Force basic attestation in FIDO2 for google.com
diff --git a/core/.changelog.d/2841.added b/core/.changelog.d/2841.added
new file mode 100644
index 0000000000..6e2c35a395
--- /dev/null
+++ b/core/.changelog.d/2841.added
@@ -0,0 +1 @@
+Add the possibility of rebooting the device into bootloader mode
diff --git a/core/.changelog.d/450.added b/core/.changelog.d/450.added
new file mode 100644
index 0000000000..b44d2969b4
--- /dev/null
+++ b/core/.changelog.d/450.added
@@ -0,0 +1 @@
+CoSi collective signatures on Model T.
diff --git a/core/.changelog.d/noissue.security b/core/.changelog.d/noissue.security
new file mode 100644
index 0000000000..7318011cc7
--- /dev/null
+++ b/core/.changelog.d/noissue.security
@@ -0,0 +1 @@
+Match and validate script type of change-outputs in Bitcoin signing.
diff --git a/core/.gitignore b/core/.gitignore
index b48f5043bb..9a9ab8549f 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -8,3 +8,5 @@ tests/trezor_monero_tests*
 .coverage.*
 htmlcov/
 mypy_report
+/CMakeLists.txt
+/cmake-build-debug/
diff --git a/core/Makefile b/core/Makefile
index 9861c6c8e7..a94daa2e9b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -25,7 +25,7 @@ BOOTLOADER_QA ?= 0
 TREZOR_MODEL ?= T
 TREZOR_MEMPERF ?= 0
 ADDRESS_SANITIZER ?= 0
-UI2 ?= 0
+CMAKELISTS ?= 0
 
 # OpenOCD interface default. Alternative: ftdi/olimex-arm-usb-tiny-h
 OPENOCD_INTERFACE ?= stlink
@@ -107,17 +107,28 @@ test_emu_fido2: ## run fido2 device tests
 test_emu_click: ## run click tests
 	$(EMU_TEST) $(PYTEST) $(TESTPATH)/click_tests $(TESTOPTS)
 
+test_emu_click_ui: ## run click tests with UI testing
+	$(EMU_TEST) $(PYTEST) $(TESTPATH)/click_tests --ui=test --ui-check-missing $(TESTOPTS)
+
 test_emu_ui: ## run ui integration tests
-	$(EMU_TEST) $(PYTEST) $(TESTPATH)/device_tests --ui=test --ui-check-missing $(TESTOPTS)
+	$(EMU_TEST) $(PYTEST) $(TESTPATH)/device_tests $(TESTOPTS) \
+		--ui=test --ui-check-missing --record-text-layout
 
 test_emu_ui_multicore: ## run ui integration tests using multiple cores
-	$(PYTEST) -n auto $(TESTPATH)/device_tests $(TESTOPTS) --ui=test --ui-check-missing --control-emulators --model=core --random-order-seed=$(shell echo $$RANDOM)
+	$(PYTEST) -n auto $(TESTPATH)/device_tests $(TESTOPTS) \
+		--ui=test --ui-check-missing --record-text-layout \
+		--control-emulators --model=core --random-order-seed=$(shell echo $$RANDOM)
 
 test_emu_ui_record: ## record and hash screens for ui integration tests
-	$(EMU_TEST) $(PYTEST) $(TESTPATH)/device_tests --ui=record --ui-check-missing $(TESTOPTS)
+	$(EMU_TEST) $(PYTEST) $(TESTPATH)/device_tests $(TESTOPTS) \
+		--ui=record --ui-check-missing
 
-test_emu_ui_record_multicore: ## record and hash screens for ui integration tests using multiple cores
-	$(PYTEST) -n auto $(TESTPATH)/device_tests $(TESTOPTS) --ui=record --ui-check-missing --control-emulators --model=core --random-order-seed=$(shell echo $$RANDOM)
+test_emu_ui_record_multicore: ## quickly record all screens
+	make test_emu_ui_multicore || echo "All errors are recorded in fixtures.json"
+	make test_emu_accept_fixtures
+
+test_emu_accept_fixtures:  # accept UI fixtures from the last run of UI tests
+	../tests/update_fixtures.py
 
 pylint: ## run pylint on application sources and tests
 	pylint -E $(shell find src tests -name *.py)
@@ -149,33 +160,33 @@ build: build_boardloader build_bootloader build_firmware build_prodtest build_un
 build_embed: build_boardloader build_bootloader build_firmware # build boardloader, bootloader, firmware
 
 build_boardloader: ## build boardloader
-	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" $(BOARDLOADER_BUILD_DIR)/boardloader.bin
+	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" $(BOARDLOADER_BUILD_DIR)/boardloader.bin
 
 build_bootloader: ## build bootloader
-	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" $(BOOTLOADER_BUILD_DIR)/bootloader.bin
+	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" $(BOOTLOADER_BUILD_DIR)/bootloader.bin
 
 build_bootloader_ci: ## build CI device testing bootloader
-	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" $(BOOTLOADER_CI_BUILD_DIR)/bootloader.bin
+	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" $(BOOTLOADER_CI_BUILD_DIR)/bootloader.bin
 
 build_prodtest: ## build production test firmware
-	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" $(PRODTEST_BUILD_DIR)/prodtest.bin
+	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" $(PRODTEST_BUILD_DIR)/prodtest.bin
 
 build_reflash: ## build reflash firmware + reflash image
-	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" $(REFLASH_BUILD_DIR)/reflash.bin
+	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" $(REFLASH_BUILD_DIR)/reflash.bin
 	dd if=build/boardloader/boardloader.bin of=$(REFLASH_BUILD_DIR)/sdimage.bin bs=1 seek=0
 	dd if=build/bootloader/bootloader.bin of=$(REFLASH_BUILD_DIR)/sdimage.bin bs=1 seek=49152
 
 build_firmware: templates build_cross ## build firmware with frozen modules
-	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" PYOPT="$(PYOPT)" BITCOIN_ONLY="$(BITCOIN_ONLY)" BOOTLOADER_QA="$(BOOTLOADER_QA)" $(FIRMWARE_BUILD_DIR)/firmware.bin
+	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" PYOPT="$(PYOPT)" BITCOIN_ONLY="$(BITCOIN_ONLY)" BOOTLOADER_QA="$(BOOTLOADER_QA)" $(FIRMWARE_BUILD_DIR)/firmware.bin
 
 build_unix: templates ## build unix port
-	$(SCONS) CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) TREZOR_MODEL="$(TREZOR_MODEL)" PYOPT="0" BITCOIN_ONLY="$(BITCOIN_ONLY)" TREZOR_EMULATOR_ASAN="$(ADDRESS_SANITIZER)"
+	$(SCONS) CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" PYOPT="0" BITCOIN_ONLY="$(BITCOIN_ONLY)" TREZOR_EMULATOR_ASAN="$(ADDRESS_SANITIZER)"
 
 build_unix_frozen: templates build_cross ## build unix port with frozen modules
-	$(SCONS) CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) TREZOR_MODEL="$(TREZOR_MODEL)" PYOPT="$(PYOPT)" BITCOIN_ONLY="$(BITCOIN_ONLY)" TREZOR_EMULATOR_ASAN="$(ADDRESS_SANITIZER)" TREZOR_MEMPERF="$(TREZOR_MEMPERF)" TREZOR_EMULATOR_FROZEN=1
+	$(SCONS) CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" PYOPT="$(PYOPT)" BITCOIN_ONLY="$(BITCOIN_ONLY)" TREZOR_EMULATOR_ASAN="$(ADDRESS_SANITIZER)" TREZOR_MEMPERF="$(TREZOR_MEMPERF)" TREZOR_EMULATOR_FROZEN=1
 
 build_unix_debug: templates ## build unix port
-	$(SCONS) --max-drift=1 CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) TREZOR_MODEL="$(TREZOR_MODEL)" BITCOIN_ONLY="$(BITCOIN_ONLY)" TREZOR_EMULATOR_ASAN=1 TREZOR_EMULATOR_DEBUGGABLE=1
+	$(SCONS) --max-drift=1 CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" BITCOIN_ONLY="$(BITCOIN_ONLY)" TREZOR_EMULATOR_ASAN=1 TREZOR_EMULATOR_DEBUGGABLE=1
 
 build_cross: ## build mpy-cross port
 	$(MAKE) -C vendor/micropython/mpy-cross $(CROSS_PORT_OPTS)
@@ -309,5 +320,8 @@ upload: ## upload firmware using trezorctl
 upload_prodtest: ## upload prodtest using trezorctl
 	trezorctl firmware_update -f $(PRODTEST_BUILD_DIR)/prodtest.bin
 
-coverage:  # generate coverage report
+coverage:  ## generate coverage report
 	./tools/coverage-report
+
+unused:  ## find unused micropython code
+	vulture src src/_vulture_ignore.txt --exclude "messages.py,*/enums/*"
diff --git a/core/SConscript.boardloader b/core/SConscript.boardloader
index de31c8c711..d94b5f6c9c 100644
--- a/core/SConscript.boardloader
+++ b/core/SConscript.boardloader
@@ -4,6 +4,7 @@ import os
 import tools
 
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
+CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 
 if TREZOR_MODEL in ('1', ):
     # skip boardloader build
@@ -104,13 +105,16 @@ env = Environment(ENV=os.environ, CFLAGS='%s -DPRODUCTION=%s' % (ARGUMENTS.get('
 tools.configure_board(TREZOR_MODEL, env, CPPDEFINES_MOD, SOURCE_TREZORHAL)
 
 env.Replace(
+    CP='cp',
     AS='arm-none-eabi-as',
     AR='arm-none-eabi-ar',
     CC='arm-none-eabi-gcc',
     LINK='arm-none-eabi-gcc',
     SIZE='arm-none-eabi-size',
     STRIP='arm-none-eabi-strip',
-    OBJCOPY='arm-none-eabi-objcopy', )
+    OBJCOPY='arm-none-eabi-objcopy',
+    PYTHON='python',
+    MAKECMAKELISTS='$PYTHON tools/make_cmakelists.py',)
 
 env.Replace(
     TREZOR_MODEL=TREZOR_MODEL, )
@@ -133,7 +137,7 @@ env.Replace(
     '-fstack-protector-all '
     + CPU_CCFLAGS + CCFLAGS_MOD,
     CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
-    LINKFLAGS='-T embed/boardloader/memory.ld -Wl,--gc-sections -Wl,-Map=build/boardloader/boardloader.map -Wl,--warn-common',
+    LINKFLAGS='-T embed/boardloader/memory.ld -Wl,--gc-sections -Wl,-Map=build/boardloader/boardloader.map -Wl,--warn-common  -Wl,--print-memory-usage',
     CPPPATH=[
         'embed/boardloader',
         'embed/trezorhal',
@@ -153,6 +157,16 @@ env.Replace(
     ASFLAGS=CPU_ASFLAGS,
     ASPPFLAGS='$CFLAGS $CCFLAGS', )
 
+env.Replace(
+    ALLSOURCES=SOURCE_MOD + SOURCE_BOARDLOADER + SOURCE_STMHAL + SOURCE_TREZORHAL,
+    ALLDEFS=tools.get_defs_for_cmake(env['CPPDEFINES']))
+
+cmake_gen = env.Command(
+    target='CMakeLists.txt',
+    source='',
+    action='$MAKECMAKELISTS --sources $ALLSOURCES --dirs $CPPPATH --defs $ALLDEFS',
+)
+
 #
 # Program objects
 #
@@ -170,8 +184,20 @@ program_elf = env.Command(
     '$LINK -o $TARGET $CCFLAGS $CFLAGS $LINKFLAGS $SOURCES -lc_nano -lgcc',
 )
 
+BINARY_NAME = f"build/boardloader/boardloader-{tools.get_model_identifier(TREZOR_MODEL)}"
+BINARY_NAME += "-" + tools.get_version('embed/boardloader/version.h')
+BINARY_NAME += "-" + tools.get_git_revision_short_hash()
+BINARY_NAME += "-dirty" if tools.get_git_modified() else ""
+BINARY_NAME += ".bin"
+
+if CMAKELISTS != 0:
+    env.Depends(program_elf, cmake_gen)
+
 program_bin = env.Command(
     target='boardloader.bin',
     source=program_elf,
-    action='$OBJCOPY -O binary $SOURCE $TARGET',
+    action=[
+        '$OBJCOPY -O binary $SOURCE $TARGET',
+        '$CP $TARGET ' + BINARY_NAME,
+    ],
 )
diff --git a/core/SConscript.bootloader b/core/SConscript.bootloader
index c9829affd7..0c396c5904 100644
--- a/core/SConscript.bootloader
+++ b/core/SConscript.bootloader
@@ -4,6 +4,7 @@ import os
 import tools
 
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
+CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 DMA2D = False
 
 if TREZOR_MODEL in ('1', ):
@@ -157,13 +158,16 @@ env = Environment(ENV=os.environ, CFLAGS='%s -DPRODUCTION=%s' % (ARGUMENTS.get('
 tools.configure_board(TREZOR_MODEL, env, CPPDEFINES_MOD, SOURCE_TREZORHAL)
 
 env.Replace(
+    CP='cp',
     AS='arm-none-eabi-as',
     AR='arm-none-eabi-ar',
     CC='arm-none-eabi-gcc',
     LINK='arm-none-eabi-gcc',
     SIZE='arm-none-eabi-size',
     STRIP='arm-none-eabi-strip',
-    OBJCOPY='arm-none-eabi-objcopy', )
+    OBJCOPY='arm-none-eabi-objcopy',
+    PYTHON='python',
+    MAKECMAKELISTS='$PYTHON tools/make_cmakelists.py', )
 
 env.Replace(
     TREZOR_MODEL=TREZOR_MODEL, )
@@ -192,7 +196,7 @@ env.Replace(
     '-fstack-protector-all '
     + CPU_CCFLAGS + CCFLAGS_MOD,
     CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
-    LINKFLAGS='-T embed/bootloader/memory.ld -Wl,--gc-sections -Wl,-Map=build/bootloader/bootloader.map -Wl,--warn-common',
+    LINKFLAGS='-T embed/bootloader/memory.ld -Wl,--gc-sections -Wl,-Map=build/bootloader/bootloader.map -Wl,--warn-common -Wl,--print-memory-usage',
     CPPPATH=[
         'embed/rust',
         'embed/bootloader',
@@ -222,6 +226,17 @@ env.Replace(
     HEADERTOOL='tools/headertool.py',
 )
 
+env.Replace(
+    ALLSOURCES=SOURCE_MOD + SOURCE_BOOTLOADER + SOURCE_NANOPB + SOURCE_STMHAL + SOURCE_TREZORHAL,
+    ALLDEFS=tools.get_defs_for_cmake(env['CPPDEFINES']))
+
+cmake_gen = env.Command(
+    target='CMakeLists.txt',
+    source='',
+    action='$MAKECMAKELISTS --sources $ALLSOURCES --dirs $CPPPATH --defs $ALLDEFS',
+)
+
+
 #
 # Program objects
 #
@@ -240,10 +255,20 @@ program_elf = env.Command(
     '$LINK -o $TARGET $CCFLAGS $CFLAGS $LINKFLAGS $SOURCES -lc_nano -lgcc',
 )
 
+BINARY_NAME = f"build/bootloader/bootloader-{tools.get_model_identifier(TREZOR_MODEL)}"
+BINARY_NAME += "-" + tools.get_version('embed/bootloader/version.h')
+BINARY_NAME += "-" + tools.get_git_revision_short_hash()
+BINARY_NAME += "-dirty" if tools.get_git_modified() else ""
+BINARY_NAME += ".bin"
+
+if CMAKELISTS != 0:
+    env.Depends(program_elf, cmake_gen)
+
 program_bin = env.Command(
     target='bootloader.bin',
     source=program_elf,
     action=[
         '$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET',
         '$HEADERTOOL $TARGET ' + ('-D' if ARGUMENTS.get('PRODUCTION', '0') == '0' else ''),
+        '$CP $TARGET ' + BINARY_NAME,
     ], )
diff --git a/core/SConscript.bootloader_ci b/core/SConscript.bootloader_ci
index f7b99791d9..eecc7d0416 100644
--- a/core/SConscript.bootloader_ci
+++ b/core/SConscript.bootloader_ci
@@ -4,6 +4,7 @@ import os
 import tools
 
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
+CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 
 if TREZOR_MODEL in ('1', ):
     # skip bootloader_ci build
@@ -140,13 +141,16 @@ env = Environment(ENV=os.environ, CFLAGS='%s -DPRODUCTION=%s' % (ARGUMENTS.get('
 tools.configure_board(TREZOR_MODEL, env, CPPDEFINES_MOD, SOURCE_TREZORHAL)
 
 env.Replace(
+    CP='cp',
     AS='arm-none-eabi-as',
     AR='arm-none-eabi-ar',
     CC='arm-none-eabi-gcc',
     LINK='arm-none-eabi-gcc',
     SIZE='arm-none-eabi-size',
     STRIP='arm-none-eabi-strip',
-    OBJCOPY='arm-none-eabi-objcopy', )
+    OBJCOPY='arm-none-eabi-objcopy',
+    PYTHON='python',
+    MAKECMAKELISTS='$PYTHON tools/make_cmakelists.py',)
 
 env.Replace(
     TREZOR_MODEL=TREZOR_MODEL, )
@@ -191,12 +195,24 @@ env.Replace(
         'PB_VALIDATE_UTF8',
     ] + CPPDEFINES_MOD,
     ASFLAGS=CPU_ASFLAGS,
-    ASPPFLAGS='$CFLAGS $CCFLAGS', )
+    ASPPFLAGS='$CFLAGS $CCFLAGS',
+    ALLSOURCES=SOURCE_MOD + SOURCE_BOOTLOADER + SOURCE_STMHAL + SOURCE_TREZORHAL+ SOURCE_NANOPB, )
 
 env.Replace(
     HEADERTOOL='tools/headertool.py',
 )
 
+env.Replace(
+    ALLSOURCES=SOURCE_MOD + SOURCE_BOOTLOADER + SOURCE_NANOPB + SOURCE_STMHAL + SOURCE_TREZORHAL,
+    ALLDEFS=tools.get_defs_for_cmake(env['CPPDEFINES']))
+
+cmake_gen = env.Command(
+    target='CMakeLists.txt',
+    source='',
+    action='$MAKECMAKELISTS --sources $ALLSOURCES --dirs $CPPPATH --defs $ALLDEFS',
+)
+
+
 #
 # Program objects
 #
@@ -215,10 +231,20 @@ program_elf = env.Command(
     '$LINK -o $TARGET $CCFLAGS $CFLAGS $LINKFLAGS $SOURCES -lc_nano -lgcc',
 )
 
+BINARY_NAME = f"build/bootloader_ci/bootloader_ci-{tools.get_model_identifier(TREZOR_MODEL)}"
+BINARY_NAME += "-" + tools.get_version('embed/bootloader_ci/version.h')
+BINARY_NAME += "-" + tools.get_git_revision_short_hash()
+BINARY_NAME += "-dirty" if tools.get_git_modified() else ""
+BINARY_NAME += ".bin"
+
+if CMAKELISTS != 0:
+    env.Depends(program_elf, cmake_gen)
+
 program_bin = env.Command(
     target='bootloader.bin',
     source=program_elf,
     action=[
         '$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET',
         '$HEADERTOOL $TARGET ' + ('-D' if ARGUMENTS.get('PRODUCTION', '0') == '0' else ''),
+        '$CP $TARGET ' + BINARY_NAME,
     ], )
diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index 023a53965e..8bcb5c2c09 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -10,6 +10,7 @@ BOOTLOADER_QA = ARGUMENTS.get('BOOTLOADER_QA', '0') == '1'
 EVERYTHING = BITCOIN_ONLY != '1'
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
 DMA2D = TREZOR_MODEL in ('T', )
+CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 
 if PRODUCTION != '1' and BOOTLOADER_QA:
     raise ValueError('Firmware variant for bootloader upgrade testing must be done with PRODUCTION=1')
@@ -188,6 +189,7 @@ SOURCE_MOD += [
     'vendor/micropython/lib/uzlib/crc32.c',
     'vendor/micropython/lib/uzlib/tinflate.c',
 ]
+
 CPPDEFINES_MOD += [
     'TREZOR_UI2',
     'USE_RUST_LOADER'
@@ -445,6 +447,7 @@ env.Tool('micropython')
 env.Replace(
     CAT='cat',
     DD='dd',
+    CP='cp',
     SED='sed',
     AS='arm-none-eabi-as',
     AR='arm-none-eabi-ar',
@@ -483,7 +486,7 @@ env.Replace(
     '-fstack-protector-all '
     + CPU_CCFLAGS + CCFLAGS_MOD,
     CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
-    LINKFLAGS='-T embed/firmware/memory_${TREZOR_MODEL}%s.ld -Wl,--gc-sections -Wl,-Map=build/firmware/firmware.map -Wl,--warn-common' % LD_VARIANT,
+    LINKFLAGS='-T embed/firmware/memory_${TREZOR_MODEL}%s.ld -Wl,--gc-sections  -Wl,--print-memory-usage -Wl,-Map=build/firmware/firmware.map -Wl,--warn-common' % LD_VARIANT,
     CPPPATH=[
         '.',
         'embed/rust',
@@ -511,6 +514,7 @@ env.Replace(
     MAKEQSTRDATA='$PYTHON vendor/micropython/py/makeqstrdata.py',
     MAKEVERSIONHDR='$PYTHON vendor/micropython/py/makeversionhdr.py',
     MAKEMODULEDEFS='$PYTHON vendor/micropython/py/makemoduledefs.py',
+    MAKECMAKELISTS='$PYTHON tools/make_cmakelists.py',
     MPY_TOOL='$PYTHON vendor/micropython/tools/mpy-tool.py',
     MPY_CROSS='vendor/micropython/mpy-cross/mpy-cross -O' + PYOPT,
     PB2PY='$PYTHON ../common/protob/pb2py',
@@ -575,18 +579,19 @@ if FROZEN:
     SOURCE_PY = Glob(SOURCE_PY_DIR + '*.py')
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/crypto/*.py'))
-    SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/res/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/components/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/components/common/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/__init__.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/common.py'))
+    SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/homescreen.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/reset.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/recovery.py'))
     if EVERYTHING:
         SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/fido.py'))
     if TREZOR_MODEL in ('T',):
         SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tt_v2/__init__.py'))
+        SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tt_v2/homescreen.py'))
         SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tt_v2/reset.py'))
         SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tt_v2/recovery.py'))
         if EVERYTHING:
@@ -717,7 +722,9 @@ def cargo_build():
     else:
         profile = ''
 
-    features = ['micropython', 'protobuf', f'model_t{TREZOR_MODEL.lower()}']
+    # T1 does not have its own Rust feature, it shares it with TR
+    model_feature = 'model_tr' if TREZOR_MODEL == '1' else f'model_t{TREZOR_MODEL.lower()}'
+    features = ['micropython', 'protobuf', model_feature]
     if BITCOIN_ONLY == '1':
         features.append('bitcoin_only')
     features.append('ui')
@@ -752,10 +759,12 @@ env.Append(LINKFLAGS=f' -l{RUST_LIB}')
 # Program objects
 #
 
+source_files = SOURCE_MOD + SOURCE_FIRMWARE + SOURCE_MICROPYTHON + SOURCE_MICROPYTHON_SPEED + SOURCE_STMHAL + SOURCE_TREZORHAL
 obj_program = []
 obj_program.extend(env.Object(source=SOURCE_MOD))
 if FEATURE_FLAGS["SECP256K1_ZKP"]:
     obj_program.extend(env.Object(source=SOURCE_MOD_SECP256K1_ZKP, CCFLAGS='$CCFLAGS -Wno-unused-function'))
+    source_files.extend(SOURCE_MOD_SECP256K1_ZKP)
 obj_program.extend(env.Object(source=SOURCE_FIRMWARE))
 obj_program.extend(env.Object(source=SOURCE_MICROPYTHON))
 obj_program.extend(env.Object(source=SOURCE_MICROPYTHON_SPEED, COPT='-O3'))
@@ -764,6 +773,18 @@ obj_program.extend(env.Object(source=SOURCE_TREZORHAL))
 if FROZEN:
     obj_program.extend(env.Object(source=source_mpyc))
 
+env.Replace(
+    ALLSOURCES=source_files,
+    ALLDEFS=tools.get_defs_for_cmake(env['CPPDEFINES']))
+
+
+cmake_gen = env.Command(
+    target='CMakeLists.txt',
+    source='',
+    action='$MAKECMAKELISTS --sources $ALLSOURCES --dirs $CPPPATH --defs $ALLDEFS',
+)
+
+
 VENDORHEADER = 'embed/vendorheader/vendorheader_' + ('unsafe_signed_prod.bin' if ARGUMENTS.get('PRODUCTION', '0') == '0' else 'satoshilabs_signed_prod.bin')
 
 obj_program.extend(
@@ -775,7 +796,7 @@ obj_program.extend(
         ' $SOURCE $TARGET', ))
 
 
-BOOTLOADER_SUFFIX =  TREZOR_MODEL + ('_QA' if BOOTLOADER_QA else '')
+BOOTLOADER_SUFFIX =  tools.get_model_identifier(TREZOR_MODEL) + ('_QA' if BOOTLOADER_QA else '')
 
 obj_program.extend(
     env.Command(
@@ -797,8 +818,19 @@ program_elf = env.Command(
     '$LINK -o $TARGET $CCFLAGS $CFLAGS $SOURCES $LINKFLAGS -lc_nano -lm -lgcc',
 )
 
+if CMAKELISTS != 0:
+    env.Depends(program_elf, cmake_gen)
 env.Depends(program_elf, rust)
 
+BINARY_NAME = f"build/firmware/firmware-{tools.get_model_identifier(TREZOR_MODEL)}"
+if not EVERYTHING:
+    BINARY_NAME += "-btconly"
+BINARY_NAME += "-" + tools.get_version('embed/firmware/version.h')
+BINARY_NAME += "-" + tools.get_git_revision_short_hash()
+BINARY_NAME += "-dirty" if tools.get_git_modified() else ""
+BINARY_NAME += ".bin"
+
+
 if TREZOR_MODEL in ('T', 'R'):
     action_bin=[
         '$OBJCOPY -O binary -j .vendorheader -j .header -j .flash -j .data --pad-to 0x08100000 $SOURCE ${TARGET}.p1',
@@ -806,11 +838,13 @@ if TREZOR_MODEL in ('T', 'R'):
         '$CAT ${TARGET}.p1 ${TARGET}.p2 > $TARGET',
         '$HEADERTOOL -h $TARGET ' + ('-D' if ARGUMENTS.get('PRODUCTION', '0') == '0' else ''),
         '$DD if=$TARGET of=${TARGET}.p1 skip=0 bs=128k count=6',
+        '$CP $TARGET ' + BINARY_NAME,
     ]
 elif TREZOR_MODEL in ('1',):
     action_bin=[
         '$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET',
         '../legacy/bootloader/firmware_sign.py -f $TARGET',
+        '$CP $TARGET ' + BINARY_NAME,
     ]
 else:
     raise ValueError('Unknown Trezor model')
diff --git a/core/SConscript.prodtest b/core/SConscript.prodtest
index ba19d4dd19..829c329713 100644
--- a/core/SConscript.prodtest
+++ b/core/SConscript.prodtest
@@ -4,6 +4,7 @@ import os
 import tools
 
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
+CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 
 CCFLAGS_MOD = ''
 CPPPATH_MOD = []
@@ -109,13 +110,16 @@ env = Environment(ENV=os.environ, CFLAGS='%s -DPRODUCTION=%s' % (ARGUMENTS.get('
 tools.configure_board(TREZOR_MODEL, env, CPPDEFINES_MOD, SOURCE_TREZORHAL)
 
 env.Replace(
+    CP='cp',
     AS='arm-none-eabi-as',
     AR='arm-none-eabi-ar',
     CC='arm-none-eabi-gcc',
     LINK='arm-none-eabi-gcc',
     SIZE='arm-none-eabi-size',
     STRIP='arm-none-eabi-strip',
-    OBJCOPY='arm-none-eabi-objcopy', )
+    OBJCOPY='arm-none-eabi-objcopy',
+    PYTHON='python',
+    MAKECMAKELISTS='$PYTHON tools/make_cmakelists.py',)
 
 env.Replace(
     TREZOR_MODEL=TREZOR_MODEL, )
@@ -164,6 +168,18 @@ env.Replace(
     HEADERTOOL='tools/headertool.py',
 )
 
+
+env.Replace(
+    ALLSOURCES=SOURCE_MOD + SOURCE_PRODTEST + SOURCE_STMHAL + SOURCE_TREZORHAL,
+    ALLDEFS=tools.get_defs_for_cmake(env['CPPDEFINES']))
+
+cmake_gen = env.Command(
+    target='CMakeLists.txt',
+    source='',
+    action='$MAKECMAKELISTS --sources $ALLSOURCES --dirs $CPPPATH --defs $ALLDEFS',
+)
+
+
 #
 # Program objects
 #
@@ -191,10 +207,20 @@ program_elf = env.Command(
     '$LINK -o $TARGET $CCFLAGS $CFLAGS $LINKFLAGS $SOURCES -lc_nano -lgcc',
 )
 
+BINARY_NAME = f"build/prodtest/prodtest-{tools.get_model_identifier(TREZOR_MODEL)}"
+BINARY_NAME += "-" + tools.get_version('embed/prodtest/version.h')
+BINARY_NAME += "-" + tools.get_git_revision_short_hash()
+BINARY_NAME += "-dirty" if tools.get_git_modified() else ""
+BINARY_NAME += ".bin"
+
+if CMAKELISTS != 0:
+    env.Depends(program_elf, cmake_gen)
+
 program_bin = env.Command(
     target='prodtest.bin',
     source=program_elf,
     action=[
         '$OBJCOPY -O binary -j .vendorheader -j .header -j .flash -j .data $SOURCE $TARGET',
         '$HEADERTOOL $TARGET ' + ('-D' if ARGUMENTS.get('PRODUCTION', '0') == '0' else ''),
+        '$CP $TARGET ' + BINARY_NAME,
     ], )
diff --git a/core/SConscript.reflash b/core/SConscript.reflash
index e10b523115..be8fafe10e 100644
--- a/core/SConscript.reflash
+++ b/core/SConscript.reflash
@@ -4,6 +4,7 @@ import os
 import tools
 
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
+CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 
 CCFLAGS_MOD = ''
 CPPPATH_MOD = []
@@ -37,7 +38,7 @@ SOURCE_MOD += [
     'embed/extmod/modtrezorui/display.c',
     'embed/extmod/modtrezorui/colors.c',
     'embed/extmod/modtrezorui/fonts/fonts.c',
-    'embed/extmod/modtrezorui/font_bitmap.c',
+    'embed/extmod/modtrezorui/fonts/font_bitmap.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
     'vendor/micropython/lib/uzlib/tinflate.c',
@@ -102,13 +103,16 @@ env = Environment(ENV=os.environ, CFLAGS='%s -DPRODUCTION=%s' % (ARGUMENTS.get('
 tools.configure_board(TREZOR_MODEL, env, CPPDEFINES_MOD, SOURCE_TREZORHAL)
 
 env.Replace(
+    CP='cp',
     AS='arm-none-eabi-as',
     AR='arm-none-eabi-ar',
     CC='arm-none-eabi-gcc',
     LINK='arm-none-eabi-gcc',
     SIZE='arm-none-eabi-size',
     STRIP='arm-none-eabi-strip',
-    OBJCOPY='arm-none-eabi-objcopy', )
+    OBJCOPY='arm-none-eabi-objcopy',
+    PYTHON='python',
+    MAKECMAKELISTS='$PYTHON tools/make_cmakelists.py',)
 
 env.Replace(
     TREZOR_MODEL=TREZOR_MODEL, )
@@ -157,6 +161,16 @@ env.Replace(
     HEADERTOOL='tools/headertool.py',
 )
 
+env.Replace(
+    ALLSOURCES=SOURCE_MOD + SOURCE_REFLASH + SOURCE_STMHAL + SOURCE_TREZORHAL,
+    ALLDEFS=tools.get_defs_for_cmake(env['CPPDEFINES']))
+
+cmake_gen = env.Command(
+    target='CMakeLists.txt',
+    source='',
+    action='$MAKECMAKELISTS --sources $ALLSOURCES --dirs $CPPPATH --defs $ALLDEFS',
+)
+
 #
 # Program objects
 #
@@ -184,10 +198,20 @@ program_elf = env.Command(
     '$LINK -o $TARGET $CCFLAGS $CFLAGS $LINKFLAGS $SOURCES -lc_nano -lgcc',
 )
 
+BINARY_NAME = f"build/reflash/reflash-{tools.get_model_identifier(TREZOR_MODEL)}"
+BINARY_NAME += "-" + tools.get_version('embed/reflash/version.h')
+BINARY_NAME += "-" + tools.get_git_revision_short_hash()
+BINARY_NAME += "-dirty" if tools.get_git_modified() else ""
+BINARY_NAME += ".bin"
+
+if CMAKELISTS != 0:
+    env.Depends(program_elf, cmake_gen)
+
 program_bin = env.Command(
     target='reflash.bin',
     source=program_elf,
     action=[
         '$OBJCOPY -O binary -j .vendorheader -j .header -j .flash -j .data $SOURCE $TARGET',
         '$HEADERTOOL $TARGET ' + ('-D' if ARGUMENTS.get('PRODUCTION', '0') == '0' else ''),
+        '$CP $TARGET ' + BINARY_NAME,
     ], )
diff --git a/core/SConscript.unix b/core/SConscript.unix
index b8ae28f737..20fd41146f 100644
--- a/core/SConscript.unix
+++ b/core/SConscript.unix
@@ -8,6 +8,7 @@ BITCOIN_ONLY = ARGUMENTS.get('BITCOIN_ONLY', '0')
 EVERYTHING = BITCOIN_ONLY != '1'
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
 DMA2D =  TREZOR_MODEL in ('T', )
+CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 
 FEATURE_FLAGS = {
     "SECP256K1_ZKP": True,  # required for trezor.crypto.curve.bip340 (BIP340/Taproot)
@@ -460,6 +461,7 @@ env.Replace(
     MAKEQSTRDATA='$PYTHON vendor/micropython/py/makeqstrdata.py',
     MAKEVERSIONHDR='$PYTHON vendor/micropython/py/makeversionhdr.py',
     MAKEMODULEDEFS='$PYTHON vendor/micropython/py/makemoduledefs.py',
+    MAKECMAKELISTS='$PYTHON tools/make_cmakelists.py',
     MPY_TOOL='$PYTHON vendor/micropython/tools/mpy-tool.py',
     MPY_CROSS='vendor/micropython/mpy-cross/mpy-cross -O' + PYOPT,
     PB2PY='$PYTHON ../common/protob/pb2py',
@@ -524,18 +526,19 @@ if FROZEN:
     SOURCE_PY = Glob(SOURCE_PY_DIR + '*.py')
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/crypto/*.py'))
-    SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/res/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/components/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/components/common/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/__init__.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/common.py'))
+    SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/homescreen.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/reset.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/recovery.py'))
     if EVERYTHING:
         SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/fido.py'))
     if TREZOR_MODEL in ('T',):
         SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tt_v2/__init__.py'))
+        SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tt_v2/homescreen.py'))
         SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tt_v2/reset.py'))
         SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tt_v2/recovery.py'))
         if EVERYTHING:
@@ -666,7 +669,9 @@ RUST_LIB = 'trezor_lib'
 RUST_LIBPATH = f'{RUST_LIBDIR}/lib{RUST_LIB}.a'
 
 def cargo_build():
-    features = ['micropython', 'protobuf', f'model_t{TREZOR_MODEL.lower()}']
+    # T1 does not have its own Rust feature, it shares it with TR
+    model_feature = 'model_tr' if TREZOR_MODEL == '1' else f'model_t{TREZOR_MODEL.lower()}'
+    features = ['micropython', 'protobuf', model_feature]
     if BITCOIN_ONLY == '1':
         features.append('bitcoin_only')
     features.append('ui')
@@ -694,14 +699,28 @@ env.Append(LINKFLAGS=f'-l{RUST_LIB}')
 #
 
 obj_program = []
+source_files = SOURCE_MOD + SOURCE_MICROPYTHON + SOURCE_UNIX
 obj_program.extend(env.Object(source=SOURCE_MOD))
 if FEATURE_FLAGS["SECP256K1_ZKP"]:
     obj_program.extend(env.Object(source=SOURCE_MOD_SECP256K1_ZKP, CCFLAGS='$CCFLAGS -Wno-unused-function'))
+    source_files.extend(SOURCE_MOD_SECP256K1_ZKP)
 obj_program.extend(env.Object(source=SOURCE_MICROPYTHON))
 obj_program.extend(env.Object(source=SOURCE_UNIX))
 if FROZEN:
     obj_program.extend(env.Object(source=source_mpyc))
 
+env.Replace(
+    ALLSOURCES=source_files,
+    ALLDEFS=tools.get_defs_for_cmake(env['CPPDEFINES']))
+
+
+cmake_gen = env.Command(
+    target='CMakeLists.txt',
+    source='',
+    action='$MAKECMAKELISTS --sources $ALLSOURCES --dirs $CPPPATH --defs $ALLDEFS',
+)
+
+
 env.Depends(obj_program, qstr_generated)
 
 program = env.Command(
@@ -709,4 +728,6 @@ program = env.Command(
     source=obj_program,
     action='$CC -o $TARGET $SOURCES $_LIBDIRFLAGS $_LIBFLAGS $LINKFLAGS', )
 
+if CMAKELISTS != 0:
+    env.Depends(program, cmake_gen)
 env.Depends(program, rust)
diff --git a/core/assets/click-icon.png b/core/assets/click-icon.png
deleted file mode 100644
index ddf37eee9c..0000000000
Binary files a/core/assets/click-icon.png and /dev/null differ
diff --git a/core/assets/cog.png b/core/assets/cog.png
deleted file mode 100644
index 8c59f68605..0000000000
Binary files a/core/assets/cog.png and /dev/null differ
diff --git a/core/assets/dontcopy.png b/core/assets/dontcopy.png
deleted file mode 100644
index 4a1480f22b..0000000000
Binary files a/core/assets/dontcopy.png and /dev/null differ
diff --git a/core/assets/homescreen_model_1.png b/core/assets/homescreen_model_1.png
deleted file mode 100644
index d115ec7cfc..0000000000
Binary files a/core/assets/homescreen_model_1.png and /dev/null differ
diff --git a/core/assets/homescreen_model_r.png b/core/assets/homescreen_model_r.png
deleted file mode 100644
index 2f2cc72bdd..0000000000
Binary files a/core/assets/homescreen_model_r.png and /dev/null differ
diff --git a/core/assets/icon_tools.png b/core/assets/icon_tools.png
deleted file mode 100644
index 30db60f9f5..0000000000
Binary files a/core/assets/icon_tools.png and /dev/null differ
diff --git a/core/assets/icon_update.png b/core/assets/icon_update.png
deleted file mode 100644
index 70119cc685..0000000000
Binary files a/core/assets/icon_update.png and /dev/null differ
diff --git a/core/assets/icon_wipe.png b/core/assets/icon_wipe.png
deleted file mode 100644
index 6a8909c272..0000000000
Binary files a/core/assets/icon_wipe.png and /dev/null differ
diff --git a/core/assets/left.png b/core/assets/left.png
deleted file mode 100644
index 9f50201810..0000000000
Binary files a/core/assets/left.png and /dev/null differ
diff --git a/core/assets/lock-new.png b/core/assets/lock-new.png
new file mode 100644
index 0000000000..6cb7246af6
Binary files /dev/null and b/core/assets/lock-new.png differ
diff --git a/core/assets/lock.png b/core/assets/lock.png
deleted file mode 100644
index e2df8e611e..0000000000
Binary files a/core/assets/lock.png and /dev/null differ
diff --git a/core/assets/logo.jpg b/core/assets/logo.jpg
new file mode 100644
index 0000000000..a3b4eecc99
Binary files /dev/null and b/core/assets/logo.jpg differ
diff --git a/core/assets/magic.png b/core/assets/magic.png
new file mode 100644
index 0000000000..a7e3d28c6f
Binary files /dev/null and b/core/assets/magic.png differ
diff --git a/core/assets/receive.png b/core/assets/receive.png
deleted file mode 100644
index f398b35db6..0000000000
Binary files a/core/assets/receive.png and /dev/null differ
diff --git a/core/assets/recovery-old.png b/core/assets/recovery-old.png
deleted file mode 100644
index dfa41cbc26..0000000000
Binary files a/core/assets/recovery-old.png and /dev/null differ
diff --git a/core/assets/recovery.png b/core/assets/recovery.png
deleted file mode 100644
index 40ac64a31e..0000000000
Binary files a/core/assets/recovery.png and /dev/null differ
diff --git a/core/assets/send.png b/core/assets/send.png
deleted file mode 100644
index a73d54125b..0000000000
Binary files a/core/assets/send.png and /dev/null differ
diff --git a/core/assets/small-arrow.png b/core/assets/small-arrow.png
deleted file mode 100644
index 26a80b8724..0000000000
Binary files a/core/assets/small-arrow.png and /dev/null differ
diff --git a/core/assets/swipedown.png b/core/assets/swipedown.png
deleted file mode 100644
index 00af05f40c..0000000000
Binary files a/core/assets/swipedown.png and /dev/null differ
diff --git a/core/assets/trezor_lock.png b/core/assets/trezor_lock.png
deleted file mode 100644
index cf43a2853c..0000000000
Binary files a/core/assets/trezor_lock.png and /dev/null differ
diff --git a/core/assets/trezor_logo.png b/core/assets/trezor_logo.png
deleted file mode 100644
index 06a5b3ca15..0000000000
Binary files a/core/assets/trezor_logo.png and /dev/null differ
diff --git a/core/assets/wrong.png b/core/assets/wrong.png
deleted file mode 100644
index 2a1061cd84..0000000000
Binary files a/core/assets/wrong.png and /dev/null differ
diff --git a/core/embed/boardloader/.changelog.d/2623.added b/core/embed/boardloader/.changelog.d/2623.added
new file mode 100644
index 0000000000..fe8e5b8cb6
--- /dev/null
+++ b/core/embed/boardloader/.changelog.d/2623.added
@@ -0,0 +1 @@
+Check image model when replacing bootloader
diff --git a/core/embed/boardloader/main.c b/core/embed/boardloader/main.c
index e17896b1d3..93f85b9579 100644
--- a/core/embed/boardloader/main.c
+++ b/core/embed/boardloader/main.c
@@ -53,14 +53,8 @@ struct BoardCapabilities capablities
     __attribute__((section(".capabilities_section"))) = {
         .header = CAPABILITIES_HEADER,
         .model_tag = MODEL_NAME,
-        .model_length = MODEL_NAME_MAX_LENGTH,
-#if defined TREZOR_MODEL_T
-        .model_name = "TREZORT",
-#elif defined TREZOR_MODEL_R
-        .model_name = "TREZORR",
-#else
-#error Unknown model
-#endif
+        .model_length = sizeof(uint32_t),
+        .model_name = HW_MODEL,
         .version_tag = BOARDLOADER_VERSION,
         .version_length = sizeof(struct BoardloaderVersion),
         .version = {.version_major = VERSION_MAJOR,
@@ -93,17 +87,29 @@ static uint32_t check_sdcard(void) {
 
   sdcard_power_off();
 
-  image_header hdr;
+  if (sectrue == read_status) {
+    const image_header *hdr =
+        read_image_header((const uint8_t *)sdcard_buf, BOOTLOADER_IMAGE_MAGIC,
+                          BOOTLOADER_IMAGE_MAXSIZE);
 
-  if ((sectrue == read_status) &&
-      (sectrue ==
-       load_image_header((const uint8_t *)sdcard_buf, BOOTLOADER_IMAGE_MAGIC,
-                         BOOTLOADER_IMAGE_MAXSIZE, BOARDLOADER_KEY_M,
-                         BOARDLOADER_KEY_N, BOARDLOADER_KEYS, &hdr))) {
-    return hdr.codelen;
-  } else {
-    return 0;
+    if (hdr != (const image_header *)sdcard_buf) {
+      return 0;
+    }
+
+    if (sectrue != check_image_model(hdr)) {
+      return 0;
+    }
+
+    if (sectrue != check_image_header_sig(hdr, BOARDLOADER_KEY_M,
+                                          BOARDLOADER_KEY_N,
+                                          BOARDLOADER_KEYS)) {
+      return 0;
+    }
+
+    return hdr->codelen;
   }
+
+  return 0;
 }
 
 static void progress_callback(int pos, int len) { display_printf("."); }
@@ -220,18 +226,21 @@ int main(void) {
   }
 #endif
 
-  image_header hdr;
+  const image_header *hdr =
+      read_image_header((const uint8_t *)BOOTLOADER_START,
+                        BOOTLOADER_IMAGE_MAGIC, BOOTLOADER_IMAGE_MAXSIZE);
 
-  ensure(load_image_header((const uint8_t *)BOOTLOADER_START,
-                           BOOTLOADER_IMAGE_MAGIC, BOOTLOADER_IMAGE_MAXSIZE,
-                           BOARDLOADER_KEY_M, BOARDLOADER_KEY_N,
-                           BOARDLOADER_KEYS, &hdr),
+  ensure(hdr == (const image_header *)BOOTLOADER_START ? sectrue : secfalse,
          "invalid bootloader header");
 
+  ensure(check_image_header_sig(hdr, BOARDLOADER_KEY_M, BOARDLOADER_KEY_N,
+                                BOARDLOADER_KEYS),
+         "invalid bootloader signature");
+
   const uint8_t sectors[] = {
       FLASH_SECTOR_BOOTLOADER,
   };
-  ensure(check_image_contents(&hdr, IMAGE_HEADER_SIZE, sectors, 1),
+  ensure(check_image_contents(hdr, IMAGE_HEADER_SIZE, sectors, 1),
          "invalid bootloader hash");
 
   ensure_compatible_settings();
diff --git a/core/embed/bootloader/.changelog.d/2623.added b/core/embed/bootloader/.changelog.d/2623.added
new file mode 100644
index 0000000000..133dcc6d1c
--- /dev/null
+++ b/core/embed/bootloader/.changelog.d/2623.added
@@ -0,0 +1 @@
+Add model info to image and check when installing/running firmware
diff --git a/core/embed/bootloader/bootui.c b/core/embed/bootloader/bootui.c
index 8c6618b935..de83047e3c 100644
--- a/core/embed/bootloader/bootui.c
+++ b/core/embed/bootloader/bootui.c
@@ -215,31 +215,6 @@ void ui_screen_firmware_info(const vendor_header *const vhdr,
   display_refresh();
 }
 
-void ui_screen_firmware_fingerprint(const image_header *const hdr) {
-  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_BL_BG);
-  display_text(16, 32, "Firmware fingerprint", -1, FONT_NORMAL, COLOR_BL_FG,
-               COLOR_BL_BG);
-  display_bar(16, 44, DISPLAY_RESX - 14 * 2, 1, COLOR_BL_FG);
-
-  static const char *hexdigits = "0123456789abcdef";
-  char fingerprint_str[64];
-  for (int i = 0; i < 32; i++) {
-    fingerprint_str[i * 2] = hexdigits[(hdr->fingerprint[i] >> 4) & 0xF];
-    fingerprint_str[i * 2 + 1] = hexdigits[hdr->fingerprint[i] & 0xF];
-  }
-  for (int i = 0; i < 4; i++) {
-    display_text_center(120, 70 + i * 25, fingerprint_str + i * 16, 16,
-                        FONT_MONO, COLOR_BL_FG, COLOR_BL_BG);
-  }
-
-  display_bar_radius(9, 184, 222, 50, COLOR_BL_DONE, COLOR_BL_BG, 4);
-  display_icon(9 + (222 - 19) / 2, 184 + (50 - 16) / 2, 20, 16,
-               toi_icon_confirm + 12, sizeof(toi_icon_confirm) - 12,
-               COLOR_BL_BG, COLOR_BL_DONE);
-  PIXELDATA_DIRTY();
-  display_refresh();
-}
-
 // install UI
 
 void ui_screen_install_confirm_upgrade(const vendor_header *const vhdr,
diff --git a/core/embed/bootloader/bootui.h b/core/embed/bootloader/bootui.h
index 0d74d316ec..73285e419e 100644
--- a/core/embed/bootloader/bootui.h
+++ b/core/embed/bootloader/bootui.h
@@ -34,7 +34,6 @@ void ui_screen_welcome_third(void);
 
 void ui_screen_firmware_info(const vendor_header* const vhdr,
                              const image_header* const hdr);
-void ui_screen_firmware_fingerprint(const image_header* const hdr);
 
 void ui_screen_install_confirm_upgrade(const vendor_header* const vhdr,
                                        const image_header* const hdr);
diff --git a/core/embed/bootloader/header.S b/core/embed/bootloader/header.S
index 3e3849a670..9014961835 100644
--- a/core/embed/bootloader/header.S
+++ b/core/embed/bootloader/header.S
@@ -10,7 +10,11 @@
 g_header:
     .byte 'T','R','Z','B'            // magic
     .word g_header_end - g_header    // hdrlen
+#ifdef TREZOR_MODEL_T
     .word 0                          // expiry
+#else
+    .word 1                          // expiry
+#endif
     .word _codelen                   // codelen
     .byte VERSION_MAJOR              // vmajor
     .byte VERSION_MINOR              // vminor
@@ -20,7 +24,10 @@ g_header:
     .byte FIX_VERSION_MINOR          // fix_vminor
     .byte FIX_VERSION_PATCH          // fix_vpatch
     .byte FIX_VERSION_BUILD          // fix_vbuild
-    . = . + 8                        // reserved
+    .word HW_MODEL                   // type of the designated hardware
+    .byte HW_REVISION                // revision of the designated hardware
+    .byte VERSION_MONOTONIC          // monotonic version of the binary
+    . = . + 2                        // reserved
     . = . + 512                      // hash1 ... hash16
     . = . + 415                      // reserved
     .byte 0                          // sigmask
diff --git a/core/embed/bootloader/main.c b/core/embed/bootloader/main.c
index 0e8e6701f0..c9f5c5ba69 100644
--- a/core/embed/bootloader/main.c
+++ b/core/embed/bootloader/main.c
@@ -159,7 +159,7 @@ static secbool bootloader_usb_loop(const vendor_header *const vhdr,
         break;
       case 7:  // FirmwareUpload
         r = process_msg_FirmwareUpload(USB_IFACE_NUM, msg_size, buf);
-        if (r < 0 && r != -4) {  // error, but not user abort (-4)
+        if (r < 0 && r != UPLOAD_ERR_USER_ABORT) {  // error, but not user abort
           ui_fadeout();
           ui_screen_fail();
           ui_fadein();
@@ -193,10 +193,9 @@ static secbool bootloader_usb_loop(const vendor_header *const vhdr,
   }
 }
 
-secbool load_vendor_header_keys(const uint8_t *const data,
-                                vendor_header *const vhdr) {
-  return load_vendor_header(data, BOOTLOADER_KEY_M, BOOTLOADER_KEY_N,
-                            BOOTLOADER_KEYS, vhdr);
+secbool check_vendor_header_keys(const vendor_header *const vhdr) {
+  return check_vendor_header_sig(vhdr, BOOTLOADER_KEY_M, BOOTLOADER_KEY_N,
+                                 BOOTLOADER_KEYS);
 }
 
 static secbool check_vendor_header_lock(const vendor_header *const vhdr) {
@@ -303,23 +302,40 @@ int main(void) {
   }
 #endif
 
+  const image_header *hdr = NULL;
   vendor_header vhdr;
-  image_header hdr;
-  // detect whether the devices contains a valid firmware
+  // detect whether the device contains a valid firmware
+  secbool firmware_present = sectrue;
+
+  if (sectrue != read_vendor_header((const uint8_t *)FIRMWARE_START, &vhdr)) {
+    firmware_present = secfalse;
+  }
+
+  if (sectrue == firmware_present) {
+    firmware_present = check_vendor_header_keys(&vhdr);
+  }
 
-  secbool firmware_present =
-      load_vendor_header_keys((const uint8_t *)FIRMWARE_START, &vhdr);
   if (sectrue == firmware_present) {
     firmware_present = check_vendor_header_lock(&vhdr);
   }
+
   if (sectrue == firmware_present) {
-    firmware_present = load_image_header(
-        (const uint8_t *)(FIRMWARE_START + vhdr.hdrlen), FIRMWARE_IMAGE_MAGIC,
-        FIRMWARE_IMAGE_MAXSIZE, vhdr.vsig_m, vhdr.vsig_n, vhdr.vpub, &hdr);
+    hdr = read_image_header((const uint8_t *)(FIRMWARE_START + vhdr.hdrlen),
+                            FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE);
+    if (hdr != (const image_header *)(FIRMWARE_START + vhdr.hdrlen)) {
+      firmware_present = secfalse;
+    }
+  }
+  if (sectrue == firmware_present) {
+    firmware_present = check_image_model(hdr);
   }
   if (sectrue == firmware_present) {
     firmware_present =
-        check_image_contents(&hdr, IMAGE_HEADER_SIZE + vhdr.hdrlen,
+        check_image_header_sig(hdr, vhdr.vsig_m, vhdr.vsig_n, vhdr.vpub);
+  }
+  if (sectrue == firmware_present) {
+    firmware_present =
+        check_image_contents(hdr, IMAGE_HEADER_SIZE + vhdr.hdrlen,
                              FIRMWARE_SECTORS, FIRMWARE_SECTORS_COUNT);
   }
 
@@ -357,26 +373,35 @@ int main(void) {
   // ... or we have stay_in_bootloader flag to force it
   if (touched || stay_in_bootloader == sectrue) {
     // no ui_fadeout(); - we already start from black screen
-    ui_screen_firmware_info(&vhdr, &hdr);
+    ui_screen_firmware_info(&vhdr, hdr);
     ui_fadein();
 
     // and start the usb loop
-    if (bootloader_usb_loop(&vhdr, &hdr) != sectrue) {
+    if (bootloader_usb_loop(&vhdr, hdr) != sectrue) {
       return 1;
     }
   }
 
-  ensure(load_vendor_header_keys((const uint8_t *)FIRMWARE_START, &vhdr),
+  ensure(read_vendor_header((const uint8_t *)FIRMWARE_START, &vhdr),
          "invalid vendor header");
 
+  ensure(check_vendor_header_keys(&vhdr), "invalid vendor header signature");
+
   ensure(check_vendor_header_lock(&vhdr), "unauthorized vendor keys");
 
-  ensure(load_image_header((const uint8_t *)(FIRMWARE_START + vhdr.hdrlen),
-                           FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE,
-                           vhdr.vsig_m, vhdr.vsig_n, vhdr.vpub, &hdr),
+  hdr = read_image_header((const uint8_t *)(FIRMWARE_START + vhdr.hdrlen),
+                          FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE);
+
+  ensure(hdr == (const image_header *)(FIRMWARE_START + vhdr.hdrlen) ? sectrue
+                                                                     : secfalse,
          "invalid firmware header");
 
-  ensure(check_image_contents(&hdr, IMAGE_HEADER_SIZE + vhdr.hdrlen,
+  ensure(check_image_model(hdr), "wrong firmware model");
+
+  ensure(check_image_header_sig(hdr, vhdr.vsig_m, vhdr.vsig_n, vhdr.vpub),
+         "invalid firmware signature");
+
+  ensure(check_image_contents(hdr, IMAGE_HEADER_SIZE + vhdr.hdrlen,
                               FIRMWARE_SECTORS, FIRMWARE_SECTORS_COUNT),
          "invalid firmware hash");
 
@@ -384,7 +409,7 @@ int main(void) {
 
   if ((vhdr.vtrust & VTRUST_ALL) != VTRUST_ALL) {
     // ui_fadeout();  // no fadeout - we start from black screen
-    ui_screen_boot(&vhdr, &hdr);
+    ui_screen_boot(&vhdr, hdr);
     ui_fadein();
 
     int delay = (vhdr.vtrust & VTRUST_WAIT) ^ VTRUST_WAIT;
diff --git a/core/embed/bootloader/messages.c b/core/embed/bootloader/messages.c
index 14474f1c1a..eab9c771b9 100644
--- a/core/embed/bootloader/messages.c
+++ b/core/embed/bootloader/messages.c
@@ -403,8 +403,7 @@ static bool _read_payload(pb_istream_t *stream, const pb_field_t *field,
   return true;
 }
 
-secbool load_vendor_header_keys(const uint8_t *const data,
-                                vendor_header *const vhdr);
+secbool check_vendor_header_keys(const vendor_header *const vhdr);
 
 static int version_compare(uint32_t vera, uint32_t verb) {
   int a, b;
@@ -422,8 +421,8 @@ static int version_compare(uint32_t vera, uint32_t verb) {
   return a - b;
 }
 
-static void detect_installation(vendor_header *current_vhdr,
-                                image_header *current_hdr,
+static void detect_installation(const vendor_header *current_vhdr,
+                                const image_header *current_hdr,
                                 const vendor_header *const new_vhdr,
                                 const image_header *const new_hdr,
                                 secbool *is_new, secbool *is_upgrade,
@@ -431,16 +430,17 @@ static void detect_installation(vendor_header *current_vhdr,
   *is_new = secfalse;
   *is_upgrade = secfalse;
   *is_downgrade_wipe = secfalse;
-  if (sectrue !=
-      load_vendor_header_keys((const uint8_t *)FIRMWARE_START, current_vhdr)) {
+  if (sectrue != check_vendor_header_keys(current_vhdr)) {
     *is_new = sectrue;
     return;
   }
-  if (sectrue !=
-      load_image_header((const uint8_t *)FIRMWARE_START + current_vhdr->hdrlen,
-                        FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE,
-                        current_vhdr->vsig_m, current_vhdr->vsig_n,
-                        current_vhdr->vpub, current_hdr)) {
+  if (sectrue != check_image_model(current_hdr)) {
+    *is_new = sectrue;
+    return;
+  }
+  if (sectrue != check_image_header_sig(current_hdr, current_vhdr->vsig_m,
+                                        current_vhdr->vsig_n,
+                                        current_vhdr->vpub)) {
     *is_new = sectrue;
     return;
   }
@@ -472,7 +472,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
     MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
     MSG_SEND_ASSIGN_STRING(message, "Invalid chunk size");
     MSG_SEND(Failure);
-    return -1;
+    return UPLOAD_ERR_INVALID_CHUNK_SIZE;
   }
 
   static image_header hdr;
@@ -483,29 +483,81 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
     if (headers_offset == 0) {
       // first block and headers are not yet parsed
       vendor_header vhdr;
-      if (sectrue != load_vendor_header_keys(CHUNK_BUFFER_PTR, &vhdr)) {
+
+      if (sectrue != read_vendor_header(CHUNK_BUFFER_PTR, &vhdr)) {
         MSG_SEND_INIT(Failure);
         MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
         MSG_SEND_ASSIGN_STRING(message, "Invalid vendor header");
         MSG_SEND(Failure);
-        return -2;
+        return UPLOAD_ERR_INVALID_VENDOR_HEADER;
       }
-      if (sectrue != load_image_header(CHUNK_BUFFER_PTR + vhdr.hdrlen,
-                                       FIRMWARE_IMAGE_MAGIC,
-                                       FIRMWARE_IMAGE_MAXSIZE, vhdr.vsig_m,
-                                       vhdr.vsig_n, vhdr.vpub, &hdr)) {
+
+      if (sectrue != check_vendor_header_keys(&vhdr)) {
+        MSG_SEND_INIT(Failure);
+        MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
+        MSG_SEND_ASSIGN_STRING(message, "Invalid vendor header signature");
+        MSG_SEND(Failure);
+        return UPLOAD_ERR_INVALID_VENDOR_HEADER_SIG;
+      }
+
+      const image_header *received_hdr =
+          read_image_header(CHUNK_BUFFER_PTR + vhdr.hdrlen,
+                            FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE);
+
+      if (received_hdr !=
+          (const image_header *)(CHUNK_BUFFER_PTR + vhdr.hdrlen)) {
         MSG_SEND_INIT(Failure);
         MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
         MSG_SEND_ASSIGN_STRING(message, "Invalid firmware header");
         MSG_SEND(Failure);
-        return -3;
+        return UPLOAD_ERR_INVALID_IMAGE_HEADER;
       }
 
+      if (sectrue != check_image_model(received_hdr)) {
+        MSG_SEND_INIT(Failure);
+        MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
+        MSG_SEND_ASSIGN_STRING(message, "Wrong firmware model");
+        MSG_SEND(Failure);
+        return UPLOAD_ERR_INVALID_IMAGE_MODEL;
+      }
+
+      if (sectrue != check_image_header_sig(received_hdr, vhdr.vsig_m,
+                                            vhdr.vsig_n, vhdr.vpub)) {
+        MSG_SEND_INIT(Failure);
+        MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
+        MSG_SEND_ASSIGN_STRING(message, "Invalid firmware signature");
+        MSG_SEND(Failure);
+        return UPLOAD_ERR_INVALID_IMAGE_HEADER_SIG;
+      }
+
+      memcpy(&hdr, received_hdr, sizeof(hdr));
+
       vendor_header current_vhdr;
-      image_header current_hdr;
+
       secbool is_new = secfalse;
-      detect_installation(&current_vhdr, &current_hdr, &vhdr, &hdr, &is_new,
-                          &is_upgrade, &is_downgrade_wipe);
+
+      if (sectrue !=
+          read_vendor_header((const uint8_t *)FIRMWARE_START, &current_vhdr)) {
+        is_new = sectrue;
+      }
+
+      const image_header *current_hdr = NULL;
+
+      if (is_new == secfalse) {
+        current_hdr = read_image_header(
+            (const uint8_t *)FIRMWARE_START + current_vhdr.hdrlen,
+            FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE);
+
+        if (current_hdr !=
+            (const image_header *)(FIRMWARE_START + current_vhdr.hdrlen)) {
+          is_new = sectrue;
+        }
+      }
+
+      if (is_new == secfalse) {
+        detect_installation(&current_vhdr, current_hdr, &vhdr, &hdr, &is_new,
+                            &is_upgrade, &is_downgrade_wipe);
+      }
 
       int response = INPUT_CANCEL;
       if (sectrue == is_new) {
@@ -528,10 +580,10 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
 
       if (INPUT_CANCEL == response) {
         ui_fadeout();
-        ui_screen_firmware_info(&current_vhdr, &current_hdr);
+        ui_screen_firmware_info(&current_vhdr, current_hdr);
         ui_fadein();
         send_user_abort(iface_num, "Firmware install cancelled");
-        return -4;
+        return UPLOAD_ERR_USER_ABORT;
       }
 
       headers_offset = IMAGE_HEADER_SIZE + vhdr.hdrlen;
@@ -572,7 +624,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
     MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
     MSG_SEND_ASSIGN_STRING(message, "Firmware too big");
     MSG_SEND(Failure);
-    return -5;
+    return UPLOAD_ERR_FIRMWARE_TOO_BIG;
   }
 
   if (sectrue != check_single_hash(hdr.hashes + firmware_block * 32,
@@ -591,7 +643,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
     MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
     MSG_SEND_ASSIGN_STRING(message, "Invalid chunk hash");
     MSG_SEND(Failure);
-    return -6;
+    return UPLOAD_ERR_INVALID_CHUNK_HASH;
   }
 
   ensure(flash_unlock_write(), NULL);
@@ -654,11 +706,11 @@ int process_msg_WipeDevice(uint8_t iface_num, uint32_t msg_size, uint8_t *buf) {
     MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
     MSG_SEND_ASSIGN_STRING(message, "Could not erase flash");
     MSG_SEND(Failure);
-    return -1;
+    return WIPE_ERR_CANNOT_ERASE;
   } else {
     MSG_SEND_INIT(Success);
     MSG_SEND(Success);
-    return 0;
+    return WIPE_OK;
   }
 }
 
diff --git a/core/embed/bootloader/messages.h b/core/embed/bootloader/messages.h
index fd11b82ac7..0937f60627 100644
--- a/core/embed/bootloader/messages.h
+++ b/core/embed/bootloader/messages.h
@@ -29,6 +29,24 @@
 
 #define FIRMWARE_UPLOAD_CHUNK_RETRY_COUNT 2
 
+enum {
+  UPLOAD_OK = 0,
+  UPLOAD_ERR_INVALID_CHUNK_SIZE = -1,
+  UPLOAD_ERR_INVALID_VENDOR_HEADER = -2,
+  UPLOAD_ERR_INVALID_VENDOR_HEADER_SIG = -3,
+  UPLOAD_ERR_INVALID_IMAGE_HEADER = -4,
+  UPLOAD_ERR_INVALID_IMAGE_MODEL = -5,
+  UPLOAD_ERR_INVALID_IMAGE_HEADER_SIG = -6,
+  UPLOAD_ERR_USER_ABORT = -7,
+  UPLOAD_ERR_FIRMWARE_TOO_BIG = -8,
+  UPLOAD_ERR_INVALID_CHUNK_HASH = -9,
+};
+
+enum {
+  WIPE_OK = 0,
+  WIPE_ERR_CANNOT_ERASE = -1,
+};
+
 secbool msg_parse_header(const uint8_t *buf, uint16_t *msg_id,
                          uint32_t *msg_size);
 
diff --git a/core/embed/bootloader_ci/.changelog.d/2623.added b/core/embed/bootloader_ci/.changelog.d/2623.added
new file mode 100644
index 0000000000..133dcc6d1c
--- /dev/null
+++ b/core/embed/bootloader_ci/.changelog.d/2623.added
@@ -0,0 +1 @@
+Add model info to image and check when installing/running firmware
diff --git a/core/embed/bootloader_ci/header.S b/core/embed/bootloader_ci/header.S
index 3e3849a670..bb386ef7fd 100644
--- a/core/embed/bootloader_ci/header.S
+++ b/core/embed/bootloader_ci/header.S
@@ -10,7 +10,11 @@
 g_header:
     .byte 'T','R','Z','B'            // magic
     .word g_header_end - g_header    // hdrlen
+#ifdef TREZOR_MODEL_T
     .word 0                          // expiry
+#else
+    .word 1                          // expiry
+#endif
     .word _codelen                   // codelen
     .byte VERSION_MAJOR              // vmajor
     .byte VERSION_MINOR              // vminor
@@ -20,7 +24,10 @@ g_header:
     .byte FIX_VERSION_MINOR          // fix_vminor
     .byte FIX_VERSION_PATCH          // fix_vpatch
     .byte FIX_VERSION_BUILD          // fix_vbuild
-    . = . + 8                        // reserved
+    .word HW_MODEL                   // type of the designated hardware
+    .byte HW_REVISION                // revision of the designated hardware
+    .byte VERSION_MONOTONIC          // monotonic version
+    . = . + 2                        // reserved
     . = . + 512                      // hash1 ... hash16
     . = . + 415                      // reserved
     .byte 0                          // sigmask
diff --git a/core/embed/bootloader_ci/main.c b/core/embed/bootloader_ci/main.c
index 4f10468f4e..32baff7de2 100644
--- a/core/embed/bootloader_ci/main.c
+++ b/core/embed/bootloader_ci/main.c
@@ -134,7 +134,7 @@ static secbool bootloader_usb_loop(const vendor_header *const vhdr,
         break;
       case 7:  // FirmwareUpload
         r = process_msg_FirmwareUpload(USB_IFACE_NUM, msg_size, buf);
-        if (r < 0 && r != -4) {  // error, but not user abort (-4)
+        if (r < 0 && r != UPLOAD_ERR_USER_ABORT) {  // error, but not user abort
           ui_screen_fail();
           usb_stop();
           usb_deinit();
@@ -163,10 +163,9 @@ static secbool bootloader_usb_loop(const vendor_header *const vhdr,
   }
 }
 
-secbool load_vendor_header_keys(const uint8_t *const data,
-                                vendor_header *const vhdr) {
-  return load_vendor_header(data, BOOTLOADER_KEY_M, BOOTLOADER_KEY_N,
-                            BOOTLOADER_KEYS, vhdr);
+secbool check_vendor_header_keys(vendor_header *const vhdr) {
+  return check_vendor_header_sig(vhdr, BOOTLOADER_KEY_M, BOOTLOADER_KEY_N,
+                                 BOOTLOADER_KEYS);
 }
 
 static secbool check_vendor_header_lock(const vendor_header *const vhdr) {
@@ -227,24 +226,40 @@ int main(void) {
 
   display_clear();
 
+  const image_header *hdr = NULL;
   vendor_header vhdr;
-  image_header hdr;
+  // detect whether the device contains a valid firmware
+  secbool firmware_present = sectrue;
 
-  // detect whether the devices contains a valid firmware
+  if (sectrue != read_vendor_header((const uint8_t *)FIRMWARE_START, &vhdr)) {
+    firmware_present = secfalse;
+  }
+
+  if (sectrue == firmware_present) {
+    firmware_present = check_vendor_header_keys(&vhdr);
+  }
 
-  secbool firmware_present =
-      load_vendor_header_keys((const uint8_t *)FIRMWARE_START, &vhdr);
   if (sectrue == firmware_present) {
     firmware_present = check_vendor_header_lock(&vhdr);
   }
+
   if (sectrue == firmware_present) {
-    firmware_present = load_image_header(
-        (const uint8_t *)(FIRMWARE_START + vhdr.hdrlen), FIRMWARE_IMAGE_MAGIC,
-        FIRMWARE_IMAGE_MAXSIZE, vhdr.vsig_m, vhdr.vsig_n, vhdr.vpub, &hdr);
+    hdr = read_image_header((const uint8_t *)(FIRMWARE_START + vhdr.hdrlen),
+                            FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE);
+    if (hdr != (const image_header *)(FIRMWARE_START + vhdr.hdrlen)) {
+      firmware_present = secfalse;
+    }
+  }
+  if (sectrue == firmware_present) {
+    firmware_present = check_image_model(hdr);
   }
   if (sectrue == firmware_present) {
     firmware_present =
-        check_image_contents(&hdr, IMAGE_HEADER_SIZE + vhdr.hdrlen,
+        check_image_header_sig(hdr, vhdr.vsig_m, vhdr.vsig_n, vhdr.vpub);
+  }
+  if (sectrue == firmware_present) {
+    firmware_present =
+        check_image_contents(hdr, IMAGE_HEADER_SIZE + vhdr.hdrlen,
                              FIRMWARE_SECTORS, FIRMWARE_SECTORS_COUNT);
   }
 
@@ -260,17 +275,26 @@ int main(void) {
     return 1;
   }
 
-  ensure(load_vendor_header_keys((const uint8_t *)FIRMWARE_START, &vhdr),
+  ensure(read_vendor_header((const uint8_t *)FIRMWARE_START, &vhdr),
          "invalid vendor header");
 
+  ensure(check_vendor_header_keys(&vhdr), "invalid vendor header signature");
+
   ensure(check_vendor_header_lock(&vhdr), "unauthorized vendor keys");
 
-  ensure(load_image_header((const uint8_t *)(FIRMWARE_START + vhdr.hdrlen),
-                           FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE,
-                           vhdr.vsig_m, vhdr.vsig_n, vhdr.vpub, &hdr),
+  hdr = read_image_header((const uint8_t *)(FIRMWARE_START + vhdr.hdrlen),
+                          FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE);
+
+  ensure(hdr == (const image_header *)(FIRMWARE_START + vhdr.hdrlen) ? sectrue
+                                                                     : secfalse,
          "invalid firmware header");
 
-  ensure(check_image_contents(&hdr, IMAGE_HEADER_SIZE + vhdr.hdrlen,
+  ensure(check_image_model(hdr), "wrong firmware model");
+
+  ensure(check_image_header_sig(hdr, vhdr.vsig_m, vhdr.vsig_n, vhdr.vpub),
+         "invalid firmware signature");
+
+  ensure(check_image_contents(hdr, IMAGE_HEADER_SIZE + vhdr.hdrlen,
                               FIRMWARE_SECTORS, FIRMWARE_SECTORS_COUNT),
          "invalid firmware hash");
 
diff --git a/core/embed/bootloader_ci/messages.c b/core/embed/bootloader_ci/messages.c
index a024874045..c2e0c92e6a 100644
--- a/core/embed/bootloader_ci/messages.c
+++ b/core/embed/bootloader_ci/messages.c
@@ -401,8 +401,7 @@ static bool _read_payload(pb_istream_t *stream, const pb_field_t *field,
   return true;
 }
 
-secbool load_vendor_header_keys(const uint8_t *const data,
-                                vendor_header *const vhdr);
+secbool check_vendor_header_keys(const vendor_header *const vhdr);
 
 static int version_compare(uint32_t vera, uint32_t verb) {
   int a, b;
@@ -420,8 +419,8 @@ static int version_compare(uint32_t vera, uint32_t verb) {
   return a - b;
 }
 
-static void detect_installation(vendor_header *current_vhdr,
-                                image_header *current_hdr,
+static void detect_installation(const vendor_header *current_vhdr,
+                                const image_header *current_hdr,
                                 const vendor_header *const new_vhdr,
                                 const image_header *const new_hdr,
                                 secbool *is_new, secbool *is_upgrade,
@@ -429,16 +428,17 @@ static void detect_installation(vendor_header *current_vhdr,
   *is_new = secfalse;
   *is_upgrade = secfalse;
   *is_downgrade_wipe = secfalse;
-  if (sectrue !=
-      load_vendor_header_keys((const uint8_t *)FIRMWARE_START, current_vhdr)) {
+  if (sectrue != check_vendor_header_keys(current_vhdr)) {
     *is_new = sectrue;
     return;
   }
-  if (sectrue !=
-      load_image_header((const uint8_t *)FIRMWARE_START + current_vhdr->hdrlen,
-                        FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE,
-                        current_vhdr->vsig_m, current_vhdr->vsig_n,
-                        current_vhdr->vpub, current_hdr)) {
+  if (sectrue != check_image_model(current_hdr)) {
+    *is_new = sectrue;
+    return;
+  }
+  if (sectrue != check_image_header_sig(current_hdr, current_vhdr->vsig_m,
+                                        current_vhdr->vsig_n,
+                                        current_vhdr->vpub)) {
     *is_new = sectrue;
     return;
   }
@@ -470,7 +470,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
     MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
     MSG_SEND_ASSIGN_STRING(message, "Invalid chunk size");
     MSG_SEND(Failure);
-    return -1;
+    return UPLOAD_ERR_INVALID_CHUNK_SIZE;
   }
 
   static image_header hdr;
@@ -481,29 +481,80 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
     if (headers_offset == 0) {
       // first block and headers are not yet parsed
       vendor_header vhdr;
-      if (sectrue != load_vendor_header_keys(chunk_buffer, &vhdr)) {
+
+      if (sectrue != read_vendor_header(chunk_buffer, &vhdr)) {
         MSG_SEND_INIT(Failure);
         MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
         MSG_SEND_ASSIGN_STRING(message, "Invalid vendor header");
         MSG_SEND(Failure);
-        return -2;
+        return UPLOAD_ERR_INVALID_VENDOR_HEADER;
       }
-      if (sectrue != load_image_header(chunk_buffer + vhdr.hdrlen,
-                                       FIRMWARE_IMAGE_MAGIC,
-                                       FIRMWARE_IMAGE_MAXSIZE, vhdr.vsig_m,
-                                       vhdr.vsig_n, vhdr.vpub, &hdr)) {
+
+      if (sectrue != check_vendor_header_keys(&vhdr)) {
+        MSG_SEND_INIT(Failure);
+        MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
+        MSG_SEND_ASSIGN_STRING(message, "Invalid vendor header signature");
+        MSG_SEND(Failure);
+        return UPLOAD_ERR_INVALID_VENDOR_HEADER_SIG;
+      }
+
+      const image_header *received_hdr =
+          read_image_header(chunk_buffer + vhdr.hdrlen, FIRMWARE_IMAGE_MAGIC,
+                            FIRMWARE_IMAGE_MAXSIZE);
+
+      if (received_hdr != (const image_header *)chunk_buffer + vhdr.hdrlen) {
         MSG_SEND_INIT(Failure);
         MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
         MSG_SEND_ASSIGN_STRING(message, "Invalid firmware header");
         MSG_SEND(Failure);
-        return -3;
+        return UPLOAD_ERR_INVALID_IMAGE_HEADER;
       }
 
+      if (sectrue != check_image_model(received_hdr)) {
+        MSG_SEND_INIT(Failure);
+        MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
+        MSG_SEND_ASSIGN_STRING(message, "Wrong firmware model");
+        MSG_SEND(Failure);
+        return UPLOAD_ERR_INVALID_IMAGE_MODEL;
+      }
+
+      if (sectrue != check_image_header_sig(received_hdr, vhdr.vsig_m,
+                                            vhdr.vsig_n, vhdr.vpub)) {
+        MSG_SEND_INIT(Failure);
+        MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
+        MSG_SEND_ASSIGN_STRING(message, "Invalid firmware signature");
+        MSG_SEND(Failure);
+        return UPLOAD_ERR_INVALID_IMAGE_HEADER_SIG;
+      }
+
+      memcpy(&hdr, received_hdr, sizeof(hdr));
+
       vendor_header current_vhdr;
-      image_header current_hdr;
+
       secbool is_new = secfalse;
-      detect_installation(&current_vhdr, &current_hdr, &vhdr, &hdr, &is_new,
-                          &is_upgrade, &is_downgrade_wipe);
+
+      if (sectrue !=
+          read_vendor_header((const uint8_t *)FIRMWARE_START, &current_vhdr)) {
+        is_new = sectrue;
+      }
+
+      const image_header *current_hdr = NULL;
+
+      if (is_new == secfalse) {
+        current_hdr = read_image_header(
+            (const uint8_t *)FIRMWARE_START + current_vhdr.hdrlen,
+            FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE);
+
+        if (current_hdr !=
+            (const image_header *)(FIRMWARE_START + current_vhdr.hdrlen)) {
+          is_new = sectrue;
+        }
+      }
+
+      if (is_new == secfalse) {
+        detect_installation(&current_vhdr, current_hdr, &vhdr, &hdr, &is_new,
+                            &is_upgrade, &is_downgrade_wipe);
+      }
 
       // no user confirmations, go directly to upload
 
@@ -539,7 +590,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
     MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
     MSG_SEND_ASSIGN_STRING(message, "Firmware too big");
     MSG_SEND(Failure);
-    return -5;
+    return UPLOAD_ERR_FIRMWARE_TOO_BIG;
   }
 
   if (sectrue != check_single_hash(hdr.hashes + firmware_block * 32,
@@ -558,7 +609,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
     MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
     MSG_SEND_ASSIGN_STRING(message, "Invalid chunk hash");
     MSG_SEND(Failure);
-    return -6;
+    return UPLOAD_ERR_INVALID_CHUNK_HASH;
   }
 
   ensure(flash_unlock_write(), NULL);
@@ -621,11 +672,11 @@ int process_msg_WipeDevice(uint8_t iface_num, uint32_t msg_size, uint8_t *buf) {
     MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
     MSG_SEND_ASSIGN_STRING(message, "Could not erase flash");
     MSG_SEND(Failure);
-    return -1;
+    return WIPE_ERR_CANNOT_ERASE;
   } else {
     MSG_SEND_INIT(Success);
     MSG_SEND(Success);
-    return 0;
+    return WIPE_OK;
   }
 }
 
diff --git a/core/embed/bootloader_ci/messages.h b/core/embed/bootloader_ci/messages.h
index fd11b82ac7..0937f60627 100644
--- a/core/embed/bootloader_ci/messages.h
+++ b/core/embed/bootloader_ci/messages.h
@@ -29,6 +29,24 @@
 
 #define FIRMWARE_UPLOAD_CHUNK_RETRY_COUNT 2
 
+enum {
+  UPLOAD_OK = 0,
+  UPLOAD_ERR_INVALID_CHUNK_SIZE = -1,
+  UPLOAD_ERR_INVALID_VENDOR_HEADER = -2,
+  UPLOAD_ERR_INVALID_VENDOR_HEADER_SIG = -3,
+  UPLOAD_ERR_INVALID_IMAGE_HEADER = -4,
+  UPLOAD_ERR_INVALID_IMAGE_MODEL = -5,
+  UPLOAD_ERR_INVALID_IMAGE_HEADER_SIG = -6,
+  UPLOAD_ERR_USER_ABORT = -7,
+  UPLOAD_ERR_FIRMWARE_TOO_BIG = -8,
+  UPLOAD_ERR_INVALID_CHUNK_HASH = -9,
+};
+
+enum {
+  WIPE_OK = 0,
+  WIPE_ERR_CANNOT_ERASE = -1,
+};
+
 secbool msg_parse_header(const uint8_t *buf, uint16_t *msg_id,
                          uint32_t *msg_size);
 
diff --git a/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-bip39.h b/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-bip39.h
index cfca37c4f4..fe731fdcc1 100644
--- a/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-bip39.h
+++ b/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-bip39.h
@@ -25,41 +25,6 @@
 
 /// package: trezorcrypto.bip39
 
-/// def complete_word(prefix: str) -> str | None:
-///     """
-///     Return the first word from the wordlist starting with prefix.
-///     """
-STATIC mp_obj_t mod_trezorcrypto_bip39_complete_word(mp_obj_t prefix) {
-  mp_buffer_info_t pfx = {0};
-  mp_get_buffer_raise(prefix, &pfx, MP_BUFFER_READ);
-  if (pfx.len == 0) {
-    return mp_const_none;
-  }
-  const char *word = mnemonic_complete_word(pfx.buf, pfx.len);
-  if (word) {
-    return mp_obj_new_str(word, strlen(word));
-  } else {
-    return mp_const_none;
-  }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip39_complete_word_obj,
-                                 mod_trezorcrypto_bip39_complete_word);
-
-/// def word_completion_mask(prefix: str) -> int:
-///     """
-///     Return possible 1-letter suffixes for given word prefix.
-///     Result is a bitmask, with 'a' on the lowest bit, 'b' on the second
-///     lowest, etc.
-///     """
-STATIC mp_obj_t mod_trezorcrypto_bip39_word_completion_mask(mp_obj_t prefix) {
-  mp_buffer_info_t pfx = {0};
-  mp_get_buffer_raise(prefix, &pfx, MP_BUFFER_READ);
-  return mp_obj_new_int(mnemonic_word_completion_mask(pfx.buf, pfx.len));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(
-    mod_trezorcrypto_bip39_word_completion_mask_obj,
-    mod_trezorcrypto_bip39_word_completion_mask);
-
 /// def generate(strength: int) -> str:
 ///     """
 ///     Generate a mnemonic of given strength (128, 160, 192, 224 and 256 bits).
@@ -148,10 +113,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_bip39_seed_obj, 2,
 
 STATIC const mp_rom_map_elem_t mod_trezorcrypto_bip39_globals_table[] = {
     {MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bip39)},
-    {MP_ROM_QSTR(MP_QSTR_complete_word),
-     MP_ROM_PTR(&mod_trezorcrypto_bip39_complete_word_obj)},
-    {MP_ROM_QSTR(MP_QSTR_word_completion_mask),
-     MP_ROM_PTR(&mod_trezorcrypto_bip39_word_completion_mask_obj)},
     {MP_ROM_QSTR(MP_QSTR_generate),
      MP_ROM_PTR(&mod_trezorcrypto_bip39_generate_obj)},
     {MP_ROM_QSTR(MP_QSTR_from_data),
diff --git a/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-slip39.h b/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-slip39.h
index b3341066e5..1633392f15 100644
--- a/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-slip39.h
+++ b/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-slip39.h
@@ -24,47 +24,6 @@
 
 /// package: trezorcrypto.slip39
 
-/// def word_completion_mask(prefix: int) -> int:
-///     """
-///     Calculates which buttons still can be pressed after some already were.
-///     Returns a 9-bit bitmask, where each bit specifies which buttons
-///     can be further pressed (there are still words in this combination).
-///     LSB denotes first button.
-///
-///     Example: 110000110 - second, third, eighth and ninth button still can be
-///     pressed.
-///     """
-STATIC mp_obj_t mod_trezorcrypto_slip39_word_completion_mask(mp_obj_t _prefix) {
-  uint16_t prefix = mp_obj_get_int(_prefix);
-
-  if (prefix < 1 || prefix > 9999) {
-    mp_raise_ValueError(
-        "Invalid button prefix (range between 1 and 9999 is allowed)");
-  }
-  return mp_obj_new_int_from_uint(slip39_word_completion_mask(prefix));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(
-    mod_trezorcrypto_slip39_word_completion_mask_obj,
-    mod_trezorcrypto_slip39_word_completion_mask);
-
-/// def button_sequence_to_word(prefix: int) -> str:
-///     """
-///     Finds the first word that fits the given button prefix.
-///     """
-STATIC mp_obj_t
-mod_trezorcrypto_slip39_button_sequence_to_word(mp_obj_t _prefix) {
-  uint16_t prefix = mp_obj_get_int(_prefix);
-
-  const char *word = button_sequence_to_word(prefix);
-  if (word == NULL) {
-    mp_raise_ValueError("Invalid button prefix");
-  }
-  return mp_obj_new_str_copy(&mp_type_str, (const uint8_t *)word, strlen(word));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(
-    mod_trezorcrypto_slip39_button_sequence_to_word_obj,
-    mod_trezorcrypto_slip39_button_sequence_to_word);
-
 /// def word_index(word: str) -> int:
 ///     """
 ///     Finds index of given word.
@@ -104,10 +63,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_slip39_get_word_obj,
 
 STATIC const mp_rom_map_elem_t mod_trezorcrypto_slip39_globals_table[] = {
     {MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_slip39)},
-    {MP_ROM_QSTR(MP_QSTR_word_completion_mask),
-     MP_ROM_PTR(&mod_trezorcrypto_slip39_word_completion_mask_obj)},
-    {MP_ROM_QSTR(MP_QSTR_button_sequence_to_word),
-     MP_ROM_PTR(&mod_trezorcrypto_slip39_button_sequence_to_word_obj)},
     {MP_ROM_QSTR(MP_QSTR_word_index),
      MP_ROM_PTR(&mod_trezorcrypto_slip39_word_index_obj)},
     {MP_ROM_QSTR(MP_QSTR_get_word),
diff --git a/core/embed/extmod/modtrezorio/ff.c b/core/embed/extmod/modtrezorio/ff.c
index 415849999a..b48b70b30e 100644
--- a/core/embed/extmod/modtrezorio/ff.c
+++ b/core/embed/extmod/modtrezorio/ff.c
@@ -1,10 +1,10 @@
 // clang-format off
 
 /*----------------------------------------------------------------------------/
-/  FatFs - Generic FAT Filesystem Module  R0.14                               /
+/  FatFs - Generic FAT Filesystem Module  R0.15 w/patch1                      /
 /-----------------------------------------------------------------------------/
 /
-/ Copyright (C) 2019, ChaN, all right reserved.
+/ Copyright (C) 2022, ChaN, all right reserved.
 /
 / FatFs module is an open source software. Redistribution and use of FatFs in
 / source and binary forms, with or without modification, are permitted provided
@@ -21,6 +21,7 @@
 /----------------------------------------------------------------------------*/
 
 
+#include <string.h>
 #include "ff.h"			/* Declarations of FatFs API */
 #include "diskio.h"		/* Declarations of device I/O functions */
 
@@ -31,7 +32,7 @@
 
 ---------------------------------------------------------------------------*/
 
-#if FF_DEFINED != 86606	/* Revision ID */
+#if FF_DEFINED != 80286	/* Revision ID */
 #error Wrong include file (ff.h).
 #endif
 
@@ -49,6 +50,8 @@
 #define IsUpper(c)		((c) >= 'A' && (c) <= 'Z')
 #define IsLower(c)		((c) >= 'a' && (c) <= 'z')
 #define IsDigit(c)		((c) >= '0' && (c) <= '9')
+#define IsSeparator(c)	((c) == '/' || (c) == '\\')
+#define IsTerminator(c)	((UINT)(c) < (FF_USE_LFN ? ' ' : '!'))
 #define IsSurrogate(c)	((c) >= 0xD800 && (c) <= 0xDFFF)
 #define IsSurrogateH(c)	((c) >= 0xD800 && (c) <= 0xDBFF)
 #define IsSurrogateL(c)	((c) >= 0xDC00 && (c) <= 0xDFFF)
@@ -63,7 +66,8 @@
 /* Additional file attribute bits for internal use */
 #define AM_VOL		0x08	/* Volume label */
 #define AM_LFN		0x0F	/* LFN entry */
-#define AM_MASK		0x3F	/* Mask of defined bits */
+#define AM_MASK		0x3F	/* Mask of defined bits in FAT */
+#define AM_MASKX	0x37	/* Mask of defined bits in exFAT */
 
 
 /* Name status flags in fn[11] */
@@ -206,26 +210,26 @@
 #define PTE_StLba			8		/* MBR PTE: Start in LBA */
 #define PTE_SizLba			12		/* MBR PTE: Size in LBA */
 
-#define GPTH_Sign			0		/* GPT: Header signature (8-byte) */
-#define GPTH_Rev			8		/* GPT: Revision (DWORD) */
-#define GPTH_Size			12		/* GPT: Header size (DWORD) */
-#define GPTH_Bcc			16		/* GPT: Header BCC (DWORD) */
-#define GPTH_CurLba			24		/* GPT: Main header LBA (QWORD) */
-#define GPTH_BakLba			32		/* GPT: Backup header LBA (QWORD) */
-#define GPTH_FstLba			40		/* GPT: First LBA for partitions (QWORD) */
-#define GPTH_LstLba			48		/* GPT: Last LBA for partitions (QWORD) */
-#define GPTH_DskGuid		56		/* GPT: Disk GUID (16-byte) */
-#define GPTH_PtOfs			72		/* GPT: Partation table LBA (QWORD) */
-#define GPTH_PtNum			80		/* GPT: Number of table entries (DWORD) */
-#define GPTH_PteSize		84		/* GPT: Size of table entry (DWORD) */
-#define GPTH_PtBcc			88		/* GPT: Partation table BCC (DWORD) */
-#define SZ_GPTE				128		/* GPT: Size of partition table entry */
+#define GPTH_Sign			0		/* GPT HDR: Signature (8-byte) */
+#define GPTH_Rev			8		/* GPT HDR: Revision (DWORD) */
+#define GPTH_Size			12		/* GPT HDR: Header size (DWORD) */
+#define GPTH_Bcc			16		/* GPT HDR: Header BCC (DWORD) */
+#define GPTH_CurLba			24		/* GPT HDR: This header LBA (QWORD) */
+#define GPTH_BakLba			32		/* GPT HDR: Another header LBA (QWORD) */
+#define GPTH_FstLba			40		/* GPT HDR: First LBA for partition data (QWORD) */
+#define GPTH_LstLba			48		/* GPT HDR: Last LBA for partition data (QWORD) */
+#define GPTH_DskGuid		56		/* GPT HDR: Disk GUID (16-byte) */
+#define GPTH_PtOfs			72		/* GPT HDR: Partition table LBA (QWORD) */
+#define GPTH_PtNum			80		/* GPT HDR: Number of table entries (DWORD) */
+#define GPTH_PteSize		84		/* GPT HDR: Size of table entry (DWORD) */
+#define GPTH_PtBcc			88		/* GPT HDR: Partition table BCC (DWORD) */
+#define SZ_GPTE				128		/* GPT PTE: Size of partition table entry */
 #define GPTE_PtGuid			0		/* GPT PTE: Partition type GUID (16-byte) */
 #define GPTE_UpGuid			16		/* GPT PTE: Partition unique GUID (16-byte) */
-#define GPTE_FstLba			32		/* GPT PTE: First LBA (QWORD) */
-#define GPTE_LstLba			40		/* GPT PTE: Last LBA inclusive (QWORD) */
-#define GPTE_Flags			48		/* GPT PTE: Flags (QWORD) */
-#define GPTE_Name			56		/* GPT PTE: Name */
+#define GPTE_FstLba			32		/* GPT PTE: First LBA of partition (QWORD) */
+#define GPTE_LstLba			40		/* GPT PTE: Last LBA of partition (QWORD) */
+#define GPTE_Flags			48		/* GPT PTE: Partition flags (QWORD) */
+#define GPTE_Name			56		/* GPT PTE: Partition name */
 
 
 /* Post process on fatal error in the file operations */
@@ -238,7 +242,7 @@
 
 /* Definitions of logical drive - physical location conversion */
 #define LD2PD(vol) (BYTE)(vol)	/* Each logical drive is associated with the same physical drive number */
-#define LD2PT(vol) 0			/* Find first valid partition or in SFD */
+#define LD2PT(vol) 0			/* Auto partition search */
 
 
 /* Definitions of sector size */
@@ -524,23 +528,6 @@ static void st_dword (BYTE* ptr, DWORD val)	/* Store a 4-byte word in little-end
 /* String functions                                                      */
 /*-----------------------------------------------------------------------*/
 
-#include <string.h>
-
-// These were originally provided by the FatFs library but we use externally
-// provided versions from C stdlib to (hopefully) reduce code size and use
-// more efficient versions.
-#define mem_cpy memcpy
-#define mem_set memset
-#define mem_cmp memcmp
-
-/* Check if chr is contained in the string */
-static int chk_chr (const char* str, int chr)	/* NZ:contained, ZR:not contained */
-{
-	while (*str && *str != chr) str++;
-	return *str;
-}
-
-
 /* Test if the byte is DBC 1st byte */
 static int dbc_1st (BYTE c)
 {
@@ -571,18 +558,14 @@ static DWORD tchar2uni (	/* Returns a character in UTF-16 encoding (>=0x10000 on
 
 	uc = (BYTE)*p++;	/* Get an encoding unit */
 	if (uc & 0x80) {	/* Multiple byte code? */
-		if ((uc & 0xE0) == 0xC0) {	/* 2-byte sequence? */
+		if        ((uc & 0xE0) == 0xC0) {	/* 2-byte sequence? */
 			uc &= 0x1F; nf = 1;
-		} else {
-			if ((uc & 0xF0) == 0xE0) {	/* 3-byte sequence? */
-				uc &= 0x0F; nf = 2;
-			} else {
-				if ((uc & 0xF8) == 0xF0) {	/* 4-byte sequence? */
-					uc &= 0x07; nf = 3;
-				} else {					/* Wrong sequence */
-					return 0xFFFFFFFF;
-				}
-			}
+		} else if ((uc & 0xF0) == 0xE0) {	/* 3-byte sequence? */
+			uc &= 0x0F; nf = 2;
+		} else if ((uc & 0xF8) == 0xF0) {	/* 4-byte sequence? */
+			uc &= 0x07; nf = 3;
+		} else {							/* Wrong sequence */
+			return 0xFFFFFFFF;
 		}
 		do {	/* Get trailing bytes */
 			b = (BYTE)*p++;
@@ -598,8 +581,8 @@ static DWORD tchar2uni (	/* Returns a character in UTF-16 encoding (>=0x10000 on
 }
 
 
-/* Output a TCHAR string in defined API encoding */
-static BYTE put_utf (	/* Returns number of encoding units written (0:buffer overflow or wrong encoding) */
+/* Store a Unicode char in defined API encoding */
+static UINT put_utf (	/* Returns number of encoding units written (0:buffer overflow or wrong encoding) */
 	DWORD chr,	/* UTF-16 encoded character (Surrogate pair if >=0x10000) */
 	TCHAR* buf,	/* Output buffer */
 	UINT szb	/* Size of the buffer */
@@ -709,14 +692,13 @@ static FRESULT sync_fs (	/* Returns FR_OK or FR_DISK_ERR */
 	if (res == FR_OK) {
 		if (fs->fs_type == FS_FAT32 && fs->fsi_flag == 1) {	/* FAT32: Update FSInfo sector if needed */
 			/* Create FSInfo structure */
-			mem_set(fs->win, 0, sizeof fs->win);
-			st_word(fs->win + BS_55AA, 0xAA55);
-			st_dword(fs->win + FSI_LeadSig, 0x41615252);
-			st_dword(fs->win + FSI_StrucSig, 0x61417272);
-			st_dword(fs->win + FSI_Free_Count, fs->free_clst);
-			st_dword(fs->win + FSI_Nxt_Free, fs->last_clst);
-			/* Write it into the FSInfo sector */
-			fs->winsect = fs->volbase + 1;
+			memset(fs->win, 0, sizeof fs->win);
+			st_word(fs->win + BS_55AA, 0xAA55);					/* Boot signature */
+			st_dword(fs->win + FSI_LeadSig, 0x41615252);		/* Leading signature */
+			st_dword(fs->win + FSI_StrucSig, 0x61417272);		/* Structure signature */
+			st_dword(fs->win + FSI_Free_Count, fs->free_clst);	/* Number of free clusters */
+			st_dword(fs->win + FSI_Nxt_Free, fs->last_clst);	/* Last allocated culuster */
+			fs->winsect = fs->volbase + 1;						/* Write it into the FSInfo sector (Next to VBR) */
 			disk_write(fs->pdrv, fs->win, fs->winsect, 1);
 			fs->fsi_flag = 0;
 		}
@@ -748,7 +730,7 @@ static LBA_t clst2sect (	/* !=0:Sector number, 0:Failed (invalid cluster#) */
 
 
 /*-----------------------------------------------------------------------*/
-/* FAT access - Read value of a FAT entry                                */
+/* FAT access - Read value of an FAT entry                               */
 /*-----------------------------------------------------------------------*/
 
 static DWORD get_fat (		/* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x7FFFFFFF:Cluster status */
@@ -798,7 +780,7 @@ static DWORD get_fat (		/* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x7FFFFFF
 
 
 /*-----------------------------------------------------------------------*/
-/* FAT access - Change value of a FAT entry                              */
+/* FAT access - Change value of an FAT entry                             */
 /*-----------------------------------------------------------------------*/
 
 static FRESULT put_fat (	/* FR_OK(0):succeeded, !=0:error */
@@ -814,12 +796,12 @@ static FRESULT put_fat (	/* FR_OK(0):succeeded, !=0:error */
 
 	if (clst >= 2 && clst < fs->n_fatent) {	/* Check if in valid range */
 		switch (fs->fs_type) {
-		case FS_FAT12 :
+		case FS_FAT12:
 			bc = (UINT)clst; bc += bc / 2;	/* bc: byte offset of the entry */
 			res = move_window(fs, fs->fatbase + (bc / SS(fs)));
 			if (res != FR_OK) break;
 			p = fs->win + bc++ % SS(fs);
-			*p = (clst & 1) ? ((*p & 0x0F) | ((BYTE)val << 4)) : (BYTE)val;		/* Update 1st byte */
+			*p = (clst & 1) ? ((*p & 0x0F) | ((BYTE)val << 4)) : (BYTE)val;	/* Update 1st byte */
 			fs->wflag = 1;
 			res = move_window(fs, fs->fatbase + (bc / SS(fs)));
 			if (res != FR_OK) break;
@@ -828,14 +810,14 @@ static FRESULT put_fat (	/* FR_OK(0):succeeded, !=0:error */
 			fs->wflag = 1;
 			break;
 
-		case FS_FAT16 :
+		case FS_FAT16:
 			res = move_window(fs, fs->fatbase + (clst / (SS(fs) / 2)));
 			if (res != FR_OK) break;
 			st_word(fs->win + clst * 2 % SS(fs), (WORD)val);	/* Simple WORD array */
 			fs->wflag = 1;
 			break;
 
-		case FS_FAT32 :
+		case FS_FAT32:
 			res = move_window(fs, fs->fatbase + (clst / (SS(fs) / 4)));
 			if (res != FR_OK) break;
 			if (!FF_FS_EXFAT || fs->fs_type != FS_EXFAT) {
@@ -997,7 +979,7 @@ static FRESULT dir_clear (	/* Returns FR_OK or FR_DISK_ERR */
 	if (sync_window(fs) != FR_OK) return FR_DISK_ERR;	/* Flush disk access window */
 	sect = clst2sect(fs, clst);		/* Top of the cluster */
 	fs->winsect = sect;				/* Set window to top of the cluster */
-	mem_set(fs->win, 0, sizeof fs->win);	/* Clear window buffer */
+	memset(fs->win, 0, sizeof fs->win);	/* Clear window buffer */
 	{
 		ibuf = fs->win; szb = 1;	/* Use window buffer (many single-sector writes may take a time) */
 		for (n = 0; n < fs->csize && disk_write(fs->pdrv, ibuf, sect + n, szb) == RES_OK; n += szb) ;	/* Fill the cluster with 0 */
@@ -1117,7 +1099,7 @@ static FRESULT dir_next (	/* FR_OK(0):succeeded, FR_NO_FILE:End of table, FR_DEN
 
 static FRESULT dir_alloc (	/* FR_OK(0):succeeded, !=0:error */
 	DIR* dp,				/* Pointer to the directory object */
-	UINT nent				/* Number of contiguous entries to allocate */
+	UINT n_ent			/* Number of contiguous entries to allocate */
 )
 {
 	FRESULT res = 0;
@@ -1131,13 +1113,13 @@ static FRESULT dir_alloc (	/* FR_OK(0):succeeded, !=0:error */
 		do {
 			res = move_window(fs, dp->sect);
 			if (res != FR_OK) break;
-			if (dp->dir[DIR_Name] == DDEM || dp->dir[DIR_Name] == 0) {
-				if (++n == nent) break;	/* A block of contiguous free entries is found */
+			if (dp->dir[DIR_Name] == DDEM || dp->dir[DIR_Name] == 0) {	/* Is the entry free? */
+				if (++n == n_ent) break;	/* Is a block of contiguous free entries found? */
 			} else {
-				n = 0;					/* Not a blank entry. Restart to search */
+				n = 0;				/* Not a free entry, restart to search */
 			}
-			res = dir_next(dp, 1);
-		} while (res == FR_OK);	/* Next entry with table stretch enabled */
+			res = dir_next(dp, 1);	/* Next entry with table stretch enabled */
+		} while (res == FR_OK);
 	}
 
 	if (res == FR_NO_FILE) res = FR_DENIED;	/* No directory entry to allocate */
@@ -1278,7 +1260,7 @@ static void put_lfn (
 	do {
 		if (wc != 0xFFFF) wc = lfn[i++];	/* Get an effective character */
 		st_word(dir + LfnOfs[s], wc);		/* Put it */
-		if (wc == 0) wc = 0xFFFF;		/* Padding characters for following items */
+		if (wc == 0) wc = 0xFFFF;			/* Padding characters for following items */
 	} while (++s < 13);
 	if (wc == 0xFFFF || !lfn[i]) ord |= LLEF;	/* Last LFN part is the start of LFN sequence */
 	dir[LDIR_Ord] = ord;			/* Set the LFN order */
@@ -1293,7 +1275,7 @@ static void put_lfn (
 
 static void gen_numname (
 	BYTE* dst,			/* Pointer to the buffer to store numbered SFN */
-	const BYTE* src,	/* Pointer to SFN */
+	const BYTE* src,	/* Pointer to SFN in directory form */
 	const WCHAR* lfn,	/* Pointer to LFN */
 	UINT seq			/* Sequence number */
 )
@@ -1304,7 +1286,7 @@ static void gen_numname (
 	DWORD sreg = 0;
 
 
-	mem_cpy(dst, src, 11);
+	memcpy(dst, src, 11);	/* Prepare the SFN to be modified */
 
 	if (seq > 5) {	/* In case of many collisions, generate a hash number instead of sequential number */
 		sreg = seq;
@@ -1319,24 +1301,23 @@ static void gen_numname (
 		seq = (UINT)sreg;
 	}
 
-	/* itoa (hexadecimal) */
+	/* Make suffix (~ + hexadecimal) */
 	i = 7;
 	do {
-		c = (BYTE)((seq % 16) + '0');
+		c = (BYTE)((seq % 16) + '0'); seq /= 16;
 		if (c > '9') c += 7;
 		ns[i--] = c;
-		seq /= 16;
-	} while (seq);
+	} while (i && seq);
 	ns[i] = '~';
 
-	/* Append the number to the SFN body */
-	for (j = 0; j < i && dst[j] != ' '; j++) {
-		if (dbc_1st(dst[j])) {
+	/* Append the suffix to the SFN body */
+	for (j = 0; j < i && dst[j] != ' '; j++) {	/* Find the offset to append */
+		if (dbc_1st(dst[j])) {	/* To avoid DBC break up */
 			if (j == i - 1) break;
 			j++;
 		}
 	}
-	do {
+	do {	/* Append the suffix */
 		dst[j++] = (i < 8) ? ns[i++] : ' ';
 	} while (j < 8);
 }
@@ -1395,17 +1376,17 @@ static FRESULT dir_read (
 			if (b == DDEM || b == '.' || (int)((attr & ~AM_ARC) == AM_VOL) != vol) {	/* An entry without valid data */
 				ord = 0xFF;
 			} else {
-				if (attr == AM_LFN) {			/* An LFN entry is found */
-					if (b & LLEF) {			/* Is it start of an LFN sequence? */
+				if (attr == AM_LFN) {	/* An LFN entry is found */
+					if (b & LLEF) {		/* Is it start of an LFN sequence? */
 						sum = dp->dir[LDIR_Chksum];
 						b &= (BYTE)~LLEF; ord = b;
 						dp->blk_ofs = dp->dptr;
 					}
 					/* Check LFN validity and capture it */
 					ord = (b == ord && sum == dp->dir[LDIR_Chksum] && pick_lfn(fs->lfnbuf, dp->dir)) ? ord - 1 : 0xFF;
-				} else {					/* An SFN entry is found */
+				} else {				/* An SFN entry is found */
 					if (ord != 0 || sum != sum_sfn(dp->dir)) {	/* Is there a valid LFN? */
-						dp->blk_ofs = 0xFFFFFFFF;			/* It has no LFN. */
+						dp->blk_ofs = 0xFFFFFFFF;	/* It has no LFN. */
 					}
 					break;
 				}
@@ -1460,7 +1441,7 @@ static FRESULT dir_find (	/* FR_OK(0):succeeded, !=0:error */
 				}
 			} else {					/* An SFN entry is found */
 				if (ord == 0 && sum == sum_sfn(dp->dir)) break;	/* LFN matched? */
-				if (!(dp->fn[NSFLAG] & NS_LOSS) && !mem_cmp(dp->dir, dp->fn, 11)) break;	/* SFN matched? */
+				if (!(dp->fn[NSFLAG] & NS_LOSS) && !memcmp(dp->dir, dp->fn, 11)) break;	/* SFN matched? */
 				ord = 0xFF; dp->blk_ofs = 0xFFFFFFFF;	/* Reset LFN sequence */
 			}
 		}
@@ -1483,15 +1464,15 @@ static FRESULT dir_register (	/* FR_OK:succeeded, FR_DENIED:no free entry or too
 {
 	FRESULT res = 0;
 	FATFS *fs = dp->obj.fs;
-	UINT n = 0, nlen = 0, nent = 0;
+	UINT n = 0, len = 0, n_ent = 0;
 	BYTE sn[12] = {0}, sum = 0;
 
 
 	if (dp->fn[NSFLAG] & (NS_DOT | NS_NONAME)) return FR_INVALID_NAME;	/* Check name validity */
-	for (nlen = 0; fs->lfnbuf[nlen]; nlen++) ;	/* Get lfn length */
+	for (len = 0; fs->lfnbuf[len]; len++) ;	/* Get lfn length */
 
 	/* On the FAT/FAT32 volume */
-	mem_cpy(sn, dp->fn, 12);
+	memcpy(sn, dp->fn, 12);
 	if (sn[NSFLAG] & NS_LOSS) {			/* When LFN is out of 8.3 format, generate a numbered name */
 		dp->fn[NSFLAG] = NS_NOLFN;		/* Find only SFN */
 		for (n = 1; n < 100; n++) {
@@ -1505,19 +1486,19 @@ static FRESULT dir_register (	/* FR_OK:succeeded, FR_DENIED:no free entry or too
 	}
 
 	/* Create an SFN with/without LFNs. */
-	nent = (sn[NSFLAG] & NS_LFN) ? (nlen + 12) / 13 + 1 : 1;	/* Number of entries to allocate */
-	res = dir_alloc(dp, nent);		/* Allocate entries */
-	if (res == FR_OK && --nent) {	/* Set LFN entry if needed */
-		res = dir_sdi(dp, dp->dptr - nent * SZDIRE);
+	n_ent = (sn[NSFLAG] & NS_LFN) ? (len + 12) / 13 + 1 : 1;	/* Number of entries to allocate */
+	res = dir_alloc(dp, n_ent);		/* Allocate entries */
+	if (res == FR_OK && --n_ent) {	/* Set LFN entry if needed */
+		res = dir_sdi(dp, dp->dptr - n_ent * SZDIRE);
 		if (res == FR_OK) {
 			sum = sum_sfn(dp->fn);	/* Checksum value of the SFN tied to the LFN */
 			do {					/* Store LFN entries in bottom first */
 				res = move_window(fs, dp->sect);
 				if (res != FR_OK) break;
-				put_lfn(fs->lfnbuf, dp->dir, (BYTE)nent, sum);
+				put_lfn(fs->lfnbuf, dp->dir, (BYTE)n_ent, sum);
 				fs->wflag = 1;
 				res = dir_next(dp, 0);	/* Next entry */
-			} while (res == FR_OK && --nent);
+			} while (res == FR_OK && --n_ent);
 		}
 	}
 
@@ -1526,8 +1507,8 @@ static FRESULT dir_register (	/* FR_OK:succeeded, FR_DENIED:no free entry or too
 	if (res == FR_OK) {
 		res = move_window(fs, dp->sect);
 		if (res == FR_OK) {
-			mem_set(dp->dir, 0, SZDIRE);	/* Clean the entry */
-			mem_cpy(dp->dir + DIR_Name, dp->fn, 11);	/* Put SFN */
+			memset(dp->dir, 0, SZDIRE);	/* Clean the entry */
+			memcpy(dp->dir + DIR_Name, dp->fn, 11);	/* Put SFN */
 			dp->dir[DIR_NTres] = dp->fn[NSFLAG] & (NS_BODY | NS_EXT);	/* Put NT flag */
 			fs->wflag = 1;
 		}
@@ -1558,7 +1539,7 @@ static FRESULT dir_remove (	/* FR_OK:Succeeded, FR_DISK_ERR:A disk error */
 			if (res != FR_OK) break;
 			if (FF_FS_EXFAT && fs->fs_type == FS_EXFAT) {	/* On the exFAT volume */
 				dp->dir[XDIR_Type] &= 0x7F;	/* Clear the entry InUse flag. */
-			} else {									/* On the FAT/FAT32 volume */
+			} else {										/* On the FAT/FAT32 volume */
 				dp->dir[DIR_Name] = DDEM;	/* Mark the entry 'deleted'. */
 			}
 			fs->wflag = 1;
@@ -1587,6 +1568,7 @@ static void get_fileinfo (
 	BYTE lcf = 0;
 	WCHAR wc = 0, hs = 0;
 	FATFS *fs = dp->obj.fs;
+	UINT nw = 0;
 
 
 	fno->fname[0] = 0;			/* Invaidate file info */
@@ -1594,15 +1576,18 @@ static void get_fileinfo (
 
 	{	/* On the FAT/FAT32 volume */
 		if (dp->blk_ofs != 0xFFFFFFFF) {	/* Get LFN if available */
-			si = di = hs = 0;
+			si = di = 0;
+			hs = 0;
 			while (fs->lfnbuf[si] != 0) {
 				wc = fs->lfnbuf[si++];		/* Get an LFN character (UTF-16) */
 				if (hs == 0 && IsSurrogate(wc)) {	/* Is it a surrogate? */
 					hs = wc; continue;		/* Get low surrogate */
 				}
-				wc = put_utf((DWORD)hs << 16 | wc, &fno->fname[di], FF_LFN_BUF - di);	/* Store it in UTF-16 or UTF-8 encoding */
-				if (wc == 0) { di = 0; break; }	/* Invalid char or buffer overflow? */
-				di += wc;
+				nw = put_utf((DWORD)hs << 16 | wc, &fno->fname[di], FF_LFN_BUF - di);	/* Store it in API encoding */
+				if (nw == 0) {				/* Buffer overflow or wrong char? */
+					di = 0; break;
+				}
+				di += nw;
 				hs = 0;
 			}
 			if (hs != 0) di = 0;	/* Broken surrogate pair? */
@@ -1620,16 +1605,20 @@ static void get_fileinfo (
 			wc = wc << 8 | dp->dir[si++];
 		}
 		wc = ff_oem2uni(wc, CODEPAGE);		/* ANSI/OEM -> Unicode */
-		if (wc == 0) { di = 0; break; }		/* Wrong char in the current code page? */
-		wc = put_utf(wc, &fno->altname[di], FF_SFN_BUF - di);	/* Store it in Unicode */
-		if (wc == 0) { di = 0; break; }		/* Buffer overflow? */
-		di += wc;
+		if (wc == 0) {				/* Wrong char in the current code page? */
+			di = 0; break;
+		}
+		nw = put_utf(wc, &fno->altname[di], FF_SFN_BUF - di);	/* Store it in API encoding */
+		if (nw == 0) {				/* Buffer overflow? */
+			di = 0; break;
+		}
+		di += nw;
 	}
 	fno->altname[di] = 0;	/* Terminate the SFN  (null string means SFN is invalid) */
 
 	if (fno->fname[0] == 0) {	/* If LFN is invalid, altname[] needs to be copied to fname[] */
 		if (di == 0) {	/* If LFN and SFN both are invalid, this object is inaccessible */
-			fno->fname[di++] = '?';
+			fno->fname[di++] = '\?';
 		} else {
 			for (si = di = 0, lcf = NS_BODY; fno->altname[si]; si++, di++) {	/* Copy altname[] to fname[] with case information */
 				wc = (WCHAR)fno->altname[si];
@@ -1643,7 +1632,7 @@ static void get_fileinfo (
 	}
 
 
-	fno->fattrib = dp->dir[DIR_Attr];					/* Attribute */
+	fno->fattrib = dp->dir[DIR_Attr] & AM_MASK;			/* Attribute */
 	fno->fsize = ld_dword(dp->dir + DIR_FileSize);		/* Size */
 	fno->ftime = ld_word(dp->dir + DIR_ModTime + 0);	/* Time */
 	fno->fdate = ld_word(dp->dir + DIR_ModTime + 2);	/* Date */
@@ -1665,10 +1654,11 @@ static FRESULT create_name (	/* FR_OK: successful, FR_INVALID_NAME: could not cr
 )
 {
 	BYTE b = 0, cf = 0;
-	WCHAR wc = 0, *lfn = NULL;
+	WCHAR wc = 0;
+	WCHAR *lfn = NULL;
+	const TCHAR* p = NULL;
 	DWORD uc = 0;
 	UINT i = 0, ni = 0, si = 0, di = 0;
-	const TCHAR *p = NULL;
 
 
 	/* Create LFN into LFN working buffer */
@@ -1678,20 +1668,21 @@ static FRESULT create_name (	/* FR_OK: successful, FR_INVALID_NAME: could not cr
 		if (uc == 0xFFFFFFFF) return FR_INVALID_NAME;		/* Invalid code or UTF decode error */
 		if (uc >= 0x10000) lfn[di++] = (WCHAR)(uc >> 16);	/* Store high surrogate if needed */
 		wc = (WCHAR)uc;
-		if (wc < ' ' || wc == '/' || wc == '\\') break;	/* Break if end of the path or a separator is found */
-		if (wc < 0x80 && chk_chr("\"*:<>\?|\x7F", wc)) return FR_INVALID_NAME;	/* Reject illegal characters for LFN */
+		if (wc < ' ' || IsSeparator(wc)) break;	/* Break if end of the path or a separator is found */
+		if (wc < 0x80 && strchr("*:<>|\"\?\x7F", (int)wc)) return FR_INVALID_NAME;	/* Reject illegal characters for LFN */
 		if (di >= FF_MAX_LFN) return FR_INVALID_NAME;	/* Reject too long name */
-		lfn[di++] = wc;					/* Store the Unicode character */
+		lfn[di++] = wc;				/* Store the Unicode character */
 	}
-	if (wc < ' ') {				/* End of path? */
-		cf = NS_LAST;			/* Set last segment flag */
-	} else {
-		cf = 0;					/* Next segment follows */
-		while (*p == '/' || *p == '\\') p++;	/* Skip duplicated separators if exist */
+	if (wc < ' ') {				/* Stopped at end of the path? */
+		cf = NS_LAST;			/* Last segment */
+	} else {					/* Stopped at a separator */
+		while (IsSeparator(*p)) p++;	/* Skip duplicated separators if exist */
+		cf = 0;					/* Next segment may follow */
+		if (IsTerminator(*p)) cf = NS_LAST;	/* Ignore terminating separator */
 	}
 	*path = p;					/* Return pointer to the next segment */
 
-	while (di) {						/* Snip off trailing spaces and dots if exist */
+	while (di) {					/* Snip off trailing spaces and dots if exist */
 		wc = lfn[di - 1];
 		if (wc != ' ' && wc != '.') break;
 		di--;
@@ -1704,7 +1695,7 @@ static FRESULT create_name (	/* FR_OK: successful, FR_INVALID_NAME: could not cr
 	if (si > 0 || lfn[si] == '.') cf |= NS_LOSS | NS_LFN;	/* Is there any leading space or dot? */
 	while (di > 0 && lfn[di - 1] != '.') di--;	/* Find last dot (di<=si: no extension) */
 
-	mem_set(dp->fn, ' ', 11);
+	memset(dp->fn, ' ', 11);
 	i = b = 0; ni = 8;
 	for (;;) {
 		wc = lfn[si++];					/* Get an LFN character */
@@ -1725,7 +1716,7 @@ static FRESULT create_name (	/* FR_OK: successful, FR_INVALID_NAME: could not cr
 			continue;
 		}
 
-		if (wc >= 0x80) {	/* Is this a non-ASCII character? */
+		if (wc >= 0x80) {	/* Is this an extended character? */
 			cf |= NS_LFN;	/* LFN entry needs to be created */
 			wc = ff_uni2oem(wc, CODEPAGE);			/* Unicode ==> ANSI/OEM code */
 			if (wc & 0x80) wc = ExCvt[wc & 0x7F];	/* Convert extended character to upper (SBCS) */
@@ -1738,7 +1729,7 @@ static FRESULT create_name (	/* FR_OK: successful, FR_INVALID_NAME: could not cr
 			}
 			dp->fn[i++] = (BYTE)(wc >> 8);	/* Put 1st byte */
 		} else {						/* SBC */
-			if (wc == 0 || chk_chr("+,;=[]", wc)) {	/* Replace illegal characters for SFN if needed */
+			if (wc == 0 || strchr("+,;=[]", (int)wc)) {	/* Replace illegal characters for SFN */
 				wc = '_'; cf |= NS_LOSS | NS_LFN;/* Lossy conversion */
 			} else {
 				if (IsUpper(wc)) {		/* ASCII upper case? */
@@ -1786,8 +1777,8 @@ static FRESULT follow_path (	/* FR_OK(0): successful, !=0: error code */
 
 
 	{										/* With heading separator */
-		while (*path == '/' || *path == '\\') path++;	/* Strip heading separator */
-		dp->obj.sclust = 0;					/* Start from root directory */
+		while (IsSeparator(*path)) path++;	/* Strip separators */
+		dp->obj.sclust = 0;					/* Start from the root directory */
 	}
 
 	if ((UINT)*path < ' ') {				/* Null path name is the origin directory itself */
@@ -1812,9 +1803,9 @@ static FRESULT follow_path (	/* FR_OK(0): successful, !=0: error code */
 				}
 				break;
 			}
-			if (ns & NS_LAST) break;			/* Last segment matched. Function completed. */
+			if (ns & NS_LAST) break;		/* Last segment matched. Function completed. */
 			/* Get into the sub-directory */
-			if (!(dp->obj.attr & AM_DIR)) {		/* It is not a sub-directory and cannot follow */
+			if (!(dp->obj.attr & AM_DIR)) {	/* It is not a sub-directory and cannot follow */
 				res = FR_NO_PATH; break;
 			}
 			{
@@ -1837,13 +1828,17 @@ static int get_ldnumber (	/* Returns logical drive number (-1:invalid drive numb
 	const TCHAR** path		/* Pointer to pointer to the path name */
 )
 {
-	const TCHAR *tp = NULL, *tt = NULL;
+	const TCHAR *tp = NULL;
+	const TCHAR *tt = NULL;
 	TCHAR tc = 0;
-	int i = 0, vol = -1;
+	int i = 0;
+	int vol = -1;
 
 	tt = tp = *path;
 	if (!tp) return vol;	/* Invalid path name? */
-	do tc = *tt++; while ((UINT)tc >= (FF_USE_LFN ? ' ' : '!') && tc != ':');	/* Find a colon in the path */
+	do {					/* Find a colon in the path */
+		tc = *tt++;
+	} while (!IsTerminator(tc) && tc != ':');
 
 	if (tc == ':') {	/* DOS/Windows style volume ID? */
 		i = FF_VOLUMES;
@@ -1877,23 +1872,37 @@ static int get_ldnumber (	/* Returns logical drive number (-1:invalid drive numb
 
 /* Check what the sector is */
 
-static UINT check_fs (	/* 0:FAT VBR, 1:exFAT VBR, 2:Valid BS but not FAT, 3:Invalid BS, 4:Disk error */
+static UINT check_fs (	/* 0:FAT/FAT32 VBR, 1:exFAT VBR, 2:Not FAT and valid BS, 3:Not FAT and invalid BS, 4:Disk error */
 	FATFS* fs,			/* Filesystem object */
 	LBA_t sect			/* Sector to load and check if it is an FAT-VBR or not */
 )
 {
+	WORD w = 0, sign = 0;
+	BYTE b = 0;
+
+
 	fs->wflag = 0; fs->winsect = (LBA_t)0 - 1;		/* Invaidate window */
 	if (move_window(fs, sect) != FR_OK) return 4;	/* Load the boot sector */
-
-	if (ld_word(fs->win + BS_55AA) != 0xAA55) return 3;	/* Check boot signature (always here regardless of the sector size) */
-
-	if (FF_FS_EXFAT && !mem_cmp(fs->win + BS_JmpBoot, "\xEB\x76\x90" "EXFAT   ", 11)) return 1;	/* Check if exFAT VBR */
-
-	if (fs->win[BS_JmpBoot] == 0xE9 || fs->win[BS_JmpBoot] == 0xEB || fs->win[BS_JmpBoot] == 0xE8) {	/* Valid JumpBoot code? */
-		if (!mem_cmp(fs->win + BS_FilSysType, "FAT", 3)) return 0;		/* Is it an FAT VBR? */
-		if (!mem_cmp(fs->win + BS_FilSysType32, "FAT32", 5)) return 0;	/* Is it an FAT32 VBR? */
+	sign = ld_word(fs->win + BS_55AA);
+	b = fs->win[BS_JmpBoot];
+	if (b == 0xEB || b == 0xE9 || b == 0xE8) {	/* Valid JumpBoot code? (short jump, near jump or near call) */
+		if (sign == 0xAA55 && !memcmp(fs->win + BS_FilSysType32, "FAT32   ", 8)) {
+			return 0;	/* It is an FAT32 VBR */
+		}
+		/* FAT volumes formatted with early MS-DOS lack BS_55AA and BS_FilSysType, so FAT VBR needs to be identified without them. */
+		w = ld_word(fs->win + BPB_BytsPerSec);
+		b = fs->win[BPB_SecPerClus];
+		if ((w & (w - 1)) == 0 && w >= FF_MIN_SS && w <= FF_MAX_SS	/* Properness of sector size (512-4096 and 2^n) */
+			&& b != 0 && (b & (b - 1)) == 0				/* Properness of cluster size (2^n) */
+			&& ld_word(fs->win + BPB_RsvdSecCnt) != 0	/* Properness of reserved sectors (MNBZ) */
+			&& (UINT)fs->win[BPB_NumFATs] - 1 <= 1		/* Properness of FATs (1 or 2) */
+			&& ld_word(fs->win + BPB_RootEntCnt) != 0	/* Properness of root dir entries (MNBZ) */
+			&& (ld_word(fs->win + BPB_TotSec16) >= 128 || ld_dword(fs->win + BPB_TotSec32) >= 0x10000)	/* Properness of volume sectors (>=128) */
+			&& ld_word(fs->win + BPB_FATSz16) != 0) {	/* Properness of FAT size (MNBZ) */
+				return 0;	/* It can be presumed an FAT VBR */
+		}
 	}
-	return 2;	/* Valid BS but not FAT */
+	return sign == 0xAA55 ? 2 : 3;	/* Not an FAT VBR (valid or invalid BS) */
 }
 
 
@@ -1902,15 +1911,15 @@ static UINT check_fs (	/* 0:FAT VBR, 1:exFAT VBR, 2:Valid BS but not FAT, 3:Inva
 
 static UINT find_volume (	/* Returns BS status found in the hosting drive */
 	FATFS* fs,		/* Filesystem object */
-	UINT part		/* Partition to fined = 0:auto, 1..:forced */
+	UINT part		/* Partition to fined = 0:find as SFD and partitions, >0:forced partition number */
 )
 {
-	UINT fmt = 0, i = 0;
-	DWORD mbr_pt[4] = {0};
+	UINT fmt, i;
+	DWORD mbr_pt[4];
 
 
-	fmt = check_fs(fs, 0);				/* Load sector 0 and check if it is an FAT VBR as SFD */
-	if (fmt != 2 && (fmt >= 3 || part == 0)) return fmt;	/* Returns if it is a FAT VBR as auto scan, not a BS or disk error */
+	fmt = check_fs(fs, 0);				/* Load sector 0 and check if it is an FAT VBR as SFD format */
+	if (fmt != 2 && (fmt >= 3 || part == 0)) return fmt;	/* Returns if it is an FAT VBR as auto scan, not a BS or disk error */
 
 	/* Sector 0 is not an FAT VBR or forced partition number wants a partition */
 
@@ -1935,15 +1944,15 @@ static UINT find_volume (	/* Returns BS status found in the hosting drive */
 static FRESULT mount_volume (	/* FR_OK(0): successful, !=0: an error occurred */
 	const TCHAR** path,			/* Pointer to pointer to the path name (drive number) */
 	FATFS** rfs,				/* Pointer to pointer to the found filesystem object */
-	BYTE mode					/* !=0: Check write protection for write access */
+	BYTE mode					/* Desired access mode to check write protection */
 )
 {
 	int vol = 0;
+	FATFS *fs = NULL;
 	DSTATUS stat = 0;
 	LBA_t bsect = 0;
 	DWORD tsect = 0, sysect = 0, fasize = 0, nclst = 0, szbfat = 0;
 	WORD nrsv = 0;
-	FATFS *fs = NULL;
 	UINT fmt = 0;
 
 
@@ -1969,11 +1978,10 @@ static FRESULT mount_volume (	/* FR_OK(0): successful, !=0: an error occurred */
 	}
 
 	/* The filesystem object is not valid. */
-	/* Following code attempts to mount the volume. (find a FAT volume, analyze the BPB and initialize the filesystem object) */
+	/* Following code attempts to mount the volume. (find an FAT volume, analyze the BPB and initialize the filesystem object) */
 
-	fs->fs_type = 0;					/* Clear the filesystem object */
-	fs->pdrv = LD2PD(vol);				/* Volume hosting physical drive */
-	stat = disk_initialize(fs->pdrv);	/* Initialize the physical drive */
+	fs->fs_type = 0;					/* Invalidate the filesystem object */
+	stat = disk_initialize(fs->pdrv);	/* Initialize the volume hosting physical drive */
 	if (stat & STA_NOINIT) { 			/* Check if the initialization succeeded */
 		return FR_NOT_READY;			/* Failed to initialize due to no medium or hard error */
 	}
@@ -1985,11 +1993,11 @@ static FRESULT mount_volume (	/* FR_OK(0): successful, !=0: an error occurred */
 	if (SS(fs) > FF_MAX_SS || SS(fs) < FF_MIN_SS || (SS(fs) & (SS(fs) - 1))) return FR_DISK_ERR;
 #endif
 
-	/* Find an FAT volume on the drive */
+	/* Find an FAT volume on the hosting drive */
 	fmt = find_volume(fs, LD2PT(vol));
 	if (fmt == 4) return FR_DISK_ERR;		/* An error occurred in the disk I/O layer */
 	if (fmt >= 2) return FR_NO_FILESYSTEM;	/* No FAT volume is found */
-	bsect = fs->winsect;					/* Volume location */
+	bsect = fs->winsect;					/* Volume offset in the hosting physical drive */
 
 	/* An FAT volume is found (bsect). Following code initializes the filesystem object */
 
@@ -2069,7 +2077,7 @@ static FRESULT mount_volume (	/* FR_OK(0): successful, !=0: an error occurred */
 #endif	/* (FF_FS_NOFSINFO & 3) != 3 */
 	}
 
-	fs->fs_type = (BYTE)fmt;/* FAT sub-type */
+	fs->fs_type = (BYTE)fmt;/* FAT sub-type (the filesystem object gets valid) */
 	fs->id = ++Fsid;		/* Volume mount ID */
 	fs->lfnbuf = LfnBuf;	/* Static LFN working buffer */
 	return FR_OK;
@@ -2083,7 +2091,7 @@ static FRESULT mount_volume (	/* FR_OK(0): successful, !=0: an error occurred */
 /*-----------------------------------------------------------------------*/
 
 static FRESULT validate (	/* Returns FR_OK or FR_INVALID_OBJECT */
-	FFOBJID* obj,			/* Pointer to the FFOBJID, the 1st member in the FIL/DIR object, to check validity */
+	FFOBJID* obj,			/* Pointer to the FFOBJID, the 1st member in the FIL/DIR structure, to check validity */
 	FATFS** rfs				/* Pointer to pointer to the owner filesystem object to return */
 )
 {
@@ -2091,11 +2099,11 @@ static FRESULT validate (	/* Returns FR_OK or FR_INVALID_OBJECT */
 
 
 	if (obj && obj->fs && obj->fs->fs_type && obj->id == obj->fs->id) {	/* Test if the object is valid */
-		if (!(disk_status(obj->fs->pdrv) & STA_NOINIT)) { /* Test if the phsical drive is kept initialized */
+		if (!(disk_status(obj->fs->pdrv) & STA_NOINIT)) { /* Test if the hosting phsical drive is kept initialized */
 			res = FR_OK;
 		}
 	}
-	*rfs = (res == FR_OK) ? obj->fs : 0;	/* Corresponding filesystem object */
+	*rfs = (res == FR_OK) ? obj->fs : 0;	/* Return corresponding filesystem object if it is valid */
 	return res;
 }
 
@@ -2115,9 +2123,9 @@ static FRESULT validate (	/* Returns FR_OK or FR_INVALID_OBJECT */
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_mount (
-	FATFS* fs,			/* Pointer to the filesystem object (NULL:unmount)*/
+	FATFS* fs,			/* Pointer to the filesystem object to be registered (NULL:unmount)*/
 	const TCHAR* path,	/* Logical drive number to be mounted/unmounted */
-	BYTE opt			/* Mode option 0:Do not mount (delayed mount), 1:Mount immediately */
+	BYTE opt			/* Mount option: 0=Do not mount (delayed mount), 1=Mount immediately */
 )
 {
 	FATFS *cfs = NULL;
@@ -2126,21 +2134,23 @@ FRESULT f_mount (
 	const TCHAR *rp = path;
 
 
-	/* Get logical drive number */
+	/* Get volume ID (logical drive number) */
 	vol = get_ldnumber(&rp);
 	if (vol < 0) return FR_INVALID_DRIVE;
-	cfs = FatFs[vol];					/* Pointer to fs object */
+	cfs = FatFs[vol];			/* Pointer to the filesystem object of the volume */
 
-	if (cfs) {
-		cfs->fs_type = 0;				/* Clear old fs object */
+	if (cfs) {					/* Unregister current filesystem object if regsitered */
+		FatFs[vol] = 0;
+		cfs->fs_type = 0;		/* Invalidate the filesystem object to be unregistered */
 	}
 
-	if (fs) {
-		fs->fs_type = 0;				/* Clear new fs object */
+	if (fs) {					/* Register new filesystem object */
+		fs->pdrv = LD2PD(vol);	/* Volume hosting physical drive */
+		fs->fs_type = 0;		/* Invalidate the new filesystem object */
+		FatFs[vol] = fs;		/* Register new fs object */
 	}
-	FatFs[vol] = fs;					/* Register new fs object */
 
-	if (opt == 0) return FR_OK;			/* Do not mount now, it will be mounted later */
+	if (opt == 0) return FR_OK;	/* Do not mount now, it will be mounted in subsequent file functions */
 
 	res = mount_volume(&path, &fs, 0);	/* Force mounted the volume */
 	LEAVE_FF(fs, res);
@@ -2156,13 +2166,13 @@ FRESULT f_mount (
 FRESULT f_open (
 	FIL* fp,			/* Pointer to the blank file object */
 	const TCHAR* path,	/* Pointer to the file name */
-	BYTE mode			/* Access mode and file open mode flags */
+	BYTE mode			/* Access mode and open mode flags */
 )
 {
 	FRESULT res = 0;
 	DIR dj = {0};
 	FATFS *fs = NULL;
-	DWORD cl = 0, bcs = 0, clst = 0;
+	DWORD cl = 0, bcs = 0, clst = 0, tm = 0;
 	LBA_t sc = 0;
 	FSIZE_t ofs = 0;
 	DEF_NAMBUF
@@ -2200,8 +2210,10 @@ FRESULT f_open (
 			if (res == FR_OK && (mode & FA_CREATE_ALWAYS)) {	/* Truncate the file if overwrite mode */
 				{
 					/* Set directory entry initial state */
+					tm = GET_FATTIME();					/* Set created time */
+					st_dword(dj.dir + DIR_CrtTime, tm);
+					st_dword(dj.dir + DIR_ModTime, tm);
 					cl = ld_clust(fs, dj.dir);			/* Get current cluster chain */
-					st_dword(dj.dir + DIR_CrtTime, GET_FATTIME());	/* Set created time */
 					dj.dir[DIR_Attr] = AM_ARC;			/* Reset attribute */
 					st_clust(fs, dj.dir, 0);			/* Reset file allocation info */
 					st_dword(dj.dir + DIR_FileSize, 0);
@@ -2218,7 +2230,7 @@ FRESULT f_open (
 			}
 		}
 		else {	/* Open an existing file */
-			if (res == FR_OK) {					/* Is the object existing? */
+			if (res == FR_OK) {					/* Is the object exsiting? */
 				if (dj.obj.attr & AM_DIR) {		/* File open against a directory */
 					res = FR_NO_FILE;
 				} else {
@@ -2239,13 +2251,13 @@ FRESULT f_open (
 				fp->obj.sclust = ld_clust(fs, dj.dir);					/* Get object allocation info */
 				fp->obj.objsize = ld_dword(dj.dir + DIR_FileSize);
 			}
-			fp->obj.fs = fs;	 	/* Validate the file object */
+			fp->obj.fs = fs;	/* Validate the file object */
 			fp->obj.id = fs->id;
-			fp->flag = mode;		/* Set file access mode */
-			fp->err = 0;			/* Clear error flag */
-			fp->sect = 0;			/* Invalidate current data sector */
-			fp->fptr = 0;			/* Set file pointer top of the file */
-			mem_set(fp->buf, 0, sizeof fp->buf);	/* Clear sector buffer */
+			fp->flag = mode;	/* Set file access mode */
+			fp->err = 0;		/* Clear error flag */
+			fp->sect = 0;		/* Invalidate current data sector */
+			fp->fptr = 0;		/* Set file pointer top of the file */
+			memset(fp->buf, 0, sizeof fp->buf);	/* Clear sector buffer */
 			if ((mode & FA_SEEKEND) && fp->obj.objsize > 0) {	/* Seek to end of file if FA_OPEN_APPEND is specified */
 				fp->fptr = fp->obj.objsize;			/* Offset to seek */
 				bcs = (DWORD)fs->csize * SS(fs);	/* Cluster size in byte */
@@ -2284,10 +2296,10 @@ FRESULT f_open (
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_read (
-	FIL* fp, 	/* Pointer to the file object */
-	void* buff,	/* Pointer to data buffer */
+	FIL* fp, 	/* Open file to be read */
+	void* buff,	/* Data buffer to store the read data */
 	UINT btr,	/* Number of bytes to read */
-	UINT* br	/* Pointer to number of bytes read */
+	UINT* br	/* Number of bytes read */
 )
 {
 	FRESULT res = 0;
@@ -2306,8 +2318,7 @@ FRESULT f_read (
 	remain = fp->obj.objsize - fp->fptr;
 	if (btr > remain) btr = (UINT)remain;		/* Truncate btr by remaining bytes */
 
-	for ( ;  btr;								/* Repeat until btr bytes read */
-		btr -= rcnt, *br += rcnt, rbuff += rcnt, fp->fptr += rcnt) {
+	for ( ; btr > 0; btr -= rcnt, *br += rcnt, rbuff += rcnt, fp->fptr += rcnt) {	/* Repeat until btr bytes read */
 		if (fp->fptr % SS(fs) == 0) {			/* On the sector boundary? */
 			csect = (UINT)(fp->fptr / SS(fs) & (fs->csize - 1));	/* Sector offset in the cluster */
 			if (csect == 0) {					/* On the cluster boundary? */
@@ -2332,7 +2343,7 @@ FRESULT f_read (
 				}
 				if (disk_read(fs->pdrv, rbuff, sect, cc) != RES_OK) ABORT(fs, FR_DISK_ERR);
 				if ((fp->flag & FA_DIRTY) && fp->sect - sect < cc) {
-					mem_cpy(rbuff + ((fp->sect - sect) * SS(fs)), fp->buf, SS(fs));
+					memcpy(rbuff + ((fp->sect - sect) * SS(fs)), fp->buf, SS(fs));
 				}
 				rcnt = SS(fs) * cc;				/* Number of bytes transferred */
 				continue;
@@ -2348,7 +2359,7 @@ FRESULT f_read (
 		}
 		rcnt = SS(fs) - (UINT)fp->fptr % SS(fs);	/* Number of bytes remains in the sector */
 		if (rcnt > btr) rcnt = btr;					/* Clip it by btr if needed */
-		mem_cpy(rbuff, fp->buf + fp->fptr % SS(fs), rcnt);	/* Extract partial sector */
+		memcpy(rbuff, fp->buf + fp->fptr % SS(fs), rcnt);	/* Extract partial sector */
 	}
 
 	LEAVE_FF(fs, FR_OK);
@@ -2362,10 +2373,10 @@ FRESULT f_read (
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_write (
-	FIL* fp,			/* Pointer to the file object */
-	const void* buff,	/* Pointer to the data to be written */
+	FIL* fp,			/* Open file to be written */
+	const void* buff,	/* Data to be written */
 	UINT btw,			/* Number of bytes to write */
-	UINT* bw			/* Pointer to number of bytes written */
+	UINT* bw			/* Number of bytes written */
 )
 {
 	FRESULT res = 0;
@@ -2386,8 +2397,7 @@ FRESULT f_write (
 		btw = (UINT)(0xFFFFFFFF - (DWORD)fp->fptr);
 	}
 
-	for ( ;  btw;							/* Repeat until all data written */
-		btw -= wcnt, *bw += wcnt, wbuff += wcnt, fp->fptr += wcnt, fp->obj.objsize = (fp->fptr > fp->obj.objsize) ? fp->fptr : fp->obj.objsize) {
+	for ( ; btw > 0; btw -= wcnt, *bw += wcnt, wbuff += wcnt, fp->fptr += wcnt, fp->obj.objsize = (fp->fptr > fp->obj.objsize) ? fp->fptr : fp->obj.objsize) {	/* Repeat until all data written */
 		if (fp->fptr % SS(fs) == 0) {		/* On the sector boundary? */
 			csect = (UINT)(fp->fptr / SS(fs)) & (fs->csize - 1);	/* Sector offset in the cluster */
 			if (csect == 0) {				/* On the cluster boundary? */
@@ -2421,7 +2431,7 @@ FRESULT f_write (
 				}
 				if (disk_write(fs->pdrv, wbuff, sect, cc) != RES_OK) ABORT(fs, FR_DISK_ERR);
 				if (fp->sect - sect < cc) { /* Refill sector cache if it gets invalidated by the direct write */
-					mem_cpy(fp->buf, wbuff + ((fp->sect - sect) * SS(fs)), SS(fs));
+					memcpy(fp->buf, wbuff + ((fp->sect - sect) * SS(fs)), SS(fs));
 					fp->flag &= (BYTE)~FA_DIRTY;
 				}
 				wcnt = SS(fs) * cc;		/* Number of bytes transferred */
@@ -2436,7 +2446,7 @@ FRESULT f_write (
 		}
 		wcnt = SS(fs) - (UINT)fp->fptr % SS(fs);	/* Number of bytes remains in the sector */
 		if (wcnt > btw) wcnt = btw;					/* Clip it by btw if needed */
-		mem_cpy(fp->buf + fp->fptr % SS(fs), wbuff, wcnt);	/* Fit data to the sector */
+		memcpy(fp->buf + fp->fptr % SS(fs), wbuff, wcnt);	/* Fit data to the sector */
 		fp->flag |= FA_DIRTY;
 	}
 
@@ -2453,7 +2463,7 @@ FRESULT f_write (
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_sync (
-	FIL* fp		/* Pointer to the file object */
+	FIL* fp		/* Open file to be synced */
 )
 {
 	FRESULT res = 0;
@@ -2500,7 +2510,7 @@ FRESULT f_sync (
 /*-----------------------------------------------------------------------*/
 
 FRESULT f_close (
-	FIL* fp		/* Pointer to the file object to be closed */
+	FIL* fp		/* Open file to be closed */
 )
 {
 	FRESULT res = 0;
@@ -2701,7 +2711,7 @@ FRESULT f_readdir (
 	res = validate(&dp->obj, &fs);	/* Check validity of the directory object */
 	if (res == FR_OK) {
 		if (!fno) {
-			res = dir_sdi(dp, 0);			/* Rewind the directory object */
+			res = dir_sdi(dp, 0);		/* Rewind the directory object */
 		} else {
 			INIT_NAMBUF(fs);
 			res = DIR_READ_FILE(dp);		/* Read an item */
@@ -2788,8 +2798,12 @@ FRESULT f_getfree (
 				clst = 2; obj.fs = fs;
 				do {
 					stat = get_fat(&obj, clst);
-					if (stat == 0xFFFFFFFF) { res = FR_DISK_ERR; break; }
-					if (stat == 1) { res = FR_INT_ERR; break; }
+					if (stat == 0xFFFFFFFF) {
+						res = FR_DISK_ERR; break;
+					}
+					if (stat == 1) {
+						res = FR_INT_ERR; break;
+					}
 					if (stat == 0) nfree++;
 				} while (++clst < fs->n_fatent);
 			} else {
@@ -2798,7 +2812,7 @@ FRESULT f_getfree (
 					sect = fs->fatbase;		/* Top of the FAT */
 					i = 0;					/* Offset in the sector */
 					do {	/* Counts numbuer of entries with zero in the FAT */
-						if (i == 0) {
+						if (i == 0) {	/* New sector? */
 							res = move_window(fs, sect++);
 							if (res != FR_OK) break;
 						}
@@ -2813,9 +2827,11 @@ FRESULT f_getfree (
 					} while (--clst);
 				}
 			}
-			*nclst = nfree;			/* Return the free clusters */
-			fs->free_clst = nfree;	/* Now free_clst is valid */
-			fs->fsi_flag |= 1;		/* FAT32: FSInfo is to be updated */
+			if (res == FR_OK) {		/* Update parameters if succeeded */
+				*nclst = nfree;			/* Return the free clusters */
+				fs->free_clst = nfree;	/* Now free_clst is valid */
+				fs->fsi_flag |= 1;		/* FAT32: FSInfo is to be updated */
+			}
 		}
 	}
 
@@ -2882,9 +2898,9 @@ FRESULT f_unlink (
 )
 {
 	FRESULT res = 0;
+	FATFS *fs = NULL;
 	DIR dj = {0}, sdj = {0};
 	DWORD dclst = 0;
-	FATFS *fs = NULL;
 	DEF_NAMBUF
 
 
@@ -2911,7 +2927,7 @@ FRESULT f_unlink (
 				}
 				if (dj.obj.attr & AM_DIR) {			/* Is it a sub-directory? */
 					{
-						sdj.obj.fs = fs;				/* Open the sub-directory */
+						sdj.obj.fs = fs;			/* Open the sub-directory */
 						sdj.obj.sclust = dclst;
 						res = dir_sdi(&sdj, 0);
 						if (res == FR_OK) {
@@ -2948,10 +2964,10 @@ FRESULT f_mkdir (
 )
 {
 	FRESULT res = 0;
+	FATFS *fs = NULL;
 	DIR dj = {0};
 	FFOBJID sobj = {0};
-	FATFS *fs = NULL;
-	DWORD dcl = 0, pcl = 0, tm = 0;
+  DWORD dcl = 0, pcl = 0, tm = 0;
 	DEF_NAMBUF
 
 
@@ -2976,12 +2992,12 @@ FRESULT f_mkdir (
 				res = dir_clear(fs, dcl);		/* Clean up the new table */
 				if (res == FR_OK) {
 					if (!FF_FS_EXFAT || fs->fs_type != FS_EXFAT) {	/* Create dot entries (FAT only) */
-						mem_set(fs->win + DIR_Name, ' ', 11);	/* Create "." entry */
+						memset(fs->win + DIR_Name, ' ', 11);	/* Create "." entry */
 						fs->win[DIR_Name] = '.';
 						fs->win[DIR_Attr] = AM_DIR;
 						st_dword(fs->win + DIR_ModTime, tm);
 						st_clust(fs, fs->win, dcl);
-						mem_cpy(fs->win + SZDIRE, fs->win, SZDIRE); /* Create ".." entry */
+						memcpy(fs->win + SZDIRE, fs->win, SZDIRE);	/* Create ".." entry */
 						fs->win[SZDIRE + 1] = '.'; pcl = dj.obj.sclust;
 						st_clust(fs, fs->win + SZDIRE, pcl);
 						fs->wflag = 1;
@@ -3022,8 +3038,8 @@ FRESULT f_rename (
 )
 {
 	FRESULT res = 0;
-	DIR djo = {0}, djn = {0};
 	FATFS *fs = NULL;
+	DIR djo = {0}, djn = {0};
 	BYTE buf[(FF_FS_EXFAT) ? (SZDIRE * 2) : (SZDIRE)] = {0}, *dir = NULL;
 	LBA_t sect = 0;
 	DEF_NAMBUF
@@ -3034,12 +3050,12 @@ FRESULT f_rename (
 	if (res == FR_OK) {
 		djo.obj.fs = fs;
 		INIT_NAMBUF(fs);
-		res = follow_path(&djo, path_old);		/* Check old object */
+		res = follow_path(&djo, path_old);			/* Check old object */
 		if (res == FR_OK && (djo.fn[NSFLAG] & (NS_DOT | NS_NONAME))) res = FR_INVALID_NAME;	/* Check validity of name */
-		if (res == FR_OK) {						/* Object to be renamed is found */
+		if (res == FR_OK) {					/* Object to be renamed is found */
 			{	/* At FAT/FAT32 volume */
-				mem_cpy(buf, djo.dir, SZDIRE);			/* Save directory entry of the object */
-				mem_cpy(&djn, &djo, sizeof (DIR));		/* Duplicate the directory object */
+				memcpy(buf, djo.dir, SZDIRE);			/* Save directory entry of the object */
+				memcpy(&djn, &djo, sizeof (DIR));		/* Duplicate the directory object */
 				res = follow_path(&djn, path_new);		/* Make sure if new object name is not in use */
 				if (res == FR_OK) {						/* Is new name already in use by any other object? */
 					res = (djn.obj.sclust == djo.obj.sclust && djn.dptr == djo.dptr) ? FR_NO_FILE : FR_EXIST;
@@ -3048,7 +3064,7 @@ FRESULT f_rename (
 					res = dir_register(&djn);			/* Register the new entry */
 					if (res == FR_OK) {
 						dir = djn.dir;					/* Copy directory entry of the object except name */
-						mem_cpy(dir + 13, buf + 13, SZDIRE - 13);
+						memcpy(dir + 13, buf + 13, SZDIRE - 13);
 						dir[DIR_Attr] = buf[DIR_Attr];
 						if (!(dir[DIR_Attr] & AM_DIR)) dir[DIR_Attr] |= AM_ARC;	/* Set archive attribute if it is a file */
 						fs->wflag = 1;
@@ -3100,8 +3116,8 @@ FRESULT f_getlabel (
 )
 {
 	FRESULT res = 0;
-	DIR dj = {0};
 	FATFS *fs = NULL;
+	DIR dj = {0};
 	UINT si = 0, di = 0;
 	WCHAR wc = 0;
 
@@ -3120,10 +3136,11 @@ FRESULT f_getlabel (
 					while (si < 11) {
 						wc = dj.dir[si++];
 						if (dbc_1st((BYTE)wc) && si < 11) wc = wc << 8 | dj.dir[si++];	/* Is it a DBC? */
-						wc = ff_oem2uni(wc, CODEPAGE);					/* Convert it into Unicode */
-						if (wc != 0) wc = put_utf(wc, &label[di], 4);	/* Put it in Unicode */
-						if (wc == 0) { di = 0; break; }
-						di += wc;
+						wc = ff_oem2uni(wc, CODEPAGE);		/* Convert it into Unicode */
+						if (wc == 0) {		/* Invalid char in current code page? */
+							di = 0; break;
+						}
+						di += put_utf(wc, &label[di], 4);	/* Store it in Unicode */
 					}
 					do {				/* Truncate trailing spaces */
 						label[di] = 0;
@@ -3144,10 +3161,12 @@ FRESULT f_getlabel (
 		if (res == FR_OK) {
 			switch (fs->fs_type) {
 			case FS_EXFAT:
-				di = BPB_VolIDEx; break;
+				di = BPB_VolIDEx;
+				break;
 
 			case FS_FAT32:
-				di = BS_VolID32; break;
+				di = BS_VolID32;
+				break;
 
 			default:
 				di = BS_VolID;
@@ -3170,12 +3189,12 @@ FRESULT f_setlabel (
 )
 {
 	FRESULT res = 0;
-	DIR dj = {0};
 	FATFS *fs = NULL;
+	DIR dj = {0};
 	BYTE dirvn[22] = {0};
 	UINT di = 0;
 	WCHAR wc = 0;
-	static const char badchr[] = "+.,;=[]/\\\"*:<>\?|\x7F";	/* [0..] for FAT, [7..] for exFAT */
+	static const char badchr[18] = "+.,;=[]" "/*:<>|\\\"\?\x7F";	/* [0..16] for FAT, [7..16] for exFAT */
 	DWORD dc = 0;
 
 	/* Get logical drive */
@@ -3183,12 +3202,12 @@ FRESULT f_setlabel (
 	if (res != FR_OK) LEAVE_FF(fs, res);
 
 	{	/* On the FAT/FAT32 volume */
-		mem_set(dirvn, ' ', 11);
+		memset(dirvn, ' ', 11);
 		di = 0;
 		while ((UINT)*label >= ' ') {	/* Create volume label */
 			dc = tchar2uni(&label);
 			wc = (dc < 0x10000) ? ff_uni2oem(ff_wtoupper(dc), CODEPAGE) : 0;
-			if (wc == 0 || chk_chr(badchr + 0, (int)wc) || di >= (UINT)((wc >= 0x100) ? 10 : 11)) {	/* Reject invalid characters for volume label */
+			if (wc == 0 || strchr(&badchr[0], (int)wc) || di >= (UINT)((wc >= 0x100) ? 10 : 11)) {	/* Reject invalid characters for volume label */
 				LEAVE_FF(fs, FR_INVALID_NAME);
 			}
 			if (wc >= 0x100) dirvn[di++] = (BYTE)(wc >> 8);
@@ -3206,10 +3225,10 @@ FRESULT f_setlabel (
 		if (res == FR_OK) {
 			if (FF_FS_EXFAT && fs->fs_type == FS_EXFAT) {
 				dj.dir[XDIR_NumLabel] = (BYTE)di;	/* Change the volume label */
-				mem_cpy(dj.dir + XDIR_Label, dirvn, 22);
+				memcpy(dj.dir + XDIR_Label, dirvn, 22);
 			} else {
 				if (di != 0) {
-					mem_cpy(dj.dir, dirvn, 11);	/* Change the volume label */
+					memcpy(dj.dir, dirvn, 11);	/* Change the volume label */
 				} else {
 					dj.dir[DIR_Name] = DDEM;	/* Remove the volume label */
 				}
@@ -3222,14 +3241,14 @@ FRESULT f_setlabel (
 				if (di != 0) {	/* Create a volume label entry */
 					res = dir_alloc(&dj, 1);	/* Allocate an entry */
 					if (res == FR_OK) {
-						mem_set(dj.dir, 0, SZDIRE);	/* Clean the entry */
+						memset(dj.dir, 0, SZDIRE);	/* Clean the entry */
 						if (FF_FS_EXFAT && fs->fs_type == FS_EXFAT) {
 							dj.dir[XDIR_Type] = ET_VLABEL;	/* Create volume label entry */
 							dj.dir[XDIR_NumLabel] = (BYTE)di;
-							mem_cpy(dj.dir + XDIR_Label, dirvn, 22);
+							memcpy(dj.dir + XDIR_Label, dirvn, 22);
 						} else {
 							dj.dir[DIR_Attr] = AM_VOL;		/* Create volume label entry */
-							mem_cpy(dj.dir, dirvn, 11);
+							memcpy(dj.dir, dirvn, 11);
 						}
 						fs->wflag = 1;
 						res = sync_fs(fs);
@@ -3253,7 +3272,7 @@ FRESULT f_setlabel (
 
 #if !FF_FS_READONLY && FF_USE_MKFS
 /*-----------------------------------------------------------------------*/
-/* Create an FAT/exFAT volume                                            */
+/* Create FAT/exFAT volume (with sub-functions)                          */
 /*-----------------------------------------------------------------------*/
 
 #define N_SEC_TRACK 63			/* Sectors per track for determination of drive CHS */
@@ -3261,51 +3280,52 @@ FRESULT f_setlabel (
 #define GPT_ITEMS	128			/* Number of GPT table size (>=128, sector aligned) */
 
 
-/* Create partitions on the physical drive */
+/* Create partitions on the physical drive in format of MBR or GPT */
 
 static FRESULT create_partition (
 	BYTE drv,			/* Physical drive number */
 	const LBA_t plst[],	/* Partition list */
-	UINT sys,			/* System ID (for only MBR, temp setting) and bit8:GPT */
-	BYTE* buf			/* Working buffer for a sector */
+	BYTE sys,			/* System ID for each partition (for only MBR) */
+	BYTE *buf			/* Working buffer for a sector */
 )
 {
 	UINT i = 0, cy = 0;
 	LBA_t sz_drv = 0;
-	DWORD sz_drv32 = 0, s_lba32 = 0, n_lba32 = 0;
-	BYTE *pte = NULL, hd = 0, n_hd = 0, sc = 0, n_sc = 0;
+	DWORD sz_drv32 = 0, nxt_alloc32 = 0, sz_part32 = 0;
+	BYTE *pte = NULL;
+	BYTE hd = 0, n_hd = 0, sc = 0, n_sc = 0;
 
-	/* Get drive size */
+	/* Get physical drive size */
 	if (disk_ioctl(drv, GET_SECTOR_COUNT, &sz_drv) != RES_OK) return FR_DISK_ERR;
 
-	{					/* Create partitions in MBR */
+	{	/* Create partitions in MBR format */
 		sz_drv32 = (DWORD)sz_drv;
-		n_sc = N_SEC_TRACK;		/* Determine drive CHS without any consideration of the drive geometry */
+		n_sc = N_SEC_TRACK;				/* Determine drive CHS without any consideration of the drive geometry */
 		for (n_hd = 8; n_hd != 0 && sz_drv32 / n_hd / n_sc > 1024; n_hd *= 2) ;
-		if (n_hd == 0) n_hd = 255;	/* Number of heads needs to be <256 */
+		if (n_hd == 0) n_hd = 255;		/* Number of heads needs to be <256 */
 
-		mem_set(buf, 0, FF_MAX_SS);	/* Clear MBR */
+		memset(buf, 0, FF_MAX_SS);		/* Clear MBR */
 		pte = buf + MBR_Table;	/* Partition table in the MBR */
-		for (i = 0, s_lba32 = n_sc; i < 4 && s_lba32 != 0 && s_lba32 < sz_drv32; i++, s_lba32 += n_lba32) {
-			n_lba32 = (DWORD)plst[i];	/* Get partition size */
-			if (n_lba32 <= 100) n_lba32 = (n_lba32 == 100) ? sz_drv32 : sz_drv32 / 100 * n_lba32;	/* Size in percentage? */
-			if (s_lba32 + n_lba32 > sz_drv32 || s_lba32 + n_lba32 < s_lba32) n_lba32 = sz_drv32 - s_lba32;	/* Clip at drive size */
-			if (n_lba32 == 0) break;	/* End of table or no sector to allocate? */
+		for (i = 0, nxt_alloc32 = n_sc; i < 4 && nxt_alloc32 != 0 && nxt_alloc32 < sz_drv32; i++, nxt_alloc32 += sz_part32) {
+			sz_part32 = (DWORD)plst[i];	/* Get partition size */
+			if (sz_part32 <= 100) sz_part32 = (sz_part32 == 100) ? sz_drv32 : sz_drv32 / 100 * sz_part32;	/* Size in percentage? */
+			if (nxt_alloc32 + sz_part32 > sz_drv32 || nxt_alloc32 + sz_part32 < nxt_alloc32) sz_part32 = sz_drv32 - nxt_alloc32;	/* Clip at drive size */
+			if (sz_part32 == 0) break;	/* End of table or no sector to allocate? */
 
-			st_dword(pte + PTE_StLba, s_lba32);		/* Start LBA */
-			st_dword(pte + PTE_SizLba, n_lba32);	/* Number of sectors */
-			pte[PTE_System] = (BYTE)sys;			/* System type */
+			st_dword(pte + PTE_StLba, nxt_alloc32);	/* Start LBA */
+			st_dword(pte + PTE_SizLba, sz_part32);	/* Number of sectors */
+			pte[PTE_System] = sys;					/* System type */
 
-			cy = (UINT)(s_lba32 / n_sc / n_hd);		/* Start cylinder */
-			hd = (BYTE)(s_lba32 / n_sc % n_hd);		/* Start head */
-			sc = (BYTE)(s_lba32 % n_sc + 1);		/* Start sector */
+			cy = (UINT)(nxt_alloc32 / n_sc / n_hd);	/* Start cylinder */
+			hd = (BYTE)(nxt_alloc32 / n_sc % n_hd);	/* Start head */
+			sc = (BYTE)(nxt_alloc32 % n_sc + 1);	/* Start sector */
 			pte[PTE_StHead] = hd;
 			pte[PTE_StSec] = (BYTE)((cy >> 2 & 0xC0) | sc);
 			pte[PTE_StCyl] = (BYTE)cy;
 
-			cy = (UINT)((s_lba32 + n_lba32 - 1) / n_sc / n_hd);	/* End cylinder */
-			hd = (BYTE)((s_lba32 + n_lba32 - 1) / n_sc % n_hd);	/* End head */
-			sc = (BYTE)((s_lba32 + n_lba32 - 1) % n_sc + 1);	/* End sector */
+			cy = (UINT)((nxt_alloc32 + sz_part32 - 1) / n_sc / n_hd);	/* End cylinder */
+			hd = (BYTE)((nxt_alloc32 + sz_part32 - 1) / n_sc % n_hd);	/* End head */
+			sc = (BYTE)((nxt_alloc32 + sz_part32 - 1) % n_sc + 1);		/* End sector */
 			pte[PTE_EdHead] = hd;
 			pte[PTE_EdSec] = (BYTE)((cy >> 2 & 0xC0) | sc);
 			pte[PTE_EdCyl] = (BYTE)cy;
@@ -3325,40 +3345,44 @@ static FRESULT create_partition (
 FRESULT f_mkfs (
 	const TCHAR* path,		/* Logical drive number */
 	const MKFS_PARM* opt,	/* Format options */
-	void* work,				/* Pointer to working buffer (null: use heap memory) */
+	void* work,				/* Pointer to working buffer (null: use len bytes of heap memory) */
 	UINT len				/* Size of working buffer [byte] */
 )
 {
 	static const WORD cst[] = {1, 4, 16, 64, 256, 512, 0};	/* Cluster size boundary for FAT volume (4Ks unit) */
 	static const WORD cst32[] = {1, 2, 4, 8, 16, 32, 0};	/* Cluster size boundary for FAT32 volume (128Ks unit) */
 	static const MKFS_PARM defopt = {FM_ANY, 0, 0, 0, 0};	/* Default parameter */
-	BYTE fsopt = 0, fsty = 0, sys = 0, *buf = NULL, *pte = NULL, pdrv = 0, ipart = 0;
-	WORD ss;	/* Sector size */
-	DWORD sz_buf = 0, sz_blk = 0, n_clst = 0, pau = 0, nsect = 0, n = 0;
+	BYTE fsopt = 0, fsty = 0, sys = 0, pdrv = 0, ipart = 0;
+	BYTE *buf = NULL;
+	BYTE *pte = NULL;
+	WORD ss = 0;	/* Sector size */
+	DWORD sz_buf = 0, sz_blk = 0, n_clst = 0, pau = 0, nsect = 0, n = 0, vsn = 0;
 	LBA_t sz_vol, b_vol, b_fat, b_data;		/* Size of volume, Base LBA of volume, fat, data */
 	LBA_t sect = 0, lba[2] = {0};
 	DWORD sz_rsv, sz_fat, sz_dir, sz_au;	/* Size of reserved, fat, dir, data, cluster */
 	UINT n_fat, n_root, i;					/* Index, Number of FATs and Number of roor dir entries */
 	int vol = 0;
 	DSTATUS ds = 0;
-	FRESULT fr = 0;
+	FRESULT res = 0;
 
 
 	/* Check mounted drive and clear work area */
 	vol = get_ldnumber(&path);					/* Get target logical drive */
 	if (vol < 0) return FR_INVALID_DRIVE;
 	if (FatFs[vol]) FatFs[vol]->fs_type = 0;	/* Clear the fs object if mounted */
-	pdrv = LD2PD(vol);			/* Physical drive */
-	ipart = LD2PT(vol);			/* Partition (0:create as new, 1..:get from partition table) */
-	if (!opt) opt = &defopt;	/* Use default parameter if it is not given */
+	pdrv = LD2PD(vol);		/* Hosting physical drive */
+	ipart = LD2PT(vol);		/* Hosting partition (0:create as new, 1..:existing partition) */
 
-	/* Get physical drive status (sz_drv, sz_blk, ss) */
+	/* Initialize the hosting physical drive */
 	ds = disk_initialize(pdrv);
 	if (ds & STA_NOINIT) return FR_NOT_READY;
 	if (ds & STA_PROTECT) return FR_WRITE_PROTECTED;
+
+	/* Get physical drive parameters (sz_drv, sz_blk and ss) */
+	if (!opt) opt = &defopt;	/* Use default parameter if it is not given */
 	sz_blk = opt->align;
-	if (sz_blk == 0 && disk_ioctl(pdrv, GET_BLOCK_SIZE, &sz_blk) != RES_OK) sz_blk = 1;
- 	if (sz_blk == 0 || sz_blk > 0x8000 || (sz_blk & (sz_blk - 1))) sz_blk = 1;
+	if (sz_blk == 0) disk_ioctl(pdrv, GET_BLOCK_SIZE, &sz_blk);					/* Block size from the paramter or lower layer */
+	if (sz_blk == 0 || sz_blk > 0x8000 || (sz_blk & (sz_blk - 1))) sz_blk = 1;	/* Use default if the block size is invalid */
 #if FF_MAX_SS != FF_MIN_SS
 	if (disk_ioctl(pdrv, GET_SECTOR_SIZE, &ss) != RES_OK) return FR_DISK_ERR;
 	if (ss > FF_MAX_SS || ss < FF_MIN_SS || (ss & (ss - 1))) return FR_DISK_ERR;
@@ -3403,7 +3427,7 @@ FRESULT f_mkfs (
 	}
 	if (sz_vol < 128) LEAVE_MKFS(FR_MKFS_ABORTED);	/* Check if volume size is >=128s */
 
-	/* Now start to create a FAT volume at b_vol and sz_vol */
+	/* Now start to create an FAT volume at b_vol and sz_vol */
 
 	do {	/* Pre-determine the FAT type */
 		if (FF_FS_EXFAT && (fsopt & FM_EXFAT)) {	/* exFAT possible? */
@@ -3421,6 +3445,7 @@ FRESULT f_mkfs (
 		fsty = FS_FAT16;
 	} while (0);
 
+	vsn = (DWORD)sz_vol + GET_FATTIME();	/* VSN generated from current time and partitiion size */
 	{	/* Create an FAT/FAT32 volume */
 		do {
 			pau = sz_au;
@@ -3477,7 +3502,7 @@ FRESULT f_mkfs (
 			if (fsty == FS_FAT16) {
 				if (n_clst > MAX_FAT16) {	/* Too many clusters for FAT16 */
 					if (sz_au == 0 && (pau * 2) <= 64) {
-						sz_au = pau * 2; continue;		/* Adjust cluster size and retry */
+						sz_au = pau * 2; continue;	/* Adjust cluster size and retry */
 					}
 					if ((fsopt & FM_FAT32)) {
 						fsty = FS_FAT32; continue;	/* Switch type to FAT32 and retry */
@@ -3497,8 +3522,8 @@ FRESULT f_mkfs (
 		} while (1);
 
 		/* Create FAT VBR */
-		mem_set(buf, 0, ss);
-		mem_cpy(buf + BS_JmpBoot, "\xEB\xFE\x90" "MSDOS5.0", 11);/* Boot jump code (x86), OEM name */
+		memset(buf, 0, ss);
+		memcpy(buf + BS_JmpBoot, "\xEB\xFE\x90" "MSDOS5.0", 11);	/* Boot jump code (x86), OEM name */
 		st_word(buf + BPB_BytsPerSec, ss);				/* Sector size [byte] */
 		buf[BPB_SecPerClus] = (BYTE)pau;				/* Cluster size [sector] */
 		st_word(buf + BPB_RsvdSecCnt, (WORD)sz_rsv);	/* Size of reserved area */
@@ -3514,20 +3539,20 @@ FRESULT f_mkfs (
 		st_word(buf + BPB_NumHeads, 255);				/* Number of heads (for int13) */
 		st_dword(buf + BPB_HiddSec, (DWORD)b_vol);		/* Volume offset in the physical drive [sector] */
 		if (fsty == FS_FAT32) {
-			st_dword(buf + BS_VolID32, GET_FATTIME());	/* VSN */
+			st_dword(buf + BS_VolID32, vsn);			/* VSN */
 			st_dword(buf + BPB_FATSz32, sz_fat);		/* FAT size [sector] */
 			st_dword(buf + BPB_RootClus32, 2);			/* Root directory cluster # (2) */
 			st_word(buf + BPB_FSInfo32, 1);				/* Offset of FSINFO sector (VBR + 1) */
 			st_word(buf + BPB_BkBootSec32, 6);			/* Offset of backup VBR (VBR + 6) */
 			buf[BS_DrvNum32] = 0x80;					/* Drive number (for int13) */
 			buf[BS_BootSig32] = 0x29;					/* Extended boot signature */
-			mem_cpy(buf + BS_VolLab32, "NO NAME    " "FAT32   ", 19);	/* Volume label, FAT signature */
+			memcpy(buf + BS_VolLab32, "NO NAME    " "FAT32   ", 19);	/* Volume label, FAT signature */
 		} else {
-			st_dword(buf + BS_VolID, GET_FATTIME());	/* VSN */
+			st_dword(buf + BS_VolID, vsn);				/* VSN */
 			st_word(buf + BPB_FATSz16, (WORD)sz_fat);	/* FAT size [sector] */
 			buf[BS_DrvNum] = 0x80;						/* Drive number (for int13) */
 			buf[BS_BootSig] = 0x29;						/* Extended boot signature */
-			mem_cpy(buf + BS_VolLab, "NO NAME    " "FAT     ", 19);	/* Volume label, FAT signature */
+			memcpy(buf + BS_VolLab, "NO NAME    " "FAT     ", 19);	/* Volume label, FAT signature */
 		}
 		st_word(buf + BS_55AA, 0xAA55);					/* Signature (offset is fixed here regardless of sector size) */
 		if (disk_write(pdrv, buf, b_vol, 1) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);	/* Write it to the VBR sector */
@@ -3535,7 +3560,7 @@ FRESULT f_mkfs (
 		/* Create FSINFO record if needed */
 		if (fsty == FS_FAT32) {
 			disk_write(pdrv, buf, b_vol + 6, 1);		/* Write backup VBR (VBR + 6) */
-			mem_set(buf, 0, ss);
+			memset(buf, 0, ss);
 			st_dword(buf + FSI_LeadSig, 0x41615252);
 			st_dword(buf + FSI_StrucSig, 0x61417272);
 			st_dword(buf + FSI_Free_Count, n_clst - 1);	/* Number of free clusters */
@@ -3546,7 +3571,7 @@ FRESULT f_mkfs (
 		}
 
 		/* Initialize FAT area */
-		mem_set(buf, 0, sz_buf * ss);
+		memset(buf, 0, sz_buf * ss);
 		sect = b_fat;		/* FAT start sector */
 		for (i = 0; i < n_fat; i++) {			/* Initialize FATs each */
 			if (fsty == FS_FAT32) {
@@ -3560,7 +3585,7 @@ FRESULT f_mkfs (
 			do {	/* Fill FAT sectors */
 				n = (nsect > sz_buf) ? sz_buf : nsect;
 				if (disk_write(pdrv, buf, sect, (UINT)n) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);
-				mem_set(buf, 0, ss);	/* Rest of FAT all are cleared */
+				memset(buf, 0, ss);	/* Rest of FAT all are cleared */
 				sect += n; nsect -= n;
 			} while (nsect);
 		}
@@ -3578,32 +3603,30 @@ FRESULT f_mkfs (
 
 	/* Determine system ID in the MBR partition table */
 	if (FF_FS_EXFAT && fsty == FS_EXFAT) {
-		sys = 0x07;			/* exFAT */
+		sys = 0x07;		/* exFAT */
+	} else if (fsty == FS_FAT32) {
+		sys = 0x0C;		/* FAT32X */
+	} else if (sz_vol >= 0x10000) {
+		sys = 0x06;		/* FAT12/16 (large) */
+	} else if (fsty == FS_FAT16) {
+		sys = 0x04;		/* FAT16 */
 	} else {
-		if (fsty == FS_FAT32) {
-			sys = 0x0C;		/* FAT32X */
-		} else {
-			if (sz_vol >= 0x10000) {
-				sys = 0x06;	/* FAT12/16 (large) */
-			} else {
-				sys = (fsty == FS_FAT16) ? 0x04 : 0x01;	/* FAT16 : FAT12 */
-			}
-		}
+		sys = 0x01;		/* FAT12 */
 	}
 
 	/* Update partition information */
 	if (FF_MULTI_PARTITION && ipart != 0) {	/* Volume is in the existing partition */
-		if (!FF_LBA64 || !(fsopt & 0x80)) {
+		if (!FF_LBA64 || !(fsopt & 0x80)) {	/* Is the partition in MBR? */
 			/* Update system ID in the partition table */
 			if (disk_read(pdrv, buf, 0, 1) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);	/* Read the MBR */
 			buf[MBR_Table + (ipart - 1) * SZ_PTE + PTE_System] = sys;			/* Set system ID */
 			if (disk_write(pdrv, buf, 0, 1) != RES_OK) LEAVE_MKFS(FR_DISK_ERR);	/* Write it back to the MBR */
 		}
 	} else {								/* Volume as a new single partition */
-		if (!(fsopt & FM_SFD)) {	/* Create partition table if not in SFD */
-			lba[0] = sz_vol, lba[1] = 0;
-			fr = create_partition(pdrv, lba, sys, buf);
-			if (fr != FR_OK) LEAVE_MKFS(fr);
+		if (!(fsopt & FM_SFD)) {			/* Create partition table if not in SFD format */
+			lba[0] = sz_vol; lba[1] = 0;
+			res = create_partition(pdrv, lba, sys, buf);
+			if (res != FR_OK) LEAVE_MKFS(res);
 		}
 	}
 
diff --git a/core/embed/extmod/modtrezorio/ff.h b/core/embed/extmod/modtrezorio/ff.h
index 434282c150..88fb318750 100644
--- a/core/embed/extmod/modtrezorio/ff.h
+++ b/core/embed/extmod/modtrezorio/ff.h
@@ -1,10 +1,10 @@
 // clang-format off
 
 /*----------------------------------------------------------------------------/
-/  FatFs - Generic FAT Filesystem module  R0.14                               /
+/  FatFs - Generic FAT Filesystem module  R0.15                               /
 /-----------------------------------------------------------------------------/
 /
-/ Copyright (C) 2019, ChaN, all right reserved.
+/ Copyright (C) 2022, ChaN, all right reserved.
 /
 / FatFs module is an open source software. Redistribution and use of FatFs in
 / source and binary forms, with or without modification, are permitted provided
@@ -22,7 +22,7 @@
 
 
 #ifndef FF_DEFINED
-#define FF_DEFINED	86606	/* Revision ID */
+#define FF_DEFINED	80286	/* Revision ID */
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,10 +37,14 @@ extern "C" {
 
 /* Integer types used for FatFs API */
 
-#if defined(_WIN32)	/* Main development platform */
+#if defined(_WIN32)		/* Windows VC++ (for development only) */
 #define FF_INTDEF 2
 #include <windows.h>
 typedef unsigned __int64 QWORD;
+#include <float.h>
+#define isnan(v) _isnan(v)
+#define isinf(v) (!_finite(v))
+
 #elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus)	/* C99 or later */
 #define FF_INTDEF 2
 #include <stdint.h>
@@ -50,6 +54,7 @@ typedef uint16_t		WORD;	/* 16-bit unsigned integer */
 typedef uint32_t		DWORD;	/* 32-bit unsigned integer */
 typedef uint64_t		QWORD;	/* 64-bit unsigned integer */
 typedef WORD			WCHAR;	/* UTF-16 character type */
+
 #else  	/* Earlier than C99 */
 #define FF_INTDEF 1
 typedef unsigned int	UINT;	/* int must be 16-bit or 32-bit */
@@ -60,53 +65,6 @@ typedef WORD			WCHAR;	/* UTF-16 character type */
 #endif
 
 
-/* Definitions of volume management */
-
-#if FF_MULTI_PARTITION		/* Multiple partition configuration */
-typedef struct {
-	BYTE pd;	/* Physical drive number */
-	BYTE pt;	/* Partition: 0:Auto detect, 1-4:Forced partition) */
-} PARTITION;
-extern PARTITION VolToPart[];	/* Volume - Partition mapping table */
-#endif
-
-#if FF_STR_VOLUME_ID
-#ifndef FF_VOLUME_STRS
-extern const char* VolumeStr[FF_VOLUMES];	/* User defied volume ID */
-#endif
-#endif
-
-
-
-/* Type of path name strings on FatFs API */
-
-#ifndef _INC_TCHAR
-#define _INC_TCHAR
-
-#if FF_USE_LFN && FF_LFN_UNICODE == 1 	/* Unicode in UTF-16 encoding */
-typedef WCHAR TCHAR;
-#define _T(x) L ## x
-#define _TEXT(x) L ## x
-#elif FF_USE_LFN && FF_LFN_UNICODE == 2	/* Unicode in UTF-8 encoding */
-typedef char TCHAR;
-#define _T(x) u8 ## x
-#define _TEXT(x) u8 ## x
-#elif FF_USE_LFN && FF_LFN_UNICODE == 3	/* Unicode in UTF-32 encoding */
-typedef DWORD TCHAR;
-#define _T(x) U ## x
-#define _TEXT(x) U ## x
-#elif FF_USE_LFN && (FF_LFN_UNICODE < 0 || FF_LFN_UNICODE > 3)
-#error Wrong FF_LFN_UNICODE setting
-#else									/* ANSI/OEM code in SBCS/DBCS */
-typedef char TCHAR;
-#define _T(x) x
-#define _TEXT(x) x
-#endif
-
-#endif
-
-
-
 /* Type of file size and LBA variables */
 
 #if FF_FS_EXFAT
@@ -129,14 +87,57 @@ typedef DWORD LBA_t;
 
 
 
+/* Type of path name strings on FatFs API (TCHAR) */
+
+#if FF_USE_LFN && FF_LFN_UNICODE == 1 	/* Unicode in UTF-16 encoding */
+typedef WCHAR TCHAR;
+#define _T(x) L ## x
+#define _TEXT(x) L ## x
+#elif FF_USE_LFN && FF_LFN_UNICODE == 2	/* Unicode in UTF-8 encoding */
+typedef char TCHAR;
+#define _T(x) u8 ## x
+#define _TEXT(x) u8 ## x
+#elif FF_USE_LFN && FF_LFN_UNICODE == 3	/* Unicode in UTF-32 encoding */
+typedef DWORD TCHAR;
+#define _T(x) U ## x
+#define _TEXT(x) U ## x
+#elif FF_USE_LFN && (FF_LFN_UNICODE < 0 || FF_LFN_UNICODE > 3)
+#error Wrong FF_LFN_UNICODE setting
+#else									/* ANSI/OEM code in SBCS/DBCS */
+typedef char TCHAR;
+#define _T(x) x
+#define _TEXT(x) x
+#endif
+
+
+
+/* Definitions of volume management */
+
+#if FF_MULTI_PARTITION		/* Multiple partition configuration */
+typedef struct {
+	BYTE pd;	/* Physical drive number */
+	BYTE pt;	/* Partition: 0:Auto detect, 1-4:Forced partition) */
+} PARTITION;
+extern PARTITION VolToPart[];	/* Volume - Partition mapping table */
+#endif
+
+#if FF_STR_VOLUME_ID
+#ifndef FF_VOLUME_STRS
+extern const char* VolumeStr[FF_VOLUMES];	/* User defied volume ID */
+#endif
+#endif
+
+
+
 /* Filesystem object structure (FATFS) */
 
 typedef struct {
 	BYTE	fs_type;		/* Filesystem type (0:not mounted) */
-	BYTE	pdrv;			/* Associated physical drive */
+	BYTE	pdrv;			/* Volume hosting physical drive */
+	BYTE	ldrv;			/* Logical drive number (used only when FF_FS_REENTRANT) */
 	BYTE	n_fats;			/* Number of FATs (1 or 2) */
-	BYTE	wflag;			/* win[] flag (b0:dirty) */
-	BYTE	fsi_flag;		/* FSINFO flags (b7:disabled, b0:dirty) */
+	BYTE	wflag;			/* win[] status (b0:dirty) */
+	BYTE	fsi_flag;		/* FSINFO status (b7:disabled, b0:dirty) */
 	WORD	id;				/* Volume mount ID */
 	WORD	n_rootdir;		/* Number of root directory entries (FAT12/16) */
 	WORD	csize;			/* Cluster size [sectors] */
@@ -149,9 +150,6 @@ typedef struct {
 #if FF_FS_EXFAT
 	BYTE*	dirbuf;			/* Directory entry block scratchpad buffer for exFAT */
 #endif
-#if FF_FS_REENTRANT
-	FF_SYNC_t	sobj;		/* Identifier of sync object */
-#endif
 #if !FF_FS_READONLY
 	DWORD	last_clst;		/* Last allocated cluster */
 	DWORD	free_clst;		/* Number of free clusters */
@@ -165,10 +163,10 @@ typedef struct {
 #endif
 #endif
 	DWORD	n_fatent;		/* Number of FAT entries (number of clusters + 2) */
-	DWORD	fsize;			/* Size of an FAT [sectors] */
+	DWORD	fsize;			/* Number of sectors per FAT */
 	LBA_t	volbase;		/* Volume base sector */
 	LBA_t	fatbase;		/* FAT base sector */
-	LBA_t	dirbase;		/* Root directory base sector/cluster */
+	LBA_t	dirbase;		/* Root directory base sector (FAT12/16) or cluster (FAT32/exFAT) */
 	LBA_t	database;		/* Data base sector */
 #if FF_FS_EXFAT
 	LBA_t	bitbase;		/* Allocation bitmap base sector */
@@ -183,7 +181,7 @@ typedef struct {
 
 typedef struct {
 	FATFS*	fs;				/* Pointer to the hosting volume of this object */
-	WORD	id;				/* Hosting volume mount ID */
+	WORD	id;				/* Hosting volume's mount ID */
 	BYTE	attr;			/* Object attribute */
 	BYTE	stat;			/* Object chain status (b1-0: =0:not contiguous, =2:contiguous, =3:fragmented in this session, b2:sub-directory stretched) */
 	DWORD	sclust;			/* Object data start cluster (0:no cluster or root directory) */
@@ -300,8 +298,10 @@ typedef enum {
 
 
 
+
+/*--------------------------------------------------------------*/
+/* FatFs Module Application Interface                           */
 /*--------------------------------------------------------------*/
-/* FatFs module application interface                           */
 
 FRESULT f_open (FIL* fp, const TCHAR* path, BYTE mode);				/* Open or create a file */
 FRESULT f_close (FIL* fp);											/* Close an open file object */
@@ -338,6 +338,8 @@ int f_puts (const TCHAR* str, FIL* cp);								/* Put a string to the file */
 int f_printf (FIL* fp, const TCHAR* str, ...);						/* Put a formatted string to the file */
 TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the file */
 
+/* Some API fucntions are implemented as macro */
+
 #define f_eof(fp) ((int)((fp)->fptr == (fp)->obj.objsize))
 #define f_error(fp) ((fp)->err)
 #define f_tell(fp) ((fp)->fptr)
@@ -347,46 +349,47 @@ TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the fil
 #define f_rmdir(path) f_unlink(path)
 #define f_unmount(path) f_mount(0, path, 0)
 
-#ifndef EOF
-#define EOF (-1)
-#endif
-
 
 
 
 /*--------------------------------------------------------------*/
-/* Additional user defined functions                            */
+/* Additional Functions                                         */
+/*--------------------------------------------------------------*/
 
-/* RTC function */
+/* RTC function (provided by user) */
 #if !FF_FS_READONLY && !FF_FS_NORTC
-DWORD get_fattime (void);
+DWORD get_fattime (void);	/* Get current time */
 #endif
 
-/* LFN support functions */
-#if FF_USE_LFN >= 1						/* Code conversion (defined in unicode.c) */
+
+/* LFN support functions (defined in ffunicode.c) */
+
+#if FF_USE_LFN >= 1
 WCHAR ff_oem2uni (WCHAR oem, WORD cp);	/* OEM code to Unicode conversion */
 WCHAR ff_uni2oem (DWORD uni, WORD cp);	/* Unicode to OEM code conversion */
 DWORD ff_wtoupper (DWORD uni);			/* Unicode upper-case conversion */
 #endif
-#if FF_USE_LFN == 3						/* Dynamic memory allocation */
-void* ff_memalloc (UINT msize);			/* Allocate memory block */
-void ff_memfree (void* mblock);			/* Free memory block */
-#endif
 
-/* Sync functions */
-#if FF_FS_REENTRANT
-int ff_cre_syncobj (BYTE vol, FF_SYNC_t* sobj);	/* Create a sync object */
-int ff_req_grant (FF_SYNC_t sobj);		/* Lock sync object */
-void ff_rel_grant (FF_SYNC_t sobj);		/* Unlock sync object */
-int ff_del_syncobj (FF_SYNC_t sobj);	/* Delete a sync object */
+
+/* O/S dependent functions (samples available in ffsystem.c) */
+
+#if FF_USE_LFN == 3		/* Dynamic memory allocation */
+void* ff_memalloc (UINT msize);		/* Allocate memory block */
+void ff_memfree (void* mblock);		/* Free memory block */
+#endif
+#if FF_FS_REENTRANT	/* Sync functions */
+int ff_mutex_create (int vol);		/* Create a sync object */
+void ff_mutex_delete (int vol);		/* Delete a sync object */
+int ff_mutex_take (int vol);		/* Lock sync object */
+void ff_mutex_give (int vol);		/* Unlock sync object */
 #endif
 
 
 
 
 /*--------------------------------------------------------------*/
-/* Flags and offset address                                     */
-
+/* Flags and Offset Address                                     */
+/*--------------------------------------------------------------*/
 
 /* File access mode and open method flags (3rd argument of f_open) */
 #define	FA_READ				0x01
diff --git a/core/embed/extmod/modtrezorio/ffconf.h b/core/embed/extmod/modtrezorio/ffconf.h
index 8e127d2c9e..63bd625a1f 100644
--- a/core/embed/extmod/modtrezorio/ffconf.h
+++ b/core/embed/extmod/modtrezorio/ffconf.h
@@ -1,10 +1,10 @@
 // clang-format off
 
 /*---------------------------------------------------------------------------/
-/  FatFs Functional Configurations
+/  Configurations of FatFs Module
 /---------------------------------------------------------------------------*/
 
-#define FFCONF_DEF	86606	/* Revision ID */
+#define FFCONF_DEF	80286	/* Revision ID */
 
 /*---------------------------------------------------------------------------/
 / Function Configurations
@@ -27,14 +27,6 @@
 /   3: f_lseek() function is removed in addition to 2. */
 
 
-#define FF_USE_STRFUNC	0
-/* This option switches string functions, f_gets(), f_putc(), f_puts() and f_printf().
-/
-/  0: Disable string functions.
-/  1: Enable without LF-CRLF conversion.
-/  2: Enable with LF-CRLF conversion. */
-
-
 #define FF_USE_FIND		0
 /* This option switches filtered directory read functions, f_findfirst() and
 /  f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
@@ -66,6 +58,30 @@
 /* This option switches f_forward() function. (0:Disable or 1:Enable) */
 
 
+#define FF_USE_STRFUNC	0
+#define FF_PRINT_LLI	1
+#define FF_PRINT_FLOAT	1
+#define FF_STRF_ENCODE	3
+/* FF_USE_STRFUNC switches string functions, f_gets(), f_putc(), f_puts() and
+/  f_printf().
+/
+/   0: Disable. FF_PRINT_LLI, FF_PRINT_FLOAT and FF_STRF_ENCODE have no effect.
+/   1: Enable without LF-CRLF conversion.
+/   2: Enable with LF-CRLF conversion.
+/
+/  FF_PRINT_LLI = 1 makes f_printf() support long long argument and FF_PRINT_FLOAT = 1/2
+/  makes f_printf() support floating point argument. These features want C99 or later.
+/  When FF_LFN_UNICODE >= 1 with LFN enabled, string functions convert the character
+/  encoding in it. FF_STRF_ENCODE selects assumption of character encoding ON THE FILE
+/  to be read/written via those functions.
+/
+/   0: ANSI/OEM in current CP
+/   1: Unicode in UTF-16LE
+/   2: Unicode in UTF-16BE
+/   3: Unicode in UTF-8
+*/
+
+
 /*---------------------------------------------------------------------------/
 / Locale and Namespace Configurations
 /---------------------------------------------------------------------------*/
@@ -139,19 +155,6 @@
 /  on character encoding. When LFN is not enabled, these options have no effect. */
 
 
-#define FF_STRF_ENCODE	3
-/* When FF_LFN_UNICODE >= 1 with LFN enabled, string I/O functions, f_gets(),
-/  f_putc(), f_puts and f_printf() convert the character encoding in it.
-/  This option selects assumption of character encoding ON THE FILE to be
-/  read/written via those functions.
-/
-/   0: ANSI/OEM in current CP
-/   1: Unicode in UTF-16LE
-/   2: Unicode in UTF-16BE
-/   3: Unicode in UTF-8
-*/
-
-
 #define FF_FS_RPATH		0
 /* This option configures support for relative path.
 /
@@ -177,7 +180,7 @@
 /  logical drives. Number of items must not be less than FF_VOLUMES. Valid
 /  characters for the volume ID strings are A-Z, a-z and 0-9, however, they are
 /  compared in case-insensitive. If FF_STR_VOLUME_ID >= 1 and FF_VOLUME_STRS is
-/  not defined, a user defined volume string table needs to be defined as:
+/  not defined, a user defined volume string table is needed as:
 /
 /  const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
 */
@@ -196,7 +199,7 @@
 #define FF_MAX_SS		512
 /* This set of options configures the range of sector size to be supported. (512,
 /  1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
-/  harddisk. But a larger value may be required for on-board flash memory and some
+/  harddisk, but a larger value may be required for on-board flash memory and some
 /  type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
 /  for variable sector size mode and disk_ioctl() function needs to implement
 /  GET_SECTOR_SIZE command. */
@@ -207,8 +210,8 @@
 /  To enable the 64-bit LBA, also exFAT needs to be enabled. (FF_FS_EXFAT == 1) */
 
 
-#define FF_MIN_GPT		0x100000000
-/* Minimum number of sectors to switch GPT format to create partition in f_mkfs and
+#define FF_MIN_GPT		0x10000000
+/* Minimum number of sectors to switch GPT as partitioning format in f_mkfs and
 /  f_fdisk function. 0x100000000 max. This option has no effect when FF_LBA64 == 0. */
 
 
@@ -240,9 +243,9 @@
 #define FF_NORTC_MON	1
 #define FF_NORTC_MDAY	1
 #define FF_NORTC_YEAR	2019
-/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have
-/  any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
-/  the timestamp function. Every object modified by FatFs will have a fixed timestamp
+/* The option FF_FS_NORTC switches timestamp feature. If the system does not have
+/  an RTC or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable the
+/  timestamp feature. Every object modified by FatFs will have a fixed timestamp
 /  defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
 /  To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be
 /  added to the project to read current time form real-time clock. FF_NORTC_MON,
@@ -252,7 +255,7 @@
 
 #define FF_FS_NOFSINFO	0
 /* If you need to know correct free space on the FAT32 volume, set bit 0 of this
-/  option, and f_getfree() function at first time after volume mount will force
+/  option, and f_getfree() function at the first time after volume mount will force
 /  a full FAT scan. Bit 1 controls the use of last allocated cluster number.
 /
 /  bit0=0: Use free cluster count in the FSINFO if available.
@@ -274,26 +277,21 @@
 /      lock control is independent of re-entrancy. */
 
 
-/* #include <somertos.h>	// O/S definitions */
 #define FF_FS_REENTRANT	0
 #define FF_FS_TIMEOUT	1000
-#define FF_SYNC_t		HANDLE
 /* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
 /  module itself. Note that regardless of this option, file access to different
 /  volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
 /  and f_fdisk() function, are always not re-entrant. Only file/directory access
-/  to the same volume is under control of this function.
+/  to the same volume is under control of this featuer.
 /
-/   0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.
+/   0: Disable re-entrancy. FF_FS_TIMEOUT have no effect.
 /   1: Enable re-entrancy. Also user provided synchronization handlers,
-/      ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
-/      function, must be added to the project. Samples are available in
-/      option/syscall.c.
+/      ff_mutex_create(), ff_mutex_delete(), ff_mutex_take() and ff_mutex_give()
+/      function, must be added to the project. Samples are available in ffsystem.c.
 /
-/  The FF_FS_TIMEOUT defines timeout period in unit of time tick.
-/  The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
-/  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
-/  included somewhere in the scope of ff.h. */
+/  The FF_FS_TIMEOUT defines timeout period in unit of O/S time tick.
+*/
 
 
 
diff --git a/core/embed/extmod/modtrezorio/ffunicode.c b/core/embed/extmod/modtrezorio/ffunicode.c
index 3267a822ff..2e4bf57619 100644
--- a/core/embed/extmod/modtrezorio/ffunicode.c
+++ b/core/embed/extmod/modtrezorio/ffunicode.c
@@ -1,15 +1,15 @@
 // clang-format off
 
 /*------------------------------------------------------------------------*/
-/* Unicode handling functions for FatFs R0.13+                            */
+/* Unicode Handling Functions for FatFs R0.13 and Later                   */
+/*------------------------------------------------------------------------*/
+/* This module will occupy a huge memory in the .rodata section when the  */
+/* FatFs is configured for LFN with DBCS. If the system has a Unicode     */
+/* library for the code conversion, this module should be modified to use */
+/* it to avoid silly memory consumption.                                  */
 /*------------------------------------------------------------------------*/
-/* This module will occupy a huge memory in the .const section when the    /
-/  FatFs is configured for LFN with DBCS. If the system has any Unicode    /
-/  utilitiy for the code conversion, this module should be modified to use /
-/  that function to avoid silly memory consumption.                        /
-/-------------------------------------------------------------------------*/
 /*
-/ Copyright (C) 2014, ChaN, all right reserved.
+/ Copyright (C) 2022, ChaN, all right reserved.
 /
 / FatFs module is an open source software. Redistribution and use of FatFs in
 / source and binary forms, with or without modification, are permitted provided
@@ -27,7 +27,7 @@
 
 #include "ff.h"
 
-#if FF_USE_LFN	/* This module will be blanked if non-LFN configuration */
+#if FF_USE_LFN != 0	/* This module will be blanked if in non-LFN configuration */
 
 #define MERGE2(a, b) a ## b
 #define CVTBL(tbl, cp) MERGE2(tbl, cp)
@@ -56,8 +56,8 @@ static const WCHAR uc437[] = {	/*  CP437(U.S.) to Unicode conversion table */
 
 
 /*------------------------------------------------------------------------*/
-/* OEM <==> Unicode conversions for static code page configuration        */
-/* SBCS fixed code page                                                   */
+/* OEM <==> Unicode Conversions for Static Code Page Configuration with   */
+/* SBCS Fixed Code Page                                                   */
 /*------------------------------------------------------------------------*/
 
 WCHAR ff_uni2oem (	/* Returns OEM code character, zero on error */
@@ -66,7 +66,7 @@ WCHAR ff_uni2oem (	/* Returns OEM code character, zero on error */
 )
 {
 	WCHAR c = 0;
-	const WCHAR *p = CVTBL(uc, FF_CODE_PAGE);
+	const WCHAR* p = CVTBL(uc, FF_CODE_PAGE);
 
 
 	if (uni < 0x80) {	/* ASCII? */
@@ -88,7 +88,7 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 )
 {
 	WCHAR c = 0;
-	const WCHAR *p = CVTBL(uc, FF_CODE_PAGE);
+	const WCHAR* p = CVTBL(uc, FF_CODE_PAGE);
 
 
 	if (oem < 0x80) {	/* ASCII? */
@@ -105,24 +105,8 @@ WCHAR ff_oem2uni (	/* Returns Unicode character in UTF-16, zero on error */
 
 
 
-
 /*------------------------------------------------------------------------*/
-/* OEM <==> Unicode conversions for static code page configuration        */
-/* DBCS fixed code page                                                   */
-/*------------------------------------------------------------------------*/
-
-
-
-
-/*------------------------------------------------------------------------*/
-/* OEM <==> Unicode conversions for dynamic code page configuration       */
-/*------------------------------------------------------------------------*/
-
-
-
-
-/*------------------------------------------------------------------------*/
-/* Unicode up-case conversion                                             */
+/* Unicode Up-case Conversion                                             */
 /*------------------------------------------------------------------------*/
 
 DWORD ff_wtoupper (	/* Returns up-converted code point */
@@ -254,4 +238,4 @@ DWORD ff_wtoupper (	/* Returns up-converted code point */
 }
 
 
-#endif /* #if FF_USE_LFN */
+#endif /* #if FF_USE_LFN != 0 */
diff --git a/core/embed/extmod/modtrezorui/buffers.c b/core/embed/extmod/modtrezorui/buffers.c
index b3d44d86b4..0d987a6e73 100644
--- a/core/embed/extmod/modtrezorui/buffers.c
+++ b/core/embed/extmod/modtrezorui/buffers.c
@@ -22,17 +22,12 @@
 #include "fonts/fonts.h"
 #include "memzero.h"
 
-#if USE_DMA2D
-
-#if defined BOOTLOADER
-#define BUFFER_SECTION __attribute__((section(".buf")))
-#else
-#define BUFFER_SECTION
-#endif
-
 #define BUFFERS_16BPP 3
 #define BUFFERS_4BPP 3
 #define BUFFERS_TEXT 1
+#define BUFFERS_JPEG 1
+#define BUFFERS_JPEG_WORK 1
+#define BUFFERS_BLURRING 1
 
 const int32_t text_buffer_height = FONT_MAX_HEIGHT;
 const int32_t buffer_width = DISPLAY_RESX;
@@ -40,6 +35,9 @@ const int32_t buffer_width = DISPLAY_RESX;
 BUFFER_SECTION line_buffer_16bpp_t line_buffers_16bpp[BUFFERS_16BPP];
 BUFFER_SECTION line_buffer_4bpp_t line_buffers_4bpp[BUFFERS_4BPP];
 BUFFER_SECTION buffer_text_t text_buffers[BUFFERS_TEXT];
+NODMA_BUFFER_SECTION buffer_jpeg_t jpeg_buffers[BUFFERS_JPEG];
+NODMA_BUFFER_SECTION buffer_jpeg_work_t jpeg_work_buffers[BUFFERS_JPEG_WORK];
+NODMA_BUFFER_SECTION buffer_blurring_t blurring_buffers[BUFFERS_BLURRING];
 
 line_buffer_16bpp_t* buffers_get_line_buffer_16bpp(uint16_t idx, bool clear) {
   if (idx >= BUFFERS_16BPP) {
@@ -71,4 +69,35 @@ buffer_text_t* buffers_get_text_buffer(uint16_t idx, bool clear) {
   return &text_buffers[idx];
 }
 
-#endif
+buffer_jpeg_t* buffers_get_jpeg_buffer(uint16_t idx, bool clear) {
+  if (idx >= BUFFERS_JPEG) {
+    return NULL;
+  }
+
+  if (clear) {
+    memzero(&jpeg_buffers[idx], sizeof(jpeg_buffers[idx]));
+  }
+  return &jpeg_buffers[idx];
+}
+
+buffer_jpeg_work_t* buffers_get_jpeg_work_buffer(uint16_t idx, bool clear) {
+  if (idx >= BUFFERS_JPEG_WORK) {
+    return NULL;
+  }
+
+  if (clear) {
+    memzero(&jpeg_work_buffers[idx], sizeof(jpeg_work_buffers[idx]));
+  }
+  return &jpeg_work_buffers[idx];
+}
+
+buffer_blurring_t* buffers_get_blurring_buffer(uint16_t idx, bool clear) {
+  if (idx >= BUFFERS_BLURRING) {
+    return NULL;
+  }
+
+  if (clear) {
+    memzero(&blurring_buffers[idx], sizeof(blurring_buffers[idx]));
+  }
+  return &blurring_buffers[idx];
+}
diff --git a/core/embed/extmod/modtrezorui/buffers.h b/core/embed/extmod/modtrezorui/buffers.h
index 89f284d837..339876fe73 100644
--- a/core/embed/extmod/modtrezorui/buffers.h
+++ b/core/embed/extmod/modtrezorui/buffers.h
@@ -27,15 +27,33 @@
 
 #define BUFFER_PIXELS DISPLAY_RESX
 
-#define TEXT_BUFFER_HEIGHT 24
+#define TEXT_BUFFER_HEIGHT 32
 
 #if TEXT_BUFFER_HEIGHT < FONT_MAX_HEIGHT
 #error Text buffer height is too small, please adjust to match used fonts
 #endif
 
-#define LINE_BUFFER_16BPP_SIZE BUFFER_PIXELS * 2
-#define LINE_BUFFER_4BPP_SIZE BUFFER_PIXELS / 2
-#define TEXT_BUFFER_SIZE (BUFFER_PIXELS * TEXT_BUFFER_HEIGHT) / 2
+#define LINE_BUFFER_16BPP_SIZE (BUFFER_PIXELS * 2)
+#define LINE_BUFFER_4BPP_SIZE (BUFFER_PIXELS / 2)
+#define TEXT_BUFFER_SIZE ((BUFFER_PIXELS * TEXT_BUFFER_HEIGHT) / 2)
+#define JPEG_BUFFER_SIZE (BUFFER_PIXELS * 16)
+
+// 3100 is needed according to tjpgd docs,
+// 256 because we need non overlapping memory in rust
+// 6 << 10 is for huffman decoding table
+#define JPEG_WORK_SIZE (3100 + 256 + (6 << 10))
+
+#if defined BOOTLOADER
+#define BUFFER_SECTION __attribute__((section(".buf")))
+#else
+#define BUFFER_SECTION
+#endif
+
+#if defined BOOTLOADER || defined TREZOR_EMULATOR
+#define NODMA_BUFFER_SECTION
+#else
+#define NODMA_BUFFER_SECTION __attribute__((section(".no_dma_buffers")))
+#endif
 
 typedef __attribute__((aligned(4))) struct {
   uint8_t buffer[LINE_BUFFER_16BPP_SIZE];
@@ -49,11 +67,26 @@ typedef __attribute__((aligned(4))) struct {
   uint8_t buffer[TEXT_BUFFER_SIZE];
 } buffer_text_t;
 
+typedef __attribute__((aligned(4))) struct {
+  uint16_t buffer[JPEG_BUFFER_SIZE];
+} buffer_jpeg_t;
+
+typedef __attribute__((aligned(4))) struct {
+  uint8_t buffer[JPEG_WORK_SIZE];
+} buffer_jpeg_work_t;
+
+typedef __attribute__((aligned(4))) struct {
+  uint16_t buffer[10][3][BUFFER_PIXELS];
+} buffer_blurring_t;
+
 extern const int32_t text_buffer_height;
 extern const int32_t buffer_width;
 
 line_buffer_16bpp_t* buffers_get_line_buffer_16bpp(uint16_t idx, bool clear);
 line_buffer_4bpp_t* buffers_get_line_buffer_4bpp(uint16_t idx, bool clear);
 buffer_text_t* buffers_get_text_buffer(uint16_t idx, bool clear);
+buffer_jpeg_t* buffers_get_jpeg_buffer(uint16_t idx, bool clear);
+buffer_jpeg_work_t* buffers_get_jpeg_work_buffer(uint16_t idx, bool clear);
+buffer_blurring_t* buffers_get_blurring_buffer(uint16_t idx, bool clear);
 
 #endif  // _BUFFERS_H
diff --git a/core/embed/extmod/modtrezorui/display.c b/core/embed/extmod/modtrezorui/display.c
index b91f1cffbb..b848fc5ba6 100644
--- a/core/embed/extmod/modtrezorui/display.c
+++ b/core/embed/extmod/modtrezorui/display.c
@@ -149,6 +149,45 @@ void display_bar_radius(int x, int y, int w, int h, uint16_t c, uint16_t b,
   PIXELDATA_DIRTY();
 }
 
+void display_bar_radius_buffer(int x, int y, int w, int h, uint8_t r,
+                               buffer_text_t *buffer) {
+  if (h > 32) {
+    return;
+  }
+  if (r != 2 && r != 4 && r != 8 && r != 16) {
+    return;
+  } else {
+    r = 16 / r;
+  }
+  int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
+  clamp_coords(x, y, w, h, &x0, &y0, &x1, &y1);
+  for (int j = y0; j <= y1; j++) {
+    for (int i = x0; i <= x1; i++) {
+      int rx = i - x;
+      int ry = j - y;
+      int p = j * DISPLAY_RESX + i;
+      uint8_t c = 0;
+      if (rx < CORNER_RADIUS / r && ry < CORNER_RADIUS / r) {
+        c = cornertable[rx * r + ry * r * CORNER_RADIUS];
+      } else if (rx < CORNER_RADIUS / r && ry >= h - CORNER_RADIUS / r) {
+        c = cornertable[rx * r + (h - 1 - ry) * r * CORNER_RADIUS];
+      } else if (rx >= w - CORNER_RADIUS / r && ry < CORNER_RADIUS / r) {
+        c = cornertable[(w - 1 - rx) * r + ry * r * CORNER_RADIUS];
+      } else if (rx >= w - CORNER_RADIUS / r && ry >= h - CORNER_RADIUS / r) {
+        c = cornertable[(w - 1 - rx) * r + (h - 1 - ry) * r * CORNER_RADIUS];
+      } else {
+        c = 15;
+      }
+      int b = p / 2;
+      if (p % 2) {
+        buffer->buffer[b] |= c << 4;
+      } else {
+        buffer->buffer[b] |= (c);
+      }
+    }
+  }
+}
+
 #define UZLIB_WINDOW_SIZE (1 << 10)
 
 static void uzlib_prepare(struct uzlib_uncomp *decomp, uint8_t *window,
diff --git a/core/embed/extmod/modtrezorui/display.h b/core/embed/extmod/modtrezorui/display.h
index 4c946cf879..cbe82bb044 100644
--- a/core/embed/extmod/modtrezorui/display.h
+++ b/core/embed/extmod/modtrezorui/display.h
@@ -61,6 +61,8 @@ void display_clear(void);
 void display_bar(int x, int y, int w, int h, uint16_t c);
 void display_bar_radius(int x, int y, int w, int h, uint16_t c, uint16_t b,
                         uint8_t r);
+void display_bar_radius_buffer(int x, int y, int w, int h, uint8_t r,
+                               buffer_text_t *buffer);
 
 bool display_toif_info(const uint8_t *buf, uint32_t len, uint16_t *out_w,
                        uint16_t *out_h, toif_format_t *out_format);
diff --git a/core/embed/extmod/modtrezorui/display_interface.h b/core/embed/extmod/modtrezorui/display_interface.h
index 4b166fdc8d..5b9c3ca82a 100644
--- a/core/embed/extmod/modtrezorui/display_interface.h
+++ b/core/embed/extmod/modtrezorui/display_interface.h
@@ -43,6 +43,7 @@ int display_backlight(int val);
 
 void display_init(void);
 void display_reinit(void);
+void display_sync(void);
 void display_refresh(void);
 const char *display_save(const char *prefix);
 void display_clear_save(void);
diff --git a/core/embed/firmware/bl_check.c b/core/embed/firmware/bl_check.c
index 444feb78c0..79279bc854 100644
--- a/core/embed/firmware/bl_check.c
+++ b/core/embed/firmware/bl_check.c
@@ -20,12 +20,14 @@
 #include <stdint.h>
 #include <string.h>
 #include "blake2s.h"
+#include "board_capabilities.h"
 #include "common.h"
 #include "flash.h"
+#include "image.h"
 
 // symbols from bootloader.bin => bootloader.o
-extern const uint32_t _binary_embed_firmware_bootloader_bin_start;
-extern const uint32_t _binary_embed_firmware_bootloader_bin_size;
+extern const void _binary_embed_firmware_bootloader_bin_start;
+extern const void _binary_embed_firmware_bootloader_bin_size;
 
 /*
 static secbool known_bootloader(const uint8_t *hash, int len) {
@@ -97,6 +99,48 @@ void check_and_replace_bootloader(void) {
       (const uint32_t *)&_binary_embed_firmware_bootloader_bin_start;
   const uint32_t len =
       (const uint32_t)&_binary_embed_firmware_bootloader_bin_size;
+
+  const image_header *new_bld_hdr = read_image_header(
+      (uint8_t *)data, BOOTLOADER_IMAGE_MAGIC, BOOTLOADER_IMAGE_MAXSIZE);
+
+  ensure(new_bld_hdr == (const image_header *)data ? sectrue : secfalse,
+         "Invalid embedded bootloader");
+
+  ensure(check_image_model(new_bld_hdr), "Incompatible embedded bootloader");
+
+  const image_header *current_bld_hdr = read_image_header(
+      bl_data, BOOTLOADER_IMAGE_MAGIC, BOOTLOADER_IMAGE_MAXSIZE);
+
+  // cannot find valid header for current bootloader, something is wrong
+  ensure(current_bld_hdr == (const image_header *)bl_data ? sectrue : secfalse,
+         "Invalid bootloader header");
+
+  ensure(check_image_model(current_bld_hdr), "Incompatible bootloader found");
+
+  if (new_bld_hdr->monotonic < current_bld_hdr->monotonic) {
+    // reject downgrade
+    return;
+  }
+
+  uint32_t board_name = get_board_name();
+  if (board_name == 0 || strncmp((const char *)&board_name, "T2T1", 4) == 0) {
+    // no board capabilities, assume Model T
+    if ((strncmp((const char *)&new_bld_hdr->hw_model, "T2T1", 4) != 0) &&
+        (new_bld_hdr->hw_model != 0)) {
+      // reject non-model T bootloader
+      // 0 represents pre-model check bootloader
+      ensure(secfalse, "Incompatible embedded bootloader");
+    }
+  }
+  // at this point, due to the previous check_image_model call, we know that the
+  // new_bld_hdr is
+  //  meant for the same model as this firmware, so we can check the board name
+  //  against the firmware hw_model.
+  else if (board_name != HW_MODEL) {
+    // reject incompatible bootloader
+    ensure(secfalse, "Incompatible embedded bootloader");
+  }
+
   ensure(flash_erase(FLASH_SECTOR_BOOTLOADER), NULL);
   ensure(flash_unlock_write(), NULL);
   for (int i = 0; i < len / sizeof(uint32_t); i++) {
diff --git a/core/embed/firmware/bootloaders/bootloader_T1B1.bin b/core/embed/firmware/bootloaders/bootloader_T1B1.bin
new file mode 100644
index 0000000000..ac9d56f230
Binary files /dev/null and b/core/embed/firmware/bootloaders/bootloader_T1B1.bin differ
diff --git a/core/embed/firmware/bootloaders/bootloader_T.bin b/core/embed/firmware/bootloaders/bootloader_T2T1.bin
similarity index 100%
rename from core/embed/firmware/bootloaders/bootloader_T.bin
rename to core/embed/firmware/bootloaders/bootloader_T2T1.bin
diff --git a/core/embed/firmware/header.S b/core/embed/firmware/header.S
index 9d48890f39..3531e23955 100644
--- a/core/embed/firmware/header.S
+++ b/core/embed/firmware/header.S
@@ -13,7 +13,11 @@
 g_header:
     .byte 'T','R','Z','F'            // magic
     .word g_header_end - g_header    // hdrlen
+#ifdef TREZOR_MODEL_T
     .word 0                          // expiry
+#else
+    .word 1                          // expiry
+#endif
     .word _codelen                   // codelen
     .byte VERSION_MAJOR              // vmajor
     .byte VERSION_MINOR              // vminor
@@ -23,7 +27,10 @@ g_header:
     .byte FIX_VERSION_MINOR          // fix_vminor
     .byte FIX_VERSION_PATCH          // fix_vpatch
     .byte FIX_VERSION_BUILD          // fix_vbuild
-    . = . + 8                        // reserved
+    .word HW_MODEL                   // type of the designated hardware
+    .byte HW_REVISION                // revision of the designated hardware
+    .byte VERSION_MONOTONIC          // monotonic version of the binary
+    . = . + 2                        // reserved
     . = . + 512                      // hash1 ... hash16
 
 #if !defined TREZOR_MODEL_1
diff --git a/core/embed/firmware/main.c b/core/embed/firmware/main.c
index c694fc85cf..0c68b00c1d 100644
--- a/core/embed/firmware/main.c
+++ b/core/embed/firmware/main.c
@@ -87,6 +87,8 @@ int main(void) {
   enable_systemview();
 #endif
 
+  display_reinit();
+
 #if !defined TREZOR_MODEL_1
   parse_boardloader_capabilities();
 
@@ -109,8 +111,6 @@ int main(void) {
   SCB->SHCSR |= (SCB_SHCSR_USGFAULTENA_Msk | SCB_SHCSR_BUSFAULTENA_Msk);
 #endif
 
-  display_reinit();
-
 #if defined TREZOR_MODEL_1
   button_init();
 #endif
diff --git a/core/embed/firmware/memory_T.ld b/core/embed/firmware/memory_T.ld
index 50684eb807..91ee0f6e53 100644
--- a/core/embed/firmware/memory_T.ld
+++ b/core/embed/firmware/memory_T.ld
@@ -83,4 +83,9 @@ SECTIONS {
     . = 37K; /* this acts as a build time assertion that at least this much memory is available for heap use */
     . = ABSOLUTE(sram_end); /* this explicitly sets the end of the heap */
   } >SRAM
+
+  .data_ccm : ALIGN(4) {
+    *(.no_dma_buffers*);
+    . = ALIGN(4);
+  } >CCMRAM
 }
diff --git a/core/embed/firmware/version.h b/core/embed/firmware/version.h
index 4e21240996..908621e6fa 100644
--- a/core/embed/firmware/version.h
+++ b/core/embed/firmware/version.h
@@ -7,3 +7,5 @@
 #define FIX_VERSION_MINOR 4
 #define FIX_VERSION_PATCH 0
 #define FIX_VERSION_BUILD 0
+
+#define VERSION_MONOTONIC 1
diff --git a/core/embed/prodtest/header.S b/core/embed/prodtest/header.S
index 18a2bdaa4f..ce84552baa 100644
--- a/core/embed/prodtest/header.S
+++ b/core/embed/prodtest/header.S
@@ -10,7 +10,11 @@
 g_header:
     .byte 'T','R','Z','F'            // magic
     .word g_header_end - g_header    // hdrlen
+#ifdef TREZOR_MODEL_T
     .word 0                          // expiry
+#else
+    .word 1                          // expiry
+#endif
     .word _codelen                   // codelen
     .byte VERSION_MAJOR              // vmajor
     .byte VERSION_MINOR              // vminor
@@ -20,7 +24,10 @@ g_header:
     .byte FIX_VERSION_MINOR          // fix_vminor
     .byte FIX_VERSION_PATCH          // fix_vpatch
     .byte FIX_VERSION_BUILD          // fix_vbuild
-    . = . + 8                        // reserved
+    .word HW_MODEL                   // type of the designated hardware
+    .byte HW_REVISION                // revision of the designated hardware
+    .byte VERSION_MONOTONIC          // monotonic version of the binary
+    . = . + 2                        // reserved
     . = . + 512                      // hash1 ... hash16
     . = . + 415                      // reserved
     .byte 0                          // sigmask
diff --git a/core/embed/prodtest/version.h b/core/embed/prodtest/version.h
index f5eeee876a..2279c0cc06 100644
--- a/core/embed/prodtest/version.h
+++ b/core/embed/prodtest/version.h
@@ -7,3 +7,5 @@
 #define FIX_VERSION_MINOR 1
 #define FIX_VERSION_PATCH 0
 #define FIX_VERSION_BUILD 0
+
+#define VERSION_MONOTONIC 1
diff --git a/core/embed/reflash/header.S b/core/embed/reflash/header.S
index 18a2bdaa4f..ce84552baa 100644
--- a/core/embed/reflash/header.S
+++ b/core/embed/reflash/header.S
@@ -10,7 +10,11 @@
 g_header:
     .byte 'T','R','Z','F'            // magic
     .word g_header_end - g_header    // hdrlen
+#ifdef TREZOR_MODEL_T
     .word 0                          // expiry
+#else
+    .word 1                          // expiry
+#endif
     .word _codelen                   // codelen
     .byte VERSION_MAJOR              // vmajor
     .byte VERSION_MINOR              // vminor
@@ -20,7 +24,10 @@ g_header:
     .byte FIX_VERSION_MINOR          // fix_vminor
     .byte FIX_VERSION_PATCH          // fix_vpatch
     .byte FIX_VERSION_BUILD          // fix_vbuild
-    . = . + 8                        // reserved
+    .word HW_MODEL                   // type of the designated hardware
+    .byte HW_REVISION                // revision of the designated hardware
+    .byte VERSION_MONOTONIC          // monotonic version of the binary
+    . = . + 2                        // reserved
     . = . + 512                      // hash1 ... hash16
     . = . + 415                      // reserved
     .byte 0                          // sigmask
diff --git a/core/embed/reflash/version.h b/core/embed/reflash/version.h
index f5eeee876a..2279c0cc06 100644
--- a/core/embed/reflash/version.h
+++ b/core/embed/reflash/version.h
@@ -7,3 +7,5 @@
 #define FIX_VERSION_MINOR 1
 #define FIX_VERSION_PATCH 0
 #define FIX_VERSION_BUILD 0
+
+#define VERSION_MONOTONIC 1
diff --git a/core/embed/rust/Cargo.toml b/core/embed/rust/Cargo.toml
index 2bf223023d..aab0a8c012 100644
--- a/core/embed/rust/Cargo.toml
+++ b/core/embed/rust/Cargo.toml
@@ -8,8 +8,7 @@ build = "build.rs"
 [features]
 default = ["model_tt"]
 bitcoin_only = []
-model_tt = ["touch"]
-model_t1 = ["buttons"]
+model_tt = ["touch", "jpeg"]
 model_tr = ["buttons"]
 micropython = []
 protobuf = ["micropython"]
@@ -19,8 +18,9 @@ ui_debug = []
 buttons = []
 touch = []
 clippy = []
+jpeg = []
 debug = ["ui_debug"]
-test = ["cc", "glob", "micropython", "protobuf", "ui", "ui_debug"]
+test = ["cc", "glob", "micropython", "protobuf", "ui", "ui_debug", "dma2d"]
 
 [lib]
 crate-type = ["staticlib"]
diff --git a/core/embed/rust/build.rs b/core/embed/rust/build.rs
index 6fec48da0a..916a6d3236 100644
--- a/core/embed/rust/build.rs
+++ b/core/embed/rust/build.rs
@@ -178,6 +178,7 @@ fn generate_micropython_bindings() {
         .allowlist_var("mp_type_dict")
         // fun
         .allowlist_type("mp_obj_fun_builtin_fixed_t")
+        .allowlist_var("mp_type_fun_builtin_0")
         .allowlist_var("mp_type_fun_builtin_1")
         .allowlist_var("mp_type_fun_builtin_2")
         .allowlist_var("mp_type_fun_builtin_3")
@@ -287,13 +288,13 @@ fn generate_trezorhal_bindings() {
         .allowlist_function("display_text_width")
         .allowlist_function("display_bar")
         .allowlist_function("display_bar_radius")
-        .allowlist_function("display_icon")
+        .allowlist_function("display_bar_radius_buffer")
         .allowlist_function("display_image")
-        .allowlist_function("display_toif_info")
         .allowlist_function("display_loader")
         .allowlist_function("display_pixeldata")
         .allowlist_function("display_pixeldata_dirty")
         .allowlist_function("display_set_window")
+        .allowlist_function("display_sync")
         .allowlist_var("DISPLAY_CMD_ADDRESS")
         .allowlist_var("DISPLAY_DATA_ADDRESS")
         .allowlist_type("toif_format_t")
@@ -320,16 +321,23 @@ fn generate_trezorhal_bindings() {
         .allowlist_function("hal_delay")
         .allowlist_function("hal_ticks_ms")
         // dma2d
+        .allowlist_function("dma2d_setup_4bpp")
         .allowlist_function("dma2d_setup_4bpp_over_4bpp")
         .allowlist_function("dma2d_setup_4bpp_over_16bpp")
+        .allowlist_function("dma2d_start")
         .allowlist_function("dma2d_start_blend")
         .allowlist_function("dma2d_wait_for_transfer")
         //buffers
         .allowlist_function("buffers_get_line_buffer_16bpp")
         .allowlist_function("buffers_get_line_buffer_4bpp")
         .allowlist_function("buffers_get_text_buffer")
+        .allowlist_function("buffers_get_jpeg_buffer")
+        .allowlist_function("buffers_get_jpeg_work_buffer")
+        .allowlist_function("buffers_get_blurring_buffer")
         .allowlist_var("text_buffer_height")
-        .allowlist_var("buffer_width");
+        .allowlist_var("buffer_width")
+        //usb
+        .allowlist_function("usb_configured");
     // Write the bindings to a file in the OUR_DIR.
     bindings
         .generate()
diff --git a/core/embed/rust/librust_qstr.h b/core/embed/rust/librust_qstr.h
index bbae778927..d6cd40356f 100644
--- a/core/embed/rust/librust_qstr.h
+++ b/core/embed/rust/librust_qstr.h
@@ -16,7 +16,11 @@ static void _librust_qstrs(void) {
   MP_QSTR_CONFIRMED;
   MP_QSTR_CANCELLED;
   MP_QSTR_INFO;
+  MP_QSTR_disable_animation;
+  MP_QSTR_jpeg_info;
+  MP_QSTR_jpeg_test;
   MP_QSTR_confirm_action;
+  MP_QSTR_confirm_homescreen;
   MP_QSTR_confirm_blob;
   MP_QSTR_confirm_properties;
   MP_QSTR_confirm_coinjoin;
@@ -44,13 +48,20 @@ static void _librust_qstrs(void) {
   MP_QSTR_request_slip39;
   MP_QSTR_select_word;
   MP_QSTR_select_word_count;
+  MP_QSTR_show_busyscreen;
   MP_QSTR_show_group_share_success;
+  MP_QSTR_show_homescreen;
+  MP_QSTR_show_lockscreen;
+  MP_QSTR_draw_welcome_screen;
   MP_QSTR_show_remaining_shares;
   MP_QSTR_show_share_words;
+  MP_QSTR_show_progress;
 
   MP_QSTR_attach_timer_fn;
   MP_QSTR_touch_event;
   MP_QSTR_button_event;
+  MP_QSTR_progress_event;
+  MP_QSTR_usb_event;
   MP_QSTR_timer;
   MP_QSTR_paint;
   MP_QSTR_request_complete_repaint;
@@ -90,10 +101,17 @@ static void _librust_qstrs(void) {
   MP_QSTR_min_count;
   MP_QSTR_max_count;
   MP_QSTR_items;
+  MP_QSTR_image;
   MP_QSTR_active;
   MP_QSTR_info_button;
   MP_QSTR_time_ms;
   MP_QSTR_app_name;
   MP_QSTR_icon_name;
   MP_QSTR_accounts;
+  MP_QSTR_indeterminate;
+  MP_QSTR_notification;
+  MP_QSTR_notification_level;
+  MP_QSTR_bootscreen;
+  MP_QSTR_skip_first_paint;
+  MP_QSTR_wrong_pin;
 }
diff --git a/core/embed/rust/src/lib.rs b/core/embed/rust/src/lib.rs
index f66b33fa9f..0a48f279c9 100644
--- a/core/embed/rust/src/lib.rs
+++ b/core/embed/rust/src/lib.rs
@@ -4,6 +4,7 @@
 #![deny(unsafe_op_in_unsafe_fn)]
 #![allow(dead_code)]
 #![feature(lang_items)]
+#![feature(optimize_attribute)]
 
 #[macro_use]
 extern crate num_derive;
@@ -17,6 +18,7 @@ mod trezorhal;
 mod micropython;
 #[cfg(feature = "protobuf")]
 mod protobuf;
+mod storage;
 mod time;
 #[cfg(feature = "ui_debug")]
 mod trace;
diff --git a/core/embed/rust/src/micropython/gc.rs b/core/embed/rust/src/micropython/gc.rs
index 466edb3052..3c0fe8e05c 100644
--- a/core/embed/rust/src/micropython/gc.rs
+++ b/core/embed/rust/src/micropython/gc.rs
@@ -38,6 +38,33 @@ impl<T> Gc<T> {
     }
 }
 
+impl<T: Default> Gc<[T]> {
+    /// Allocate slice on the heap managed by the MicroPython garbage collector
+    /// and fill with default values.
+    pub fn new_slice(len: usize) -> Result<Self, Error> {
+        let layout = Layout::array::<T>(len).unwrap();
+        // TODO: Assert that `layout.align()` is the same as the GC alignment.
+        // SAFETY:
+        //  - Unfortunately we cannot respect `layout.align()` as MicroPython GC does
+        //    not support custom alignment.
+        //  - `ptr` is guaranteed to stay valid as long as it's reachable from the stack
+        //    or the MicroPython heap.
+        // EXCEPTION: Returns null instead of raising.
+        unsafe {
+            let raw = ffi::gc_alloc(layout.size(), 0);
+            if raw.is_null() {
+                return Err(Error::AllocationFailed);
+            }
+            let typed: *mut T = raw.cast();
+            for i in 0..len {
+                ptr::write(typed.add(i), T::default());
+            }
+            let array_ptr = ptr::slice_from_raw_parts_mut(typed, len);
+            Ok(Self::from_raw(array_ptr as _))
+        }
+    }
+}
+
 impl<T: ?Sized> Gc<T> {
     /// Construct a `Gc` from a raw pointer.
     ///
diff --git a/core/embed/rust/src/micropython/macros.rs b/core/embed/rust/src/micropython/macros.rs
index 557666c8e0..0ad558ee9e 100644
--- a/core/embed/rust/src/micropython/macros.rs
+++ b/core/embed/rust/src/micropython/macros.rs
@@ -1,3 +1,20 @@
+/// Create an object for an exported function taking no arguments.
+macro_rules! obj_fn_0 {
+    ($f:expr) => {{
+        #[allow(unused_unsafe)]
+        unsafe {
+            use $crate::micropython::ffi;
+
+            ffi::mp_obj_fun_builtin_fixed_t {
+                base: ffi::mp_obj_base_t {
+                    type_: &ffi::mp_type_fun_builtin_0,
+                },
+                fun: ffi::_mp_obj_fun_builtin_fixed_t__bindgen_ty_1 { _0: Some($f) },
+            }
+        }
+    }};
+}
+
 /// Create an object for an exported function taking 1 arg.
 macro_rules! obj_fn_1 {
     ($f:expr) => {{
diff --git a/core/embed/rust/src/storage/mod.rs b/core/embed/rust/src/storage/mod.rs
new file mode 100644
index 0000000000..29d4777ff6
--- /dev/null
+++ b/core/embed/rust/src/storage/mod.rs
@@ -0,0 +1,59 @@
+use crate::trezorhal::storage::{get, get_length};
+
+pub const HOMESCREEN_MAX_SIZE: usize = 16384;
+
+const STORAGE_VERSION_01: u8 = 1;
+const STORAGE_VERSION_02: u8 = 2;
+const STORAGE_VERSION_CURRENT: u8 = STORAGE_VERSION_02;
+
+const FLAG_PUBLIC: u16 = 0x8000;
+const FLAG_WRITE: u16 = 0xC000;
+const APP_DEVICE: u16 = 0x0100;
+
+const DEVICE_ID: u16 = FLAG_PUBLIC | APP_DEVICE;
+const VERSION: u16 = APP_DEVICE | 0x0001;
+const MNEMONIC_SECRET: u16 = APP_DEVICE | 0x0002;
+// NOTE: 0x03 key was used in the past for LANGUAGE. Not used anymore.
+const LABEL: u16 = FLAG_PUBLIC | APP_DEVICE | 0x0004;
+const USE_PASSPHRASE: u16 = APP_DEVICE | 0x0005;
+const HOMESCREEN: u16 = FLAG_PUBLIC | APP_DEVICE | 0x0006;
+const NEEDS_BACKUP: u16 = APP_DEVICE | 0x0007;
+const FLAGS: u16 = APP_DEVICE | 0x0008;
+const U2F_COUNTER_PRIVATE: u16 = APP_DEVICE | 0x0009;
+const U2F_COUNTER: u16 = FLAG_PUBLIC | APP_DEVICE | 0x0009;
+const PASSPHRASE_ALWAYS_ON_DEVICE: u16 = APP_DEVICE | 0x000A;
+const UNFINISHED_BACKUP: u16 = APP_DEVICE | 0x000B;
+const AUTOLOCK_DELAY_MS: u16 = APP_DEVICE | 0x000C;
+const NO_BACKUP: u16 = APP_DEVICE | 0x000D;
+const BACKUP_TYPE: u16 = APP_DEVICE | 0x000E;
+const ROTATION: u16 = FLAG_PUBLIC | APP_DEVICE | 0x000F;
+const SLIP39_IDENTIFIER: u16 = APP_DEVICE | 0x0010;
+const SLIP39_ITERATION_EXPONENT: u16 = APP_DEVICE | 0x0011;
+const SD_SALT_AUTH_KEY: u16 = FLAG_PUBLIC | APP_DEVICE | 0x0012;
+const INITIALIZED: u16 = FLAG_PUBLIC | APP_DEVICE | 0x0013;
+const SAFETY_CHECK_LEVEL: u16 = APP_DEVICE | 0x0014;
+const EXPERIMENTAL_FEATURES: u16 = APP_DEVICE | 0x0015;
+
+pub fn get_avatar_len() -> Result<usize, ()> {
+    let avatar_len_res = get_length(HOMESCREEN);
+    if let Ok(len) = avatar_len_res {
+        Ok(len)
+    } else {
+        Err(())
+    }
+}
+
+pub fn get_avatar(buffer: &mut [u8]) -> Result<usize, ()> {
+    let avatar_len_res = get_length(HOMESCREEN);
+
+    if let Ok(len) = avatar_len_res {
+        if len <= buffer.len() {
+            unwrap!(get(HOMESCREEN, buffer));
+            Ok(len)
+        } else {
+            Err(())
+        }
+    } else {
+        Err(())
+    }
+}
diff --git a/core/embed/rust/src/trezorhal/bip39.rs b/core/embed/rust/src/trezorhal/bip39.rs
index b205eef193..1dd0b534a9 100644
--- a/core/embed/rust/src/trezorhal/bip39.rs
+++ b/core/embed/rust/src/trezorhal/bip39.rs
@@ -38,6 +38,14 @@ pub fn complete_word(prefix: &str) -> Option<&'static str> {
     }
 }
 
+pub fn options_num(prefix: &str) -> Option<usize> {
+    if prefix.is_empty() {
+        None
+    } else {
+        Some(Wordlist::all().filter_prefix(prefix).len())
+    }
+}
+
 pub fn word_completion_mask(prefix: &str) -> u32 {
     // SAFETY: `mnemonic_word_completion_mask` shouldn't retain nor modify the
     // passed byte string, making the call safe.
diff --git a/core/embed/rust/src/trezorhal/buffers.rs b/core/embed/rust/src/trezorhal/buffers.rs
index 41879dac76..9b0f67e72e 100644
--- a/core/embed/rust/src/trezorhal/buffers.rs
+++ b/core/embed/rust/src/trezorhal/buffers.rs
@@ -1,9 +1,11 @@
 use super::ffi;
 
 pub use ffi::{
-    buffer_text_t as BufferText, line_buffer_16bpp_t as LineBuffer16Bpp,
-    line_buffer_4bpp_t as LineBuffer4Bpp,
+    buffer_blurring_t as BlurringBuffer, buffer_text_t as BufferText,
+    line_buffer_16bpp_t as LineBuffer16Bpp, line_buffer_4bpp_t as LineBuffer4Bpp,
 };
+#[cfg(feature = "jpeg")]
+pub use ffi::{buffer_jpeg_t as BufferJpeg, buffer_jpeg_work_t as BufferJpegWork};
 
 /// Returns a buffer for one line of 16bpp data
 ///
@@ -43,3 +45,44 @@ pub unsafe fn get_text_buffer(idx: u16, clear: bool) -> &'static mut BufferText
         unwrap!(ptr.as_mut())
     }
 }
+
+/// Returns a buffer for jpeg data
+///
+/// # Safety
+///
+/// This function is unsafe because the caller has to guarantee
+/// that he doesn't use buffer on same index multiple times
+#[cfg(feature = "jpeg")]
+pub unsafe fn get_jpeg_buffer(idx: u16, clear: bool) -> &'static mut BufferJpeg {
+    unsafe {
+        let ptr = ffi::buffers_get_jpeg_buffer(idx, clear);
+        unwrap!(ptr.as_mut())
+    }
+}
+
+/// Returns a jpeg work buffer
+///
+/// # Safety
+///
+/// This function is unsafe because the caller has to guarantee
+/// that he doesn't use buffer on same index multiple times
+#[cfg(feature = "jpeg")]
+pub unsafe fn get_jpeg_work_buffer(idx: u16, clear: bool) -> &'static mut BufferJpegWork {
+    unsafe {
+        let ptr = ffi::buffers_get_jpeg_work_buffer(idx, clear);
+        unwrap!(ptr.as_mut())
+    }
+}
+
+/// Returns a buffer for blurring data
+///
+/// # Safety
+///
+/// This function is unsafe because the caller has to guarantee
+/// that he doesn't use buffer on same index multiple times
+pub unsafe fn get_blurring_buffer(idx: u16, clear: bool) -> &'static mut BlurringBuffer {
+    unsafe {
+        let ptr = ffi::buffers_get_blurring_buffer(idx, clear);
+        unwrap!(ptr.as_mut())
+    }
+}
diff --git a/core/embed/rust/src/trezorhal/display.rs b/core/embed/rust/src/trezorhal/display.rs
index d23b603b1c..17e9c51284 100644
--- a/core/embed/rust/src/trezorhal/display.rs
+++ b/core/embed/rust/src/trezorhal/display.rs
@@ -1,11 +1,10 @@
 use super::ffi;
 use core::ptr;
 use cty::c_int;
-use num_traits::FromPrimitive;
 
 use crate::trezorhal::buffers::BufferText;
 
-#[derive(PartialEq, Debug, Eq, FromPrimitive)]
+#[derive(PartialEq, Debug, Eq, FromPrimitive, Clone, Copy)]
 pub enum ToifFormat {
     FullColorBE = ffi::toif_format_t_TOIF_FULL_COLOR_BE as _,
     GrayScaleOH = ffi::toif_format_t_TOIF_GRAYSCALE_OH as _,
@@ -13,12 +12,6 @@ pub enum ToifFormat {
     GrayScaleEH = ffi::toif_format_t_TOIF_GRAYSCALE_EH as _,
 }
 
-pub struct ToifInfo {
-    pub width: u16,
-    pub height: u16,
-    pub format: ToifFormat,
-}
-
 pub fn backlight(val: i32) -> i32 {
     unsafe { ffi::display_backlight(val) }
 }
@@ -97,18 +90,9 @@ pub fn bar_radius(x: i16, y: i16, w: i16, h: i16, fgcolor: u16, bgcolor: u16, ra
     }
 }
 
-pub fn icon(x: i16, y: i16, w: i16, h: i16, data: &[u8], fgcolor: u16, bgcolor: u16) {
+pub fn bar_radius_buffer(x: i16, y: i16, w: i16, h: i16, radius: u8, buffer: &mut BufferText) {
     unsafe {
-        ffi::display_icon(
-            x.into(),
-            y.into(),
-            w.into(),
-            h.into(),
-            data.as_ptr() as _,
-            data.len() as _,
-            fgcolor,
-            bgcolor,
-        )
+        ffi::display_bar_radius_buffer(x.into(), y.into(), w.into(), h.into(), radius, buffer as _)
     }
 }
 
@@ -125,31 +109,6 @@ pub fn image(x: i16, y: i16, w: i16, h: i16, data: &[u8]) {
     }
 }
 
-pub fn toif_info(data: &[u8]) -> Result<ToifInfo, ()> {
-    let mut width: cty::uint16_t = 0;
-    let mut height: cty::uint16_t = 0;
-    let mut format: ffi::toif_format_t = ffi::toif_format_t_TOIF_FULL_COLOR_BE;
-    if unsafe {
-        ffi::display_toif_info(
-            data.as_ptr() as _,
-            data.len() as _,
-            &mut width,
-            &mut height,
-            &mut format,
-        )
-    } {
-        let format = ToifFormat::from_usize(format as usize).unwrap_or(ToifFormat::FullColorBE);
-
-        Ok(ToifInfo {
-            width,
-            height,
-            format,
-        })
-    } else {
-        Err(())
-    }
-}
-
 pub fn loader(
     progress: u16,
     indeterminate: bool,
@@ -210,3 +169,9 @@ pub fn get_offset() -> (i16, i16) {
         (x as i16, y as i16)
     }
 }
+
+pub fn sync() {
+    unsafe {
+        ffi::display_sync();
+    }
+}
diff --git a/core/embed/rust/src/trezorhal/dma2d.rs b/core/embed/rust/src/trezorhal/dma2d.rs
index ed56e3eacc..0de4daa17d 100644
--- a/core/embed/rust/src/trezorhal/dma2d.rs
+++ b/core/embed/rust/src/trezorhal/dma2d.rs
@@ -1,5 +1,9 @@
 use super::ffi;
 
+pub fn dma2d_setup_4bpp(fg_color: u16, bg_color: u16) {
+    unsafe { ffi::dma2d_setup_4bpp(fg_color, bg_color) }
+}
+
 pub fn dma2d_setup_4bpp_over_4bpp(fg_color: u16, bg_color: u16, overlay_color: u16) {
     unsafe { ffi::dma2d_setup_4bpp_over_4bpp(fg_color, bg_color, overlay_color) }
 }
@@ -8,6 +12,16 @@ pub fn dma2d_setup_4bpp_over_16bpp(overlay_color: u16) {
     unsafe { ffi::dma2d_setup_4bpp_over_16bpp(overlay_color) }
 }
 
+pub fn dma2d_start(buffer: &[u8], pixels: i16) {
+    unsafe {
+        ffi::dma2d_start(
+            buffer.as_ptr() as _,
+            ffi::DISPLAY_DATA_ADDRESS as _,
+            pixels as _,
+        );
+    }
+}
+
 pub fn dma2d_start_blend(overlay_buffer: &[u8], bg_buffer: &[u8], pixels: i16) {
     unsafe {
         ffi::dma2d_start_blend(
diff --git a/core/embed/rust/src/trezorhal/ffi.rs b/core/embed/rust/src/trezorhal/ffi.rs
index 67269896bd..f8fcf3a49a 100644
--- a/core/embed/rust/src/trezorhal/ffi.rs
+++ b/core/embed/rust/src/trezorhal/ffi.rs
@@ -1,5 +1,6 @@
 #![allow(non_camel_case_types)]
 #![allow(non_upper_case_globals)]
+#![allow(clippy::upper_case_acronyms)]
 #![allow(non_snake_case)]
 #![allow(dead_code)]
 
diff --git a/core/embed/rust/src/trezorhal/mod.rs b/core/embed/rust/src/trezorhal/mod.rs
index 496a0f2917..9696c53dcd 100644
--- a/core/embed/rust/src/trezorhal/mod.rs
+++ b/core/embed/rust/src/trezorhal/mod.rs
@@ -13,6 +13,7 @@ pub mod random;
 pub mod rgb_led;
 pub mod slip39;
 pub mod storage;
+pub mod usb;
 pub mod uzlib;
 
 pub mod buffers;
diff --git a/core/embed/rust/src/trezorhal/usb.rs b/core/embed/rust/src/trezorhal/usb.rs
new file mode 100644
index 0000000000..241e0fc3e0
--- /dev/null
+++ b/core/embed/rust/src/trezorhal/usb.rs
@@ -0,0 +1,5 @@
+use super::ffi;
+
+pub fn usb_configured() -> bool {
+    unsafe { ffi::usb_configured() == ffi::sectrue }
+}
diff --git a/core/embed/rust/src/ui/component/base.rs b/core/embed/rust/src/ui/component/base.rs
index f4e0c0d3ca..fed6b792dd 100644
--- a/core/embed/rust/src/ui/component/base.rs
+++ b/core/embed/rust/src/ui/component/base.rs
@@ -15,6 +15,7 @@ use crate::{
 use crate::ui::event::ButtonEvent;
 #[cfg(feature = "touch")]
 use crate::ui::event::TouchEvent;
+use crate::ui::event::USBEvent;
 
 /// Type used by components that do not return any messages.
 ///
@@ -104,6 +105,16 @@ impl<T> Child<T> {
         }
         result
     }
+
+    /// Do not draw on screen until an event requests paint. This is used by
+    /// homescreens to avoid flickering when workflow restart happens.
+    pub fn skip_paint(&mut self) {
+        self.marked_for_paint = false;
+    }
+
+    pub fn will_paint(&self) -> bool {
+        self.marked_for_paint
+    }
 }
 
 impl<T> Component for Child<T>
@@ -330,14 +341,17 @@ where
 }
 
 #[derive(Copy, Clone, PartialEq, Eq)]
-pub enum Event {
+pub enum Event<'a> {
     #[cfg(feature = "buttons")]
     Button(ButtonEvent),
     #[cfg(feature = "touch")]
     Touch(TouchEvent),
+    USB(USBEvent),
     /// Previously requested timer was triggered. This invalidates the timer
     /// token (another timer has to be requested).
     Timer(TimerToken),
+    /// Advance progress bar. Progress screens only.
+    Progress(u16, &'a str),
     /// Component has been attached to component tree. This event is sent once
     /// before any other events.
     Attach,
diff --git a/core/embed/rust/src/ui/component/image.rs b/core/embed/rust/src/ui/component/image.rs
index 1538cc9646..4f18b7270b 100644
--- a/core/embed/rust/src/ui/component/image.rs
+++ b/core/embed/rust/src/ui/component/image.rs
@@ -1,22 +1,35 @@
-use crate::ui::{
-    component::{Component, Event, EventCtx, Never},
-    display,
-    display::{toif_info, Color},
-    geometry::{Alignment, Offset, Point, Rect},
+use crate::{
+    trezorhal::display::{image, ToifFormat},
+    ui::{
+        component::{Component, Event, EventCtx, Never},
+        display,
+        display::{toif::Toif, Color, Icon},
+        geometry::{Alignment2D, Offset, Point, Rect, CENTER},
+    },
 };
 
+#[derive(PartialEq, Eq, Clone, Copy)]
 pub struct Image {
-    image: &'static [u8],
+    pub toif: Toif,
     area: Rect,
 }
 
 impl Image {
-    pub fn new(image: &'static [u8]) -> Self {
+    pub fn new(data: &'static [u8]) -> Self {
+        let toif = unwrap!(Toif::new(data));
+        assert!(toif.format() == ToifFormat::FullColorLE);
         Self {
-            image,
+            toif,
             area: Rect::zero(),
         }
     }
+
+    /// Display the icon with baseline Point, aligned according to the
+    /// `alignment` argument.
+    pub fn draw(&self, baseline: Point, alignment: Alignment2D) {
+        let r = Rect::snap(baseline, self.toif.size(), alignment);
+        image(r.x0, r.y0, r.width(), r.height(), self.toif.zdata());
+    }
 }
 
 impl Component for Image {
@@ -32,13 +45,14 @@ impl Component for Image {
     }
 
     fn paint(&mut self) {
-        display::image(self.area.center(), self.image)
+        self.draw(self.area.center(), CENTER);
     }
 
     fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
-        if let Some((size, _)) = display::toif_info(self.image) {
-            sink(Rect::from_center_and_size(self.area.center(), size));
-        }
+        sink(Rect::from_center_and_size(
+            self.area.center(),
+            self.toif.size(),
+        ));
     }
 }
 
@@ -51,8 +65,8 @@ impl crate::trace::Trace for Image {
 }
 
 pub struct BlendedImage {
-    bg: &'static [u8],
-    fg: &'static [u8],
+    bg: Icon,
+    fg: Icon,
     bg_color: Color,
     fg_color: Color,
     area_color: Color,
@@ -61,13 +75,7 @@ pub struct BlendedImage {
 }
 
 impl BlendedImage {
-    pub fn new(
-        bg: &'static [u8],
-        fg: &'static [u8],
-        bg_color: Color,
-        fg_color: Color,
-        area_color: Color,
-    ) -> Self {
+    pub fn new(bg: Icon, fg: Icon, bg_color: Color, fg_color: Color, area_color: Color) -> Self {
         Self {
             bg,
             fg,
@@ -93,15 +101,12 @@ impl Component for BlendedImage {
     type Msg = Never;
 
     fn place(&mut self, bounds: Rect) -> Rect {
-        let (bg_size, _) = unwrap!(toif_info(self.bg));
+        self.bg_top_left = self.bg.toif.size().snap(bounds.center(), CENTER);
 
-        self.bg_top_left = bg_size.snap(bounds.center(), Alignment::Center, Alignment::Center);
+        let ft_top_left = self.fg.toif.size().snap(bounds.center(), CENTER);
+        self.fg_offset = ft_top_left - self.bg_top_left;
 
-        if let Some((fg_size, _)) = toif_info(self.fg) {
-            let ft_top_left = fg_size.snap(bounds.center(), Alignment::Center, Alignment::Center);
-            self.fg_offset = ft_top_left - self.bg_top_left;
-        }
-        Rect::from_top_left_and_size(self.bg_top_left, bg_size)
+        Rect::from_top_left_and_size(self.bg_top_left, self.bg.toif.size())
     }
 
     fn event(&mut self, _ctx: &mut EventCtx, _event: Event) -> Option<Self::Msg> {
@@ -113,9 +118,10 @@ impl Component for BlendedImage {
     }
 
     fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
-        if let Some((size, _)) = display::toif_info(self.bg) {
-            sink(Rect::from_top_left_and_size(self.bg_top_left, size));
-        }
+        sink(Rect::from_top_left_and_size(
+            self.bg_top_left,
+            self.bg.toif.size(),
+        ));
     }
 }
 
diff --git a/core/embed/rust/src/ui/component/label.rs b/core/embed/rust/src/ui/component/label.rs
index 9a55fe69b2..f49097ce43 100644
--- a/core/embed/rust/src/ui/component/label.rs
+++ b/core/embed/rust/src/ui/component/label.rs
@@ -1,5 +1,3 @@
-use core::ops::Deref;
-
 use crate::ui::{
     component::{Component, Event, EventCtx, Never},
     display::Font,
@@ -15,7 +13,7 @@ pub struct Label<T> {
 
 impl<T> Label<T>
 where
-    T: Deref<Target = str>,
+    T: AsRef<str>,
 {
     pub fn new(text: T, align: Alignment, style: TextStyle) -> Self {
         Self {
@@ -54,20 +52,24 @@ where
 
     pub fn max_size(&self) -> Offset {
         let font = self.font();
-        Offset::new(font.text_width(&self.text), font.text_max_height())
+        Offset::new(font.text_width(self.text.as_ref()), font.text_max_height())
     }
 }
 
 impl<T> Component for Label<T>
 where
-    T: Deref<Target = str>,
+    T: AsRef<str>,
 {
     type Msg = Never;
 
     fn place(&mut self, bounds: Rect) -> Rect {
-        let line_bounds = bounds.with_height(self.font().text_max_height());
-        self.layout = self.layout.with_bounds(line_bounds);
-        line_bounds
+        let height = self
+            .layout
+            .with_bounds(bounds)
+            .fit_text(self.text.as_ref())
+            .height();
+        self.layout = self.layout.with_bounds(bounds.with_height(height));
+        self.layout.bounds
     }
 
     fn event(&mut self, _ctx: &mut EventCtx, _event: Event) -> Option<Self::Msg> {
@@ -75,7 +77,7 @@ where
     }
 
     fn paint(&mut self) {
-        self.layout.render_text(&self.text);
+        self.layout.render_text(self.text.as_ref());
     }
 
     fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
@@ -86,9 +88,9 @@ where
 #[cfg(feature = "ui_debug")]
 impl<T> crate::trace::Trace for Label<T>
 where
-    T: Deref<Target = str>,
+    T: AsRef<str>,
 {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
-        t.string(&self.text)
+        t.string(self.text.as_ref())
     }
 }
diff --git a/core/embed/rust/src/ui/component/marquee.rs b/core/embed/rust/src/ui/component/marquee.rs
new file mode 100644
index 0000000000..d3559521d0
--- /dev/null
+++ b/core/embed/rust/src/ui/component/marquee.rs
@@ -0,0 +1,240 @@
+use crate::{
+    time::{Duration, Instant},
+    ui::{
+        animation::Animation,
+        component::{Component, Event, EventCtx, Never, TimerToken},
+        display,
+        display::{Color, Font},
+        geometry::Rect,
+    },
+};
+
+const MILLIS_PER_LETTER_M: u32 = 300;
+
+enum State {
+    Initial,
+    Left(Animation<i16>),
+    PauseLeft,
+    Right(Animation<i16>),
+    PauseRight,
+}
+
+pub struct Marquee<T> {
+    area: Rect,
+    pause_token: Option<TimerToken>,
+    min_offset: i16,
+    max_offset: i16,
+    state: State,
+    text: T,
+    font: Font,
+    fg: Color,
+    bg: Color,
+    duration: Duration,
+    pause: Duration,
+}
+
+impl<T> Marquee<T>
+where
+    T: AsRef<str>,
+{
+    pub fn new(text: T, font: Font, fg: Color, bg: Color) -> Self {
+        Self {
+            area: Rect::zero(),
+            pause_token: None,
+            min_offset: 0,
+            max_offset: 0,
+            state: State::Initial,
+            text,
+            font,
+            fg,
+            bg,
+            duration: Duration::from_millis(2000),
+            pause: Duration::from_millis(1000),
+        }
+    }
+
+    pub fn start(&mut self, ctx: &mut EventCtx, now: Instant) {
+        if let State::Initial = self.state {
+            let text_width = self.font.text_width(self.text.as_ref());
+            let max_offset = self.area.width() - text_width;
+
+            self.min_offset = 0;
+            self.max_offset = max_offset;
+
+            let anim = Animation::new(self.min_offset, max_offset, self.duration, now);
+
+            self.state = State::Left(anim);
+
+            // The animation is starting, request an animation frame event.
+            ctx.request_anim_frame();
+
+            // We don't have to wait for the animation frame event with the first paint,
+            // let's do that now.
+            ctx.request_paint();
+        }
+    }
+
+    pub fn reset(&mut self) {
+        self.state = State::Initial;
+    }
+
+    pub fn animation(&self) -> Option<&Animation<i16>> {
+        match &self.state {
+            State::Initial => None,
+            State::Left(a) => Some(a),
+            State::PauseLeft => None,
+            State::Right(a) => Some(a),
+            State::PauseRight => None,
+        }
+    }
+
+    pub fn is_at_right(&self, now: Instant) -> bool {
+        if let Some(p) = self.progress(now) {
+            return p == self.min_offset;
+        }
+        false
+    }
+
+    pub fn is_at_left(&self, now: Instant) -> bool {
+        if let Some(p) = self.progress(now) {
+            return p == self.max_offset;
+        }
+        false
+    }
+
+    pub fn progress(&self, now: Instant) -> Option<i16> {
+        self.animation().map(|a| a.value(now))
+    }
+
+    pub fn is_animating(&self) -> bool {
+        self.animation().is_some()
+    }
+
+    pub fn paint_anim(&mut self, offset: i16) {
+        display::marquee(
+            self.area,
+            self.text.as_ref(),
+            offset,
+            self.font,
+            self.fg,
+            self.bg,
+        );
+    }
+}
+
+impl<T> Component for Marquee<T>
+where
+    T: AsRef<str>,
+{
+    type Msg = Never;
+
+    fn place(&mut self, bounds: Rect) -> Rect {
+        let base_width = self.font.text_width("M");
+        let text_width = self.font.text_width(self.text.as_ref());
+        let area_width = bounds.width();
+
+        let shift_width = if area_width > text_width {
+            area_width - text_width
+        } else {
+            text_width - area_width
+        };
+
+        let mut duration = (MILLIS_PER_LETTER_M * shift_width as u32) / base_width as u32;
+        if duration < MILLIS_PER_LETTER_M {
+            duration = MILLIS_PER_LETTER_M;
+        }
+
+        self.duration = Duration::from_millis(duration);
+        self.area = bounds;
+        self.area
+    }
+
+    fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
+        let now = Instant::now();
+
+        if let Event::Timer(token) = event {
+            if self.pause_token == Some(token) {
+                match self.state {
+                    State::PauseLeft => {
+                        let anim =
+                            Animation::new(self.max_offset, self.min_offset, self.duration, now);
+                        self.state = State::Right(anim);
+                    }
+                    State::PauseRight => {
+                        let anim =
+                            Animation::new(self.min_offset, self.max_offset, self.duration, now);
+                        self.state = State::Left(anim);
+                    }
+                    _ => {}
+                }
+                // We have something to paint, so request to be painted in the next pass.
+                ctx.request_paint();
+                // There is further progress in the animation, request an animation frame event.
+                ctx.request_anim_frame();
+            }
+
+            if token == EventCtx::ANIM_FRAME_TIMER {
+                if self.is_animating() {
+                    // We have something to paint, so request to be painted in the next pass.
+                    ctx.request_paint();
+                    // There is further progress in the animation, request an animation frame
+                    // event.
+                    ctx.request_anim_frame();
+                }
+
+                match self.state {
+                    State::Right(_) => {
+                        if self.is_at_right(now) {
+                            self.pause_token = Some(ctx.request_timer(self.pause));
+                            self.state = State::PauseRight;
+                        }
+                    }
+                    State::Left(_) => {
+                        if self.is_at_left(now) {
+                            self.pause_token = Some(ctx.request_timer(self.pause));
+                            self.state = State::PauseLeft;
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }
+        None
+    }
+
+    fn paint(&mut self) {
+        let now = Instant::now();
+
+        match self.state {
+            State::Initial => {
+                self.paint_anim(0);
+            }
+            State::PauseRight => {
+                self.paint_anim(self.min_offset);
+            }
+            State::PauseLeft => {
+                self.paint_anim(self.max_offset);
+            }
+            _ => {
+                let progress = self.progress(now);
+                if let Some(done) = progress {
+                    self.paint_anim(done as i16);
+                } else {
+                    self.paint_anim(0);
+                }
+            }
+        }
+    }
+}
+
+#[cfg(feature = "ui_debug")]
+impl<T> crate::trace::Trace for Marquee<T>
+where
+    T: AsRef<str>,
+{
+    fn trace(&self, d: &mut dyn crate::trace::Tracer) {
+        d.open("Marquee");
+        d.field("text", &self.text.as_ref());
+        d.close();
+    }
+}
diff --git a/core/embed/rust/src/ui/component/mod.rs b/core/embed/rust/src/ui/component/mod.rs
index 71f696b467..96aa50b374 100644
--- a/core/embed/rust/src/ui/component/mod.rs
+++ b/core/embed/rust/src/ui/component/mod.rs
@@ -6,6 +6,7 @@ pub mod empty;
 pub mod image;
 pub mod label;
 pub mod map;
+pub mod marquee;
 pub mod maybe;
 pub mod pad;
 pub mod paginated;
@@ -17,9 +18,9 @@ pub mod timeout;
 pub use base::{Child, Component, ComponentExt, Event, EventCtx, Never, TimerToken};
 pub use border::Border;
 pub use empty::Empty;
-pub use image::Image;
 pub use label::Label;
 pub use map::Map;
+pub use marquee::Marquee;
 pub use maybe::Maybe;
 pub use pad::Pad;
 pub use paginated::{PageMsg, Paginate};
diff --git a/core/embed/rust/src/ui/component/painter.rs b/core/embed/rust/src/ui/component/painter.rs
index 7a572b10d2..6c6569d4cd 100644
--- a/core/embed/rust/src/ui/component/painter.rs
+++ b/core/embed/rust/src/ui/component/painter.rs
@@ -1,7 +1,9 @@
+#[cfg(feature = "jpeg")]
+use crate::ui::geometry::Offset;
 use crate::ui::{
-    component::{Component, Event, EventCtx, Never},
+    component::{image::Image, Component, Event, EventCtx, Never},
     display,
-    geometry::Rect,
+    geometry::{Rect, CENTER},
 };
 
 pub struct Painter<F> {
@@ -60,7 +62,18 @@ where
     Painter::new(f)
 }
 
-pub fn image_painter(image: &'static [u8]) -> Painter<impl FnMut(Rect)> {
-    let f = move |area: Rect| display::image(area.center(), image);
+pub fn image_painter(image: Image) -> Painter<impl FnMut(Rect)> {
+    let f = move |area: Rect| image.draw(area.center(), CENTER);
+    Painter::new(f)
+}
+
+#[cfg(feature = "jpeg")]
+pub fn jpeg_painter<'a>(
+    image: impl Fn() -> &'a [u8],
+    size: Offset,
+    scale: u8,
+) -> Painter<impl FnMut(Rect)> {
+    let off = Offset::new(size.x / (2 << scale), size.y / (2 << scale));
+    let f = move |area: Rect| display::tjpgd::jpeg(image(), area.center() - off, scale);
     Painter::new(f)
 }
diff --git a/core/embed/rust/src/ui/component/text/paragraphs.rs b/core/embed/rust/src/ui/component/text/paragraphs.rs
index f4e693493a..73897bdc04 100644
--- a/core/embed/rust/src/ui/component/text/paragraphs.rs
+++ b/core/embed/rust/src/ui/component/text/paragraphs.rs
@@ -2,8 +2,8 @@ use heapless::Vec;
 
 use crate::ui::{
     component::{Component, Event, EventCtx, Never, Paginate},
-    display,
-    geometry::{Alignment, Insets, LinearPlacement, Offset, Point, Rect},
+    display::toif::Icon,
+    geometry::{Alignment, Insets, LinearPlacement, Offset, Point, Rect, TOP_LEFT},
 };
 
 use super::layout::{LayoutFit, TextLayout, TextStyle};
@@ -89,6 +89,10 @@ where
         self
     }
 
+    pub fn inner(&self) -> &T {
+        &self.source
+    }
+
     pub fn inner_mut(&mut self) -> &mut T {
         &mut self.source
     }
@@ -501,8 +505,8 @@ pub struct Checklist<T> {
     area: Rect,
     paragraphs: Paragraphs<T>,
     current: usize,
-    icon_current: &'static [u8],
-    icon_done: &'static [u8],
+    icon_current: Icon,
+    icon_done: Icon,
 }
 
 impl<T> Checklist<T> {
@@ -511,8 +515,8 @@ impl<T> Checklist<T> {
     const CURRENT_OFFSET: Offset = Offset::new(2, 3);
 
     pub fn from_paragraphs(
-        icon_current: &'static [u8],
-        icon_done: &'static [u8],
+        icon_current: Icon,
+        icon_done: Icon,
         current: usize,
         paragraphs: Paragraphs<T>,
     ) -> Self {
@@ -525,11 +529,11 @@ impl<T> Checklist<T> {
         }
     }
 
-    fn paint_icon(&self, layout: &TextLayout, icon: &'static [u8], offset: Offset) {
+    fn paint_icon(&self, layout: &TextLayout, icon: Icon, offset: Offset) {
         let top_left = Point::new(self.area.x0, layout.bounds.y0);
-        display::icon_top_left(
+        icon.draw(
             top_left + offset,
-            icon,
+            TOP_LEFT,
             layout.style.text_color,
             layout.style.background_color,
         );
diff --git a/core/embed/rust/src/ui/constant.rs b/core/embed/rust/src/ui/constant.rs
index 2216fffe64..91fd83f704 100644
--- a/core/embed/rust/src/ui/constant.rs
+++ b/core/embed/rust/src/ui/constant.rs
@@ -1,12 +1,6 @@
 //! Reexporting the `constant` module according to the
 //! current feature (Trezor model)
 
-#[cfg(all(
-    feature = "model_t1",
-    not(feature = "model_tr"),
-    not(feature = "model_tt")
-))]
-pub use super::model_t1::constant::*;
 #[cfg(all(feature = "model_tr", not(feature = "model_tt")))]
 pub use super::model_tr::constant::*;
 #[cfg(feature = "model_tt")]
diff --git a/core/embed/rust/src/ui/display/loader.rs b/core/embed/rust/src/ui/display/loader/circular.rs
similarity index 87%
rename from core/embed/rust/src/ui/display/loader.rs
rename to core/embed/rust/src/ui/display/loader/circular.rs
index 104527d763..000905e678 100644
--- a/core/embed/rust/src/ui/display/loader.rs
+++ b/core/embed/rust/src/ui/display/loader/circular.rs
@@ -1,12 +1,8 @@
-use crate::{
-    trezorhal::uzlib::UzlibContext,
-    ui::{
-        constant, display,
-        display::{Color, ToifFormat},
-        geometry::{Offset, Point, Rect},
-    },
+use crate::ui::{
+    constant, display,
+    display::Color,
+    geometry::{Offset, Point, Rect},
 };
-use core::slice::from_raw_parts;
 
 #[cfg(feature = "dma2d")]
 use crate::trezorhal::{
@@ -16,12 +12,9 @@ use crate::trezorhal::{
 
 use crate::ui::{
     constant::{screen, LOADER_OUTER},
-    display::toif_info_ensure,
+    display::toif::Icon,
 };
 
-pub const LOADER_MIN: u16 = 0;
-pub const LOADER_MAX: u16 = 1000;
-
 const LOADER_SIZE: i32 = (LOADER_OUTER * 2.0) as i32;
 
 const OUTER: f32 = constant::LOADER_OUTER;
@@ -35,22 +28,21 @@ const INNER_OUTER_ANTI: i32 = ((INNER + 2.5) * (INNER + 2.5)) as i32;
 const OUTER_OUT_ANTI: i32 = ((OUTER - 1.5) * (OUTER - 1.5)) as i32;
 const OUTER_MAX: i32 = ((OUTER - 0.5) * (OUTER - 0.5)) as i32;
 
-pub fn loader_uncompress(
+pub fn loader_circular_uncompress(
     y_offset: i16,
     fg_color: Color,
     bg_color: Color,
     progress: u16,
     indeterminate: bool,
-    icon: Option<(&[u8], Color)>,
+    icon: Option<(Icon, Color)>,
 ) {
     const ICON_MAX_SIZE: i16 = constant::LOADER_ICON_MAX_SIZE;
 
-    if let Some((data, color)) = icon {
-        let (toif_size, toif_data) = toif_info_ensure(data, ToifFormat::GrayScaleEH);
+    if let Some((icon, color)) = icon {
+        let toif_size = icon.toif.size();
         if toif_size.x <= ICON_MAX_SIZE && toif_size.y <= ICON_MAX_SIZE {
             let mut icon_data = [0_u8; ((ICON_MAX_SIZE * ICON_MAX_SIZE) / 2) as usize];
-            let mut ctx = UzlibContext::new(toif_data, None);
-            unwrap!(ctx.uncompress(&mut icon_data), "Decompression failed");
+            icon.toif.uncompress(&mut icon_data);
             let i = Some((icon_data.as_ref(), color, toif_size));
             loader_rust(y_offset, fg_color, bg_color, progress, indeterminate, i);
         } else {
@@ -61,29 +53,24 @@ pub fn loader_uncompress(
     }
 }
 
-#[no_mangle]
-pub extern "C" fn loader_uncompress_r(
-    y_offset: cty::int32_t,
-    fg_color: cty::uint16_t,
-    bg_color: cty::uint16_t,
-    icon_color: cty::uint16_t,
-    progress: cty::int32_t,
-    indeterminate: cty::int32_t,
-    icon_data: cty::uintptr_t,
-    icon_data_size: cty::uint32_t,
+pub fn loader_circular(
+    progress: u16,
+    y_offset: i16,
+    fg_color: Color,
+    bg_color: Color,
+    icon: Option<(Icon, Color)>,
 ) {
-    let fg = Color::from_u16(fg_color);
-    let bg = Color::from_u16(bg_color);
-    let ic_color = Color::from_u16(icon_color);
+    loader_circular_uncompress(y_offset, fg_color, bg_color, progress, false, icon);
+}
 
-    let i = if icon_data != 0 {
-        let data_slice = unsafe { from_raw_parts(icon_data as _, icon_data_size as _) };
-        Some((data_slice, ic_color))
-    } else {
-        None
-    };
-
-    loader_uncompress(y_offset as _, fg, bg, progress as _, indeterminate != 0, i);
+pub fn loader_circular_indeterminate(
+    progress: u16,
+    y_offset: i16,
+    fg_color: Color,
+    bg_color: Color,
+    icon: Option<(Icon, Color)>,
+) {
+    loader_circular_uncompress(y_offset, fg_color, bg_color, progress, true, icon);
 }
 
 #[inline(always)]
@@ -374,23 +361,3 @@ pub fn loader_rust(
 
     dma2d_wait_for_transfer();
 }
-
-pub fn loader(
-    progress: u16,
-    y_offset: i16,
-    fg_color: Color,
-    bg_color: Color,
-    icon: Option<(&[u8], Color)>,
-) {
-    loader_uncompress(y_offset, fg_color, bg_color, progress, false, icon);
-}
-
-pub fn loader_indeterminate(
-    progress: u16,
-    y_offset: i16,
-    fg_color: Color,
-    bg_color: Color,
-    icon: Option<(&[u8], Color)>,
-) {
-    loader_uncompress(y_offset, fg_color, bg_color, progress, true, icon);
-}
diff --git a/core/embed/rust/src/ui/display/loader/mod.rs b/core/embed/rust/src/ui/display/loader/mod.rs
new file mode 100644
index 0000000000..12d445a409
--- /dev/null
+++ b/core/embed/rust/src/ui/display/loader/mod.rs
@@ -0,0 +1,68 @@
+mod circular;
+mod rectangular;
+mod starry;
+
+use crate::ui::display::{Color, Icon};
+use core::slice::from_raw_parts;
+
+#[cfg(feature = "model_tt")]
+use crate::ui::display::loader::circular::{
+    loader_circular as determinate, loader_circular_indeterminate as indeterminate,
+};
+#[cfg(not(feature = "model_tt"))]
+use crate::ui::display::loader::rectangular::loader_rectangular as determinate;
+#[cfg(not(feature = "model_tt"))]
+use crate::ui::display::loader::starry::loader_starry_indeterminate as indeterminate;
+
+pub const LOADER_MIN: u16 = 0;
+pub const LOADER_MAX: u16 = 1000;
+
+pub fn loader(
+    progress: u16,
+    y_offset: i16,
+    fg_color: Color,
+    bg_color: Color,
+    icon: Option<(Icon, Color)>,
+) {
+    determinate(progress, y_offset, fg_color, bg_color, icon);
+}
+
+pub fn loader_indeterminate(
+    progress: u16,
+    y_offset: i16,
+    fg_color: Color,
+    bg_color: Color,
+    icon: Option<(Icon, Color)>,
+) {
+    indeterminate(progress, y_offset, fg_color, bg_color, icon);
+}
+
+//TODO: remove when loader is no longer called from C
+#[no_mangle]
+pub extern "C" fn loader_uncompress_r(
+    y_offset: cty::int32_t,
+    fg_color: cty::uint16_t,
+    bg_color: cty::uint16_t,
+    icon_color: cty::uint16_t,
+    progress: cty::int32_t,
+    indeterminate: cty::int32_t,
+    icon_data: cty::uintptr_t,
+    icon_data_size: cty::uint32_t,
+) {
+    let fg = Color::from_u16(fg_color);
+    let bg = Color::from_u16(bg_color);
+    let ic_color = Color::from_u16(icon_color);
+
+    let i = if icon_data != 0 {
+        let data_slice = unsafe { from_raw_parts(icon_data as _, icon_data_size as _) };
+        Some((Icon::new(data_slice), ic_color))
+    } else {
+        None
+    };
+
+    if indeterminate == 0 {
+        loader(progress as _, y_offset as _, fg, bg, i);
+    } else {
+        loader_indeterminate(progress as _, y_offset as _, fg, bg, i);
+    }
+}
diff --git a/core/embed/rust/src/ui/display/loader/rectangular.rs b/core/embed/rust/src/ui/display/loader/rectangular.rs
new file mode 100644
index 0000000000..7ad16c57f0
--- /dev/null
+++ b/core/embed/rust/src/ui/display/loader/rectangular.rs
@@ -0,0 +1,25 @@
+use crate::ui::{
+    constant::{screen, LOADER_INNER},
+    display,
+    display::{Color, Icon},
+    geometry::{Offset, Rect},
+};
+
+pub fn loader_rectangular(
+    progress: u16,
+    y_offset: i16,
+    fg_color: Color,
+    bg_color: Color,
+    icon: Option<(Icon, Color)>,
+) {
+    let area = Rect::from_center_and_size(screen().center(), Offset::uniform(LOADER_INNER as _))
+        .translate(Offset::y(y_offset));
+
+    display::rect_rounded2_partial(
+        area,
+        fg_color,
+        bg_color,
+        (100 * progress as u32 / 1000) as i16,
+        icon,
+    );
+}
diff --git a/core/embed/rust/src/ui/display/loader/starry.rs b/core/embed/rust/src/ui/display/loader/starry.rs
new file mode 100644
index 0000000000..2dbdd2f5f4
--- /dev/null
+++ b/core/embed/rust/src/ui/display/loader/starry.rs
@@ -0,0 +1,67 @@
+use crate::ui::{
+    constant::{screen, LOADER_OUTER},
+    display::{rect_fill, rect_fill_rounded, rect_fill_rounded1, Color, Icon},
+    geometry::{Offset, Point, Rect, CENTER},
+};
+use core::f32::consts::SQRT_2;
+
+const SIZE_SMALL: i16 = 2;
+const SIZE_MEDIUM: i16 = 4;
+const SIZE_LARGE: i16 = 6;
+const RADIUS: i16 = 13;
+const DIAGONAL: i16 = ((RADIUS as f32 * SQRT_2) / 2_f32) as i16;
+
+fn star_small(center: Point, fg: Color, _bg: Color) {
+    let r = Rect::from_center_and_size(center, Offset::uniform(SIZE_SMALL));
+    rect_fill(r, fg);
+}
+
+fn star_medium(center: Point, fg: Color, bg: Color) {
+    let r = Rect::from_center_and_size(center, Offset::uniform(SIZE_MEDIUM));
+    rect_fill_rounded1(r, fg, bg);
+}
+
+fn star_large(center: Point, fg: Color, bg: Color) {
+    let r = Rect::from_center_and_size(center, Offset::uniform(SIZE_LARGE));
+    rect_fill_rounded(r, fg, bg, 2);
+}
+
+pub fn loader_starry_indeterminate(
+    progress: u16,
+    y_offset: i16,
+    fg_color: Color,
+    bg_color: Color,
+    icon: Option<(Icon, Color)>,
+) {
+    let area = Rect::from_center_and_size(screen().center(), Offset::uniform(LOADER_OUTER as _))
+        .translate(Offset::y(y_offset));
+
+    rect_fill(area, bg_color);
+
+    let coords = [
+        Point::new(area.center().x, area.center().y - RADIUS),
+        Point::new(area.center().x + DIAGONAL, area.center().y - DIAGONAL),
+        Point::new(area.center().x + RADIUS, area.center().y),
+        Point::new(area.center().x + DIAGONAL, area.center().y + DIAGONAL),
+        Point::new(area.center().x, area.center().y + RADIUS),
+        Point::new(area.center().x - DIAGONAL, area.center().y + DIAGONAL),
+        Point::new(area.center().x - RADIUS, area.center().y),
+        Point::new(area.center().x - DIAGONAL, area.center().y - DIAGONAL),
+    ];
+
+    let big_idx = (progress / 125) as usize % 8;
+
+    for (i, c) in coords.iter().enumerate() {
+        if i == big_idx {
+            star_large(*c, fg_color, bg_color);
+        } else if (big_idx + 1) % 8 == i || (big_idx - 1) % 8 == i {
+            star_medium(*c, fg_color, bg_color);
+        } else {
+            star_small(*c, fg_color, bg_color);
+        }
+    }
+
+    if let Some((icon, color)) = icon {
+        icon.draw(area.center(), CENTER, color, bg_color);
+    }
+}
diff --git a/core/embed/rust/src/ui/display/mod.rs b/core/embed/rust/src/ui/display/mod.rs
index 6fc98fb12b..c146d35447 100644
--- a/core/embed/rust/src/ui/display/mod.rs
+++ b/core/embed/rust/src/ui/display/mod.rs
@@ -1,5 +1,7 @@
-#[cfg(any(feature = "model_tt", feature = "model_tr"))]
 pub mod loader;
+#[cfg(feature = "jpeg")]
+pub mod tjpgd;
+pub mod toif;
 
 use super::{
     constant,
@@ -7,25 +9,25 @@ use super::{
 };
 #[cfg(feature = "dma2d")]
 use crate::trezorhal::{
-    buffers::{get_buffer_16bpp, get_buffer_4bpp, get_text_buffer},
+    buffers::{get_buffer_16bpp, get_buffer_4bpp},
     dma2d::{
         dma2d_setup_4bpp_over_16bpp, dma2d_setup_4bpp_over_4bpp, dma2d_start_blend,
         dma2d_wait_for_transfer,
     },
+    uzlib::UZLIB_WINDOW_SIZE,
 };
+#[cfg(not(feature = "dma2d"))]
+use crate::ui::geometry::TOP_LEFT;
+
 use crate::{
     error::Error,
     time::Duration,
-    trezorhal::{
-        display,
-        display::ToifFormat,
-        qr, time,
-        uzlib::{UzlibContext, UZLIB_WINDOW_SIZE},
-    },
-    ui::lerp::Lerp,
+    trezorhal::{buffers::get_text_buffer, display, qr, time, uzlib::UzlibContext},
+    ui::{component::image::Image, lerp::Lerp},
 };
 use core::slice;
 
+pub use crate::ui::display::toif::Icon;
 #[cfg(any(feature = "model_tt", feature = "model_tr"))]
 pub use loader::{loader, loader_indeterminate, LOADER_MAX, LOADER_MIN};
 
@@ -79,106 +81,6 @@ pub fn rect_fill_rounded(r: Rect, fg_color: Color, bg_color: Color, radius: u8)
     );
 }
 
-/// NOTE: Cannot start at odd x-coordinate. In this case icon is shifted 1px
-/// left.
-pub fn icon_top_left(top_left: Point, data: &[u8], fg_color: Color, bg_color: Color) {
-    let (toif_size, toif_data) = toif_info_ensure(data, ToifFormat::GrayScaleEH);
-    display::icon(
-        top_left.x,
-        top_left.y,
-        toif_size.x,
-        toif_size.y,
-        toif_data,
-        fg_color.into(),
-        bg_color.into(),
-    );
-}
-
-pub fn icon(center: Point, data: &[u8], fg_color: Color, bg_color: Color) {
-    let (toif_size, toif_data) = toif_info_ensure(data, ToifFormat::GrayScaleEH);
-    let r = Rect::from_center_and_size(center, toif_size);
-    display::icon(
-        r.x0,
-        r.y0,
-        r.width(),
-        r.height(),
-        toif_data,
-        fg_color.into(),
-        bg_color.into(),
-    );
-}
-
-pub fn icon_rust(center: Point, data: &[u8], fg_color: Color, bg_color: Color) {
-    let (toif_size, toif_data) = toif_info_ensure(data, ToifFormat::GrayScaleEH);
-    let r = Rect::from_center_and_size(center, toif_size);
-
-    let area = r.translate(get_offset());
-    let clamped = area.clamp(constant::screen());
-    let colortable = get_color_table(fg_color, bg_color);
-
-    set_window(clamped);
-
-    let mut dest = [0_u8; 1];
-
-    let mut window = [0; UZLIB_WINDOW_SIZE];
-    let mut ctx = UzlibContext::new(toif_data, Some(&mut window));
-
-    for py in area.y0..area.y1 {
-        for px in area.x0..area.x1 {
-            let p = Point::new(px, py);
-            let x = p.x - area.x0;
-
-            if clamped.contains(p) {
-                if x % 2 == 0 {
-                    unwrap!(ctx.uncompress(&mut dest), "Decompression failed");
-                    pixeldata(colortable[(dest[0] & 0xF) as usize]);
-                } else {
-                    pixeldata(colortable[(dest[0] >> 4) as usize]);
-                }
-            } else if x % 2 == 0 {
-                //continue unzipping but dont write to display
-                unwrap!(ctx.uncompress(&mut dest), "Decompression failed");
-            }
-        }
-    }
-
-    pixeldata_dirty();
-}
-
-pub fn image(center: Point, data: &[u8]) {
-    let (toif_size, toif_data) = toif_info_ensure(data, ToifFormat::FullColorLE);
-
-    let r = Rect::from_center_and_size(center, toif_size);
-    display::image(r.x0, r.y0, r.width(), r.height(), toif_data);
-}
-
-pub fn toif_info(data: &[u8]) -> Option<(Offset, ToifFormat)> {
-    if let Ok(info) = display::toif_info(data) {
-        Some((
-            Offset::new(
-                unwrap!(info.width.try_into()),
-                unwrap!(info.height.try_into()),
-            ),
-            info.format,
-        ))
-    } else {
-        None
-    }
-}
-
-/// Aborts if the TOIF file does not have the correct grayscale flag, do not use
-/// with user-supplied inputs.
-fn toif_info_ensure(data: &[u8], format: ToifFormat) -> (Offset, &[u8]) {
-    let info = unwrap!(display::toif_info(data), "Invalid TOIF data");
-    assert_eq!(info.format, format);
-    let size = Offset::new(
-        unwrap!(info.width.try_into()),
-        unwrap!(info.height.try_into()),
-    );
-    let payload = &data[12..]; // Skip TOIF header.
-    (size, payload)
-}
-
 // Used on T1 only.
 pub fn rect_fill_rounded1(r: Rect, fg_color: Color, bg_color: Color) {
     display::bar(r.x0, r.y0, r.width(), r.height(), fg_color.into());
@@ -304,7 +206,7 @@ pub fn rect_rounded2_partial(
     fg_color: Color,
     bg_color: Color,
     show_percent: i16,
-    icon: Option<(&[u8], Color)>,
+    icon: Option<(Icon, Color)>,
 ) {
     const MAX_ICON_SIZE: i16 = 64;
 
@@ -323,17 +225,14 @@ pub fn rect_rounded2_partial(
     let mut icon_data = [0_u8; ((MAX_ICON_SIZE * MAX_ICON_SIZE) / 2) as usize];
     let mut icon_width = 0;
 
-    if let Some((icon_bytes, icon_color)) = icon {
-        let (toif_size, toif_data) = toif_info_ensure(icon_bytes, ToifFormat::GrayScaleEH);
-
-        if toif_size.x <= MAX_ICON_SIZE && toif_size.y <= MAX_ICON_SIZE {
-            icon_area = Rect::from_center_and_size(center, toif_size);
+    if let Some((icon, icon_color)) = icon {
+        let icon_size = icon.toif.size();
+        if icon_size.x <= MAX_ICON_SIZE && icon_size.y <= MAX_ICON_SIZE {
+            icon_area = Rect::from_center_and_size(center, icon_size);
             icon_area_clamped = icon_area.clamp(constant::screen());
-
-            let mut ctx = UzlibContext::new(toif_data, None);
-            unwrap!(ctx.uncompress(&mut icon_data), "Decompression failed");
+            icon.toif.uncompress(&mut icon_data);
             icon_colortable = get_color_table(icon_color, bg_color);
-            icon_width = toif_size.x;
+            icon_width = icon.toif.width();
             use_icon = true;
         }
     }
@@ -419,16 +318,29 @@ pub fn rect_rounded2_partial(
 ///
 /// `buffer_bpp` determines size of pixel data
 /// `data_width` sets the width of valid data in the `src_buffer`
-fn position_buffer(
+pub(crate) fn position_buffer(
     dest_buffer: &mut [u8],
     src_buffer: &[u8],
     buffer_bpp: usize,
     offset_x: i16,
     data_width: i16,
 ) {
-    let start: usize = (offset_x).clamp(0, constant::WIDTH) as usize;
-    let end: usize = (offset_x + data_width).clamp(0, constant::WIDTH) as usize;
+    let data_width_even = if buffer_bpp == 4 && data_width % 2 != 0 {
+        data_width + 1
+    } else {
+        data_width
+    };
+
+    let mut start: usize = (offset_x).clamp(0, constant::WIDTH) as usize;
+    let mut end: usize = (offset_x + data_width_even).clamp(0, constant::WIDTH) as usize;
+
+    if buffer_bpp == 4 {
+        start &= !0x01;
+        end &= !0x01;
+    }
+
     let width = end - start;
+
     // if the offset is negative, need to skip beginning of uncompressed data
     let x_sh = if offset_x < 0 {
         (-offset_x).clamp(0, constant::WIDTH - width as i16) as usize
@@ -518,7 +430,7 @@ fn process_buffer(
 #[cfg(feature = "dma2d")]
 pub fn text_over_image(
     bg_area: Option<(Rect, Color)>,
-    image_data: &[u8],
+    image: Image,
     text: &str,
     font: Font,
     offset_img: Offset,
@@ -533,8 +445,6 @@ pub fn text_over_image(
     let t2 = unsafe { get_buffer_4bpp(1, true) };
     let empty_t = unsafe { get_buffer_4bpp(2, true) };
 
-    let (toif_size, toif_data) = toif_info_ensure(image_data, ToifFormat::FullColorLE);
-
     let r_img;
     let area;
     let offset_img_final;
@@ -550,10 +460,10 @@ pub fn text_over_image(
         empty_img.buffer.copy_from_slice(&img1.buffer);
 
         area = a;
-        r_img = Rect::from_top_left_and_size(a.top_left() + offset_img, toif_size);
+        r_img = Rect::from_top_left_and_size(a.top_left() + offset_img, image.toif.size());
         offset_img_final = offset_img;
     } else {
-        area = Rect::from_top_left_and_size(offset_img.into(), toif_size);
+        area = Rect::from_top_left_and_size(offset_img.into(), image.toif.size());
         r_img = area;
         offset_img_final = Offset::zero();
     }
@@ -579,7 +489,7 @@ pub fn text_over_image(
     set_window(clamped);
 
     let mut window = [0; UZLIB_WINDOW_SIZE];
-    let mut ctx = UzlibContext::new(toif_data, Some(&mut window));
+    let mut ctx = image.toif.decompression_context(Some(&mut window));
 
     dma2d_setup_4bpp_over_16bpp(text_color.into());
 
@@ -647,8 +557,8 @@ pub fn text_over_image(
 #[cfg(feature = "dma2d")]
 pub fn icon_over_icon(
     bg_area: Option<Rect>,
-    bg: (&[u8], Offset, Color),
-    fg: (&[u8], Offset, Color),
+    bg: (Icon, Offset, Color),
+    fg: (Icon, Offset, Color),
     bg_color: Color,
 ) {
     let bg1 = unsafe { get_buffer_16bpp(0, true) };
@@ -658,41 +568,40 @@ pub fn icon_over_icon(
     let fg2 = unsafe { get_buffer_4bpp(1, true) };
     let empty2 = unsafe { get_buffer_4bpp(2, true) };
 
-    let (data_bg, offset_bg, color_icon_bg) = bg;
-    let (data_fg, offset_fg, color_icon_fg) = fg;
+    let (icon_bg, offset_bg, color_icon_bg) = bg;
+    let (icon_fg, offset_fg, color_icon_fg) = fg;
 
-    let (toif_bg_size, toif_bg_data) = toif_info_ensure(data_bg, ToifFormat::GrayScaleEH);
-    assert!(toif_bg_size.x <= constant::WIDTH);
-    assert_eq!(toif_bg_size.x % 2, 0);
+    assert!(icon_bg.toif.width() <= constant::WIDTH);
+    assert_eq!(icon_bg.toif.width() % 2, 0);
 
-    let (toif_fg_size, toif_fg_data) = toif_info_ensure(data_fg, ToifFormat::GrayScaleEH);
-    assert!(toif_bg_size.x <= constant::WIDTH);
-    assert_eq!(toif_bg_size.x % 2, 0);
+    assert!(icon_fg.toif.width() <= constant::WIDTH);
+    assert_eq!(icon_fg.toif.width() % 2, 0);
 
     let area;
     let r_bg;
     let final_offset_bg;
     if let Some(a) = bg_area {
         area = a;
-        r_bg = Rect::from_top_left_and_size(a.top_left() + offset_bg, toif_bg_size);
+        r_bg = Rect::from_top_left_and_size(a.top_left() + offset_bg, icon_bg.toif.size());
         final_offset_bg = offset_bg;
     } else {
-        r_bg = Rect::from_top_left_and_size(Point::new(offset_bg.x, offset_bg.y), toif_bg_size);
+        r_bg =
+            Rect::from_top_left_and_size(Point::new(offset_bg.x, offset_bg.y), icon_bg.toif.size());
         area = r_bg;
         final_offset_bg = Offset::zero();
     }
 
-    let r_fg = Rect::from_top_left_and_size(area.top_left() + offset_fg, toif_fg_size);
+    let r_fg = Rect::from_top_left_and_size(area.top_left() + offset_fg, icon_fg.toif.size());
 
     let clamped = area.clamp(constant::screen()).ensure_even_width();
 
     set_window(clamped);
 
     let mut window_bg = [0; UZLIB_WINDOW_SIZE];
-    let mut ctx_bg = UzlibContext::new(toif_bg_data, Some(&mut window_bg));
+    let mut ctx_bg = UzlibContext::new(icon_bg.toif.zdata(), Some(&mut window_bg));
 
     let mut window_fg = [0; UZLIB_WINDOW_SIZE];
-    let mut ctx_fg = UzlibContext::new(toif_fg_data, Some(&mut window_fg));
+    let mut ctx_fg = UzlibContext::new(icon_fg.toif.zdata(), Some(&mut window_fg));
 
     dma2d_setup_4bpp_over_4bpp(color_icon_bg.into(), bg_color.into(), color_icon_fg.into());
 
@@ -751,12 +660,12 @@ pub fn icon_over_icon(
 #[cfg(not(feature = "dma2d"))]
 pub fn icon_over_icon(
     bg_area: Option<Rect>,
-    bg: (&[u8], Offset, Color),
-    fg: (&[u8], Offset, Color),
+    bg: (Icon, Offset, Color),
+    fg: (Icon, Offset, Color),
     bg_color: Color,
 ) {
-    let (data_bg, offset_bg, color_icon_bg) = bg;
-    let (data_fg, offset_fg, color_icon_fg) = fg;
+    let (icon_bg, offset_bg, color_icon_bg) = bg;
+    let (icon_fg, offset_fg, color_icon_fg) = fg;
 
     let pos_bg = if let Some(area) = bg_area {
         rect_fill(area, bg_color);
@@ -765,8 +674,8 @@ pub fn icon_over_icon(
         Point::from(offset_bg)
     };
 
-    icon_top_left(pos_bg, data_bg, color_icon_bg, bg_color);
-    icon_top_left(pos_bg + offset_fg, data_fg, color_icon_fg, color_icon_bg);
+    icon_bg.draw(pos_bg, TOP_LEFT, color_icon_bg, bg_color);
+    icon_fg.draw(pos_bg + offset_fg, TOP_LEFT, color_icon_fg, color_icon_bg);
 }
 
 /// Gets a color of a pixel on `p` coordinates of rounded rectangle with corner
@@ -847,6 +756,36 @@ pub fn bar_with_text_and_fill(
     pixeldata_dirty();
 }
 
+pub fn marquee(area: Rect, text: &str, offset: i16, font: Font, fg: Color, bg: Color) {
+    let buffer = unsafe { get_text_buffer(0, true) };
+
+    let area = area.translate(get_offset());
+    let clamped = area.clamp(constant::screen());
+    set_window(clamped);
+
+    display::text_into_buffer(text, font.into(), buffer, offset);
+    let tbl = get_color_table(fg, bg);
+
+    for y in 0..clamped.height() {
+        for x in 0..clamped.width() {
+            let pixel = y * constant::WIDTH + x;
+            let byte_idx = pixel / 2;
+            if byte_idx < buffer.buffer.len() as _ {
+                let data = if pixel % 2 != 0 {
+                    buffer.buffer[byte_idx as usize] >> 4
+                } else {
+                    buffer.buffer[byte_idx as usize] & 0xF
+                };
+                pixeldata(tbl[data as usize]);
+            } else {
+                pixeldata(bg);
+            }
+        }
+    }
+
+    pixeldata_dirty();
+}
+
 // Used on T1 only.
 pub fn dotted_line(start: Point, width: i16, color: Color) {
     for x in (start.x..width).step_by(2) {
@@ -916,6 +855,10 @@ pub fn set_window(window: Rect) {
     );
 }
 
+pub fn sync() {
+    display::sync();
+}
+
 pub fn get_color_table(fg_color: Color, bg_color: Color) -> [Color; 16] {
     let mut table: [Color; 16] = [Color::from_u16(0); 16];
 
diff --git a/core/embed/rust/src/ui/display/tjpgd.rs b/core/embed/rust/src/ui/display/tjpgd.rs
new file mode 100644
index 0000000000..1edaf664f4
--- /dev/null
+++ b/core/embed/rust/src/ui/display/tjpgd.rs
@@ -0,0 +1,1554 @@
+/*----------------------------------------------------------------------------/
+/ TJpgDec - Tiny JPEG Decompressor R0.03+trezor               (C)ChaN, 2021
+/-----------------------------------------------------------------------------/
+/ The TJpgDec is a generic JPEG decompressor module for tiny embedded systems.
+/ This is a free software that opened for education, research and commercial
+/  developments under license policy of following terms.
+/
+/  Copyright (C) 2021, ChaN, all right reserved.
+/
+/ * The TJpgDec module is a free software and there is NO WARRANTY.
+/ * No restriction on use. You can use, modify and redistribute it for
+/   personal, non-profit or commercial products UNDER YOUR RESPONSIBILITY.
+/ * Redistributions of source code must retain the above copyright notice.
+/
+/-----------------------------------------------------------------------------/
+/ Oct 04, 2011 R0.01  First release.
+/ Feb 19, 2012 R0.01a Fixed decompression fails when scan starts with an escape seq.
+/ Sep 03, 2012 R0.01b Added JD_TBLCLIP option.
+/ Mar 16, 2019 R0.01c Supprted stdint.h.
+/ Jul 01, 2020 R0.01d Fixed wrong integer type usage.
+/ May 08, 2021 R0.02  Supprted grayscale image. Separated configuration options.
+/ Jun 11, 2021 R0.02a Some performance improvement.
+/ Jul 01, 2021 R0.03  Added JD_FASTDECODE option.
+/                     Some performance improvement.
+/ Jan 02, 2023        Rust version by Trezor Company, modified to meet our needs.
+
+Trezor modifications:
+ - included overflow detection from https://github.com/cmumford/TJpgDec
+ - removed JD_FASTDECODE=0 option
+ - removed JD_TBLCLIP option
+ - allowed interrupted functionality
+ - tighter integration into Trezor codebase by using our data structures
+ - removed generic input and output functions, replaced by our specific functionality
+/----------------------------------------------------------------------------*/
+
+use crate::{
+    trezorhal::{
+        buffers::{get_jpeg_work_buffer, BufferJpeg},
+        display::pixeldata,
+    },
+    ui::{
+        constant,
+        display::set_window,
+        geometry::{Offset, Point, Rect},
+    },
+};
+use core::{
+    f64::consts::{FRAC_1_SQRT_2, SQRT_2},
+    mem, slice,
+};
+
+/// Specifies output pixel format.
+///  0: RGB888 (24-bit/pix)
+///  1: RGB565 (16-bit/pix)
+///  2: Grayscale (8-bit/pix)
+const JD_FORMAT: u32 = 1;
+
+/// Switches output descaling feature.
+/// 0: Disable
+/// 1: Enable
+const JD_USE_SCALE: u32 = 1;
+
+/// Optimization level
+/// 0: NOT IMPLEMENTED Basic optimization. Suitable for 8/16-bit MCUs.
+/// 1: + 32-bit barrel shifter. Suitable for 32-bit MCUs.
+/// 2: + Table conversion for huffman decoding (wants 6 << HUFF_BIT bytes of
+/// RAM)
+const JD_FASTDECODE: u32 = 2;
+
+/// Specifies size of stream input buffer
+const JD_SZBUF: usize = 512;
+
+const HUFF_BIT: u32 = 10;
+const HUFF_LEN: u32 = 1 << HUFF_BIT;
+const HUFF_MASK: u32 = HUFF_LEN - 1;
+
+const NUM_DEQUANTIZER_TABLES: usize = 4;
+
+#[derive(PartialEq, Eq)]
+pub enum Error {
+    /// Interrupted by output function, call `JDEC::decomp` to continue.
+    Interrupted,
+    /// Device error or wrong termination of input stream.
+    Input,
+    /// Insufficient memory pool for the image.
+    MemoryPool,
+    /// Insufficient stream input buffer.
+    MemoryInput,
+    /// Parameter error.
+    Parameter,
+    /// Data format error (may be broken data).
+    InvalidData,
+    /// Not supported JPEG standard.
+    UnsupportedJpeg,
+}
+
+pub struct JDEC<'i, 'p> {
+    dctr: usize,
+    dptr: usize,
+    inbuf: &'p mut [u8],
+    dbit: u8,
+    scale: u8,
+    msx: u8,
+    msy: u8,
+    qtid: [u8; 3],
+    ncomp: u8,
+    dcv: [i16; 3],
+    nrst: u16,
+    rst: u16,
+    rsc: u16,
+    width: u16,
+    height: u16,
+    huffbits: [[&'p mut [u8]; 2]; 2],
+    huffcode: [[&'p mut [u16]; 2]; 2],
+    huffcode_len: [[usize; 2]; 2],
+    huffdata: [[&'p mut [u8]; 2]; 2],
+    qttbl: [&'p mut [i32]; 4],
+    wreg: u32,
+    marker: u8,
+    longofs: [[u8; 2]; 2],
+    hufflut_ac: [&'p mut [u16]; 2],
+    hufflut_dc: [&'p mut [u8]; 2],
+    workbuf: &'p mut [i32],
+    mcubuf: &'p mut [i16],
+    pool: &'p mut [u8],
+    input_func: &'i mut dyn JpegInput,
+}
+
+/// Zigzag-order to raster-order conversion table
+#[rustfmt::skip]
+const ZIG: [u8; 64] = [
+     0,  1,  8, 16,  9,  2,  3, 10, 17, 24, 32, 25, 18, 11,  4,  5,
+    12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13,  6,  7, 14, 21, 28,
+    35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51,
+    58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63,
+];
+
+macro_rules! f {
+    ($num:expr) => {{
+        ($num * 8192_f64) as u16
+    }};
+}
+
+/// Input scale factor of Arai algorithm
+/// (scaled up 16 bits for fixed point operations)
+#[rustfmt::skip]
+const IPSF: [u16; 64] = [
+    f!(1.00000), f!(1.38704), f!(1.30656),       f!(1.17588), f!(1.00000), f!(0.78570), f!(0.54120),       f!(0.27590),
+    f!(1.38704), f!(1.92388), f!(1.81226),       f!(1.63099), f!(1.38704), f!(1.08979), f!(0.75066),       f!(0.38268),
+    f!(1.30656), f!(1.81226), f!(1.70711),       f!(1.53636), f!(1.30656), f!(1.02656), f!(FRAC_1_SQRT_2), f!(0.36048),
+    f!(1.17588), f!(1.63099), f!(1.53636),       f!(1.38268), f!(1.17588), f!(0.92388), f!(0.63638),       f!(0.32442),
+    f!(1.00000), f!(1.38704), f!(1.30656),       f!(1.17588), f!(1.00000), f!(0.78570), f!(0.54120),       f!(0.27590),
+    f!(0.78570), f!(1.08979), f!(1.02656),       f!(0.92388), f!(0.78570), f!(0.61732), f!(0.42522),       f!(0.21677),
+    f!(0.54120), f!(0.75066), f!(FRAC_1_SQRT_2), f!(0.63638), f!(0.54120), f!(0.42522), f!(0.29290),       f!(0.14932),
+    f!(0.27590), f!(0.38268), f!(0.36048),       f!(0.32442), f!(0.27590), f!(0.21678), f!(0.14932),       f!(0.07612),
+];
+
+impl<'i, 'p> JDEC<'i, 'p> {
+    /// Allocate a memory block from memory pool
+    /// `self`: decompressor object reference
+    /// `ndata` number of `T` items to allocate
+    fn alloc_slice<T>(&mut self, ndata: usize) -> Result<&'p mut [T], Error> {
+        let ndata_bytes = ndata * mem::size_of::<T>();
+        let ndata_aligned = (ndata_bytes + 3) & !3;
+        if self.pool.len() < ndata_aligned {
+            // Err: not enough memory
+            return Err(Error::MemoryPool);
+        }
+
+        // SAFETY:
+        //  - Memory is valid because it comes from a valid slice.
+        //  - Memory is initialized because here we consider integers always
+        //    initialized.
+        //  - The slices do not overlap and the original reference is overwritten,
+        //    ensuring that the returned references are exclusive.
+        unsafe {
+            let data = slice::from_raw_parts_mut(self.pool.as_mut_ptr() as _, ndata);
+            let newpool = slice::from_raw_parts_mut(
+                self.pool.as_mut_ptr().add(ndata_aligned),
+                self.pool.len() - ndata_aligned,
+            );
+            self.pool = newpool;
+            Ok(data)
+        }
+    }
+
+    fn jpeg_in(&mut self, inbuf_offset: Option<usize>, n_data: usize) -> usize {
+        if let Some(offset) = inbuf_offset {
+            let inbuf = &mut self.inbuf[offset..offset + n_data];
+            self.input_func.read(Some(inbuf), n_data)
+        } else {
+            self.input_func.read(None, n_data)
+        }
+    }
+
+    /// Create de-quantization and prescaling tables with a DQT segment
+    /// `self`: decompressor object reference
+    /// `ndata`: size of input data
+    fn create_qt_tbl(&mut self, mut ndata: usize) -> Result<(), Error> {
+        let mut i: u32;
+        let mut d: u8;
+        let mut data_idx = 0;
+        while ndata != 0 {
+            // Process all tables in the segment
+            if ndata < 65 {
+                // Err: table size is unaligned
+                return Err(Error::InvalidData);
+            }
+            ndata -= 65;
+
+            d = self.inbuf[data_idx]; // Get table property
+            data_idx += 1;
+            if d & 0xf0 != 0 {
+                // Err: not 8-bit resolution
+                return Err(Error::InvalidData);
+            }
+            i = (d & 3) as u32; // Get table ID
+
+            // Allocate a memory block for the table
+            // Register the table
+            self.qttbl[i as usize] = self.alloc_slice(64)?;
+            for zi in ZIG {
+                // Load the table
+                // Apply scale factor of Arai algorithm to the de-quantizers
+                self.qttbl[i as usize][zi as usize] =
+                    ((self.inbuf[data_idx] as u32) * IPSF[zi as usize] as u32) as i32;
+                data_idx += 1;
+            }
+        }
+        Ok(())
+    }
+
+    /// Create huffman code tables with a DHT segment
+    /// `self`: decompressor object reference
+    /// `ndata`: size of input data
+    fn create_huffman_tbl(&mut self, mut ndata: usize) -> Result<(), Error> {
+        let mut j: u32;
+        let mut b: u32;
+        let mut cls: usize;
+        let mut num: usize;
+        let mut np: usize;
+        let mut d: u8;
+        let mut hc: u16;
+        let mut data_idx = 0;
+        while ndata != 0 {
+            // Process all tables in the segment
+            if ndata < 17 {
+                // Err: wrong data size
+                return Err(Error::InvalidData);
+            }
+            ndata -= 17;
+            d = self.inbuf[data_idx]; // Get table number and class
+            data_idx += 1;
+            if d & 0xee != 0 {
+                // Err: invalid class/number
+                return Err(Error::InvalidData);
+            }
+            cls = d as usize >> 4; // class = dc(0)/ac(1)
+            num = d as usize & 0xf; // table number = 0/1
+                                    // Allocate a memory block for the bit distribution table
+            self.huffbits[num][cls] = self.alloc_slice(16)?;
+
+            np = 0;
+            for i in 0..16 {
+                // Load number of patterns for 1 to 16-bit code
+                // Get sum of code words for each code
+                self.huffbits[num][cls][i] = self.inbuf[data_idx];
+                np += self.inbuf[data_idx] as usize;
+                data_idx += 1;
+            }
+            // Allocate a memory block for the code word table
+            self.huffcode[num][cls] = self.alloc_slice(np)?;
+            self.huffcode_len[num][cls] = np;
+
+            // Re-build huffman code word table
+            hc = 0;
+            j = 0;
+            for i in 0..16 {
+                b = self.huffbits[num][cls][i] as u32;
+                while b > 0 {
+                    self.huffcode[num][cls][j as usize] = hc;
+                    hc += 1;
+                    j += 1;
+                    b -= 1;
+                }
+                hc <<= 1;
+            }
+            if ndata < np {
+                // Err: wrong data size
+                return Err(Error::InvalidData);
+            }
+            ndata -= np;
+
+            // Allocate a memory block for the decoded data
+            self.huffdata[num][cls] = self.alloc_slice(np)?;
+
+            // Load decoded data corresponds to each code word
+            for i in 0..np {
+                d = self.inbuf[data_idx];
+                data_idx += 1;
+                if cls == 0 && d > 11 {
+                    return Err(Error::InvalidData);
+                }
+                self.huffdata[num][cls][i as usize] = d;
+            }
+            if JD_FASTDECODE == 2 {
+                // Create fast huffman decode table
+                let mut span: u32;
+                let mut td: u32;
+                let mut ti: u32;
+                if cls != 0 {
+                    // LUT for AC elements
+                    self.hufflut_ac[num] = self.alloc_slice(HUFF_LEN as usize)?;
+                    // Default value (0xFFFF: may be long code)
+                    self.hufflut_ac[num].fill(0xffff);
+                } else {
+                    // LUT for DC elements
+                    self.hufflut_dc[num] = self.alloc_slice(HUFF_LEN as usize)?;
+                    // Default value (0xFF: may be long code)
+                    self.hufflut_dc[num].fill(0xff);
+                }
+                let mut i = 0;
+
+                // Create LUT
+                for b in 0..HUFF_BIT {
+                    j = self.huffbits[num][cls][b as usize] as u32;
+                    while j != 0 {
+                        // Index of input pattern for the code
+                        ti = (self.huffcode[num][cls][i] << (((HUFF_BIT - 1) as u32) - b)) as u32
+                            & HUFF_MASK;
+
+                        if cls != 0 {
+                            // b15..b8: code length, b7..b0: zero run and data length
+                            td = self.huffdata[num][cls][i] as u32 | (b + 1) << 8;
+                            i += 1;
+                            span = 1 << ((HUFF_BIT - 1) - b);
+                            while span != 0 {
+                                span -= 1;
+                                self.hufflut_ac[num][ti as usize] = td as u16;
+                                ti += 1;
+                            }
+                        } else {
+                            // b7..b4: code length, b3..b0: data length
+                            td = self.huffdata[num][cls][i] as u32 | (b + 1) << 4;
+                            i += 1;
+                            span = 1 << ((HUFF_BIT - 1) - b);
+                            while span != 0 {
+                                span -= 1;
+                                self.hufflut_dc[num][ti as usize] = td as u8;
+                                ti += 1;
+                            }
+                        }
+                        j -= 1;
+                    }
+                }
+                // Code table offset for long code
+                self.longofs[num][cls] = i as u8;
+            }
+        }
+        Ok(())
+    }
+
+    /// Extract a huffman decoded data from input stream
+    /// `self`: decompressor object reference
+    /// `id`: table ID (0:Y, 1:C)
+    /// `cls`: table class (0:DC, 1:AC)
+    #[optimize(speed)]
+    fn huffext(&mut self, id: usize, cls: usize) -> Result<i32, Error> {
+        let mut dc: usize = self.dctr;
+        let mut dp: usize = self.dptr;
+        let mut d: u32;
+        let mut flg: u32 = 0;
+        let mut nc: u32;
+        let mut bl: u32;
+        let mut wbit: u32 = (self.dbit as i32 % 32) as u32;
+        let mut w: u32 = self.wreg & ((1 << wbit) - 1);
+        while wbit < 16 {
+            // Prepare 16 bits into the working register
+            if self.marker != 0 {
+                d = 0xff; // Input stream has stalled for a marker. Generate
+                          // stuff bits
+            } else {
+                if dc == 0 {
+                    // Buffer empty, re-fill input buffer
+                    dp = 0; // Top of input buffer
+                    dc = self.jpeg_in(Some(0), JD_SZBUF);
+                    if dc == 0 {
+                        // Err: read error or wrong stream termination
+                        return Err(Error::Input);
+                    }
+                }
+                d = self.inbuf[dp] as u32;
+                dp += 1;
+
+                dc -= 1;
+                if flg != 0 {
+                    // In flag sequence?
+                    flg = 0; // Exit flag sequence
+                    if d != 0 {
+                        // Not an escape of 0xFF but a marker
+                        self.marker = d as u8;
+                    }
+                    d = 0xff;
+                } else if d == 0xff {
+                    // Is start of flag sequence?
+                    // Enter flag sequence, get trailing byte
+                    flg = 1;
+                    continue;
+                }
+            }
+            // Shift 8 bits in the working register
+            w = w << 8 | d;
+            wbit += 8;
+        }
+        self.dctr = dc;
+        self.dptr = dp;
+        self.wreg = w;
+
+        let mut hb_idx = 0;
+        let mut hc_idx = 0;
+        let mut hd_idx = 0;
+
+        if JD_FASTDECODE == 2 {
+            // Table serch for the short codes
+            d = w >> (wbit - HUFF_BIT); // Short code as table index
+            if cls != 0 {
+                // AC element
+                d = self.hufflut_ac[id][d as usize] as u32; // Table decode
+                if d != 0xffff {
+                    // It is done if hit in short code
+                    self.dbit = (wbit - (d >> 8)) as u8; // Snip the code length
+                    return Ok((d & 0xff) as i32); // b7..0: zero run and
+                                                  // following
+                                                  // data bits
+                }
+            } else {
+                // DC element
+                d = self.hufflut_dc[id][d as usize] as u32; // Table decode
+                if d != 0xff {
+                    // It is done if hit in short code
+                    self.dbit = (wbit - (d >> 4)) as u8; // Snip the code length
+                    return Ok((d & 0xf) as i32); // b3..0: following data bits
+                }
+            }
+
+            // Incremental serch for the codes longer than HUFF_BIT
+            hb_idx = HUFF_BIT; // Bit distribution table
+            hc_idx = self.longofs[id][cls]; // Code word table
+            hd_idx = self.longofs[id][cls]; // Data table
+            bl = (HUFF_BIT + 1) as u32;
+        } else {
+            // Incremental search for all codes
+            bl = 1;
+        }
+
+        // Incremental search
+        while bl <= 16 {
+            nc = self.huffbits[id][cls][hb_idx as usize] as u32;
+            hb_idx += 1;
+            if nc != 0 {
+                d = w >> (wbit - bl);
+                loop {
+                    // Search the code word in this bit length
+                    if hc_idx as usize >= self.huffcode_len[id][cls] {
+                        return Err(Error::InvalidData);
+                    }
+                    let val = self.huffcode[id][cls][hc_idx as usize];
+                    if d == val as u32 {
+                        // Matched?
+                        self.dbit = (wbit - bl) as u8; // Snip the huffman code
+                                                       // Return the decoded data
+                        return Ok(self.huffdata[id][cls][hd_idx as usize] as i32);
+                    }
+                    hc_idx += 1;
+                    hd_idx += 1;
+                    nc -= 1;
+                    if nc == 0 {
+                        break;
+                    }
+                }
+            }
+            bl += 1;
+        }
+
+        // Err: code not found (may be collapted data)
+        Err(Error::InvalidData)
+    }
+
+    /// Extract N bits from input stream
+    /// `self`: decompressor object reference
+    /// `nbit`: number of bits to extract (1 to 16)
+    #[optimize(speed)]
+    fn bitext(&mut self, nbit: u32) -> Result<i32, Error> {
+        let mut dc: usize = self.dctr;
+        let mut dp: usize = self.dptr;
+        let mut d: u32;
+        let mut flg: u32 = 0;
+        let mut wbit: u32 = (self.dbit as i32 % 32) as u32;
+        let mut w: u32 = self.wreg & ((1 << wbit) - 1);
+        while wbit < nbit {
+            // Prepare nbit bits into the working register
+            if self.marker != 0 {
+                d = 0xff; // Input stream stalled, generate stuff bits
+            } else {
+                if dc == 0 {
+                    // Buffer empty, re-fill input buffer
+                    dp = 0; // Top of input buffer
+                    dc = self.jpeg_in(Some(0), JD_SZBUF);
+                    if dc == 0 {
+                        // Err: read error or wrong stream termination
+                        return Err(Error::Input);
+                    }
+                }
+                d = self.inbuf[dp] as u32;
+                dp += 1;
+                dc -= 1;
+                if flg != 0 {
+                    // In flag sequence?
+                    flg = 0; // Exit flag sequence
+                    if d != 0 {
+                        // Not an escape of 0xFF but a marker
+                        self.marker = d as u8;
+                    }
+                    d = 0xff;
+                } else if d == 0xff {
+                    // Is start of flag sequence?
+                    flg = 1; // Enter flag sequence, get trailing byte
+                    continue;
+                }
+            }
+            w = w << 8 | d;
+            wbit += 8;
+        }
+        self.wreg = w;
+        self.dbit = (wbit - nbit) as u8;
+        self.dctr = dc;
+        self.dptr = dp;
+
+        Ok((w >> ((wbit - nbit) % 32)) as i32)
+    }
+
+    /// Process restart interval
+    /// `self`: decompressor object reference
+    /// `rstn`: expected restart sequence number
+    #[optimize(speed)]
+    fn restart(&mut self, rstn: u16) -> Result<(), Error> {
+        let mut dp = self.dptr;
+        let mut dc: usize = self.dctr;
+        let mut marker: u16;
+        if self.marker != 0 {
+            // Generate a maker if it has been detected
+            marker = 0xff00 | self.marker as u16;
+            self.marker = 0;
+        } else {
+            marker = 0;
+            for _ in 0..2 {
+                // Get a restart marker
+                if dc == 0 {
+                    // No input data is available, re-fill input buffer
+                    dp = 0;
+                    dc = self.jpeg_in(Some(0), JD_SZBUF);
+                    if dc == 0 {
+                        return Err(Error::Input);
+                    }
+                }
+                // Get a byte
+                let b = self.inbuf[dp] as u16;
+                marker = marker << 8 | b;
+                dp += 1;
+                dc -= 1;
+            }
+            self.dptr = dp;
+            self.dctr = dc;
+        }
+
+        // Check the marker
+        if marker & 0xffd8 != 0xffd0 || marker & 7 != rstn & 7 {
+            // Err: expected RSTn marker was not detected (may be collapted data)
+            return Err(Error::InvalidData);
+        }
+        self.dbit = 0; // Discard stuff bits
+                       // Reset DC offset
+        self.dcv[0] = 0;
+        self.dcv[1] = 0;
+        self.dcv[2] = 0;
+        Ok(())
+    }
+
+    /// Apply Inverse-DCT in Arai Algorithm
+    /// `src`: input block data (de-quantized and pre-scaled for Arai Algorithm)
+    /// `dst`: destination to store the block as byte array
+    #[optimize(speed)]
+    fn block_idct(src: &mut [i32], dst: &mut [i16]) {
+        let m13: i32 = (SQRT_2 * 4096_f64) as i32;
+        let m2: i32 = (1.08239f64 * 4096_f64) as i32;
+        let m4: i32 = (2.61313f64 * 4096_f64) as i32;
+        let m5: i32 = (1.84776f64 * 4096_f64) as i32;
+        let mut v0: i32;
+        let mut v1: i32;
+        let mut v2: i32;
+        let mut v3: i32;
+        let mut v4: i32;
+        let mut v5: i32;
+        let mut v6: i32;
+        let mut v7: i32;
+        let mut t10: i32;
+        let mut t11: i32;
+        let mut t12: i32;
+        let mut t13: i32;
+
+        // Process columns
+        for idx in 0..8 {
+            // Get even elements
+            v0 = src[idx];
+            v1 = src[idx + 8 * 2];
+            v2 = src[idx + 8 * 4];
+            v3 = src[idx + 8 * 6];
+
+            // Process the even elements
+            t10 = v0 + v2;
+            t12 = v0 - v2;
+            t11 = ((v1 - v3) * m13) >> 12;
+            v3 += v1;
+            t11 -= v3;
+            v0 = t10 + v3;
+            v3 = t10 - v3;
+            v1 = t11 + t12;
+            v2 = t12 - t11;
+
+            // Get odd elements
+            v4 = src[idx + 8 * 7];
+            v5 = src[idx + 8];
+            v6 = src[idx + 8 * 5];
+            v7 = src[idx + 8 * 3];
+
+            // Process the odd elements
+            t10 = v5 - v4;
+            t11 = v5 + v4;
+            t12 = v6 - v7;
+            v7 += v6;
+            v5 = ((t11 - v7) * m13) >> 12;
+            v7 += t11;
+            t13 = ((t10 + t12) * m5) >> 12;
+            v4 = t13 - ((t10 * m2) >> 12);
+            v6 = t13 - ((t12 * m4) >> 12) - v7;
+            v5 -= v6;
+            v4 -= v5;
+
+            // Write-back transformed values
+            src[idx] = v0 + v7;
+            src[idx + 8 * 7] = v0 - v7;
+            src[idx + 8] = v1 + v6;
+            src[idx + 8 * 6] = v1 - v6;
+            src[idx + 8 * 2] = v2 + v5;
+            src[idx + 8 * 5] = v2 - v5;
+            src[idx + 8 * 3] = v3 + v4;
+            src[idx + 8 * 4] = v3 - v4;
+        }
+
+        // Process rows
+        for idx in (0..64).step_by(8) {
+            // Get even elements
+            v0 = src[idx] + (128 << 8); // remove DC offset (-128) here
+            v1 = src[idx + 2];
+            v2 = src[idx + 4];
+            v3 = src[idx + 6];
+
+            // Process the even elements
+            t10 = v0 + v2;
+            t12 = v0 - v2;
+            t11 = ((v1 - v3) * m13) >> 12;
+            v3 += v1;
+            t11 -= v3;
+            v0 = t10 + v3;
+            v3 = t10 - v3;
+            v1 = t11 + t12;
+            v2 = t12 - t11;
+
+            // Get odd elements
+            v4 = src[idx + 7];
+            v5 = src[idx + 1];
+            v6 = src[idx + 5];
+            v7 = src[idx + 3];
+
+            // Process the odd elements
+            t10 = v5 - v4;
+            t11 = v5 + v4;
+            t12 = v6 - v7;
+            v7 += v6;
+            v5 = ((t11 - v7) * m13) >> 12;
+            v7 += t11;
+            t13 = ((t10 + t12) * m5) >> 12;
+            v4 = t13 - ((t10 * m2) >> 12);
+            v6 = t13 - ((t12 * m4) >> 12) - v7;
+            v5 -= v6;
+            v4 -= v5;
+
+            // Descale the transformed values 8 bits and output a row
+            dst[idx] = ((v0 + v7) >> 8) as i16;
+            dst[idx + 7] = ((v0 - v7) >> 8) as i16;
+            dst[idx + 1] = ((v1 + v6) >> 8) as i16;
+            dst[idx + 6] = ((v1 - v6) >> 8) as i16;
+            dst[idx + 2] = ((v2 + v5) >> 8) as i16;
+            dst[idx + 5] = ((v2 - v5) >> 8) as i16;
+            dst[idx + 3] = ((v3 + v4) >> 8) as i16;
+            dst[idx + 4] = ((v3 - v4) >> 8) as i16;
+        }
+    }
+
+    /// Load all blocks in an MCU into working buffer
+    /// `self`: decompressor object reference
+    #[optimize(speed)]
+    fn mcu_load(&mut self) -> Result<(), Error> {
+        let mut d: i32;
+        let mut e: i32;
+        let mut blk: u32;
+        let mut bc: u32;
+        let mut z: u32;
+        let mut id: u32;
+        let mut cmp: u32;
+        let nby = (self.msx as i32 * self.msy as i32) as u32; // Number of Y blocks (1, 2 or 4)
+        let mut mcu_buf_idx = 0; // Pointer to the first block of MCU
+        blk = 0;
+        while blk < nby + 2 {
+            // Get nby Y blocks and two C blocks
+            cmp = if blk < nby { 0 } else { blk - nby + 1 }; // Component number 0:Y, 1:Cb, 2:Cr
+            if cmp != 0 && self.ncomp as i32 != 3 {
+                // Clear C blocks if not exist (monochrome image)
+                for i in 0..64 {
+                    self.mcubuf[mcu_buf_idx + i] = 128;
+                }
+            } else {
+                // Load Y/C blocks from input stream
+                id = if cmp != 0 { 1 } else { 0 }; // Huffman table ID of this component
+
+                // Extract a DC element from input stream
+                d = self.huffext(id as usize, 0)?; // Extract a huffman coded data (bit length)
+                bc = d as u32;
+                d = self.dcv[cmp as usize] as i32; // DC value of previous block
+                if bc != 0 {
+                    // If there is any difference from previous block
+                    e = self.bitext(bc)?; // Extract data bits
+                    bc = 1 << (bc - 1); // MSB position
+                    if e as u32 & bc == 0 {
+                        e -= ((bc << 1) - 1) as i32; // Restore negative value
+                                                     // if
+                                                     // needed
+                    }
+                    d += e; // Get current value
+                    self.dcv[cmp as usize] = d as i16; // Save current DC value
+                                                       // for
+                                                       // next block
+                }
+                // De-quantizer table ID for this component
+                let dqidx = self.qtid[cmp as usize] as usize;
+                if dqidx >= NUM_DEQUANTIZER_TABLES {
+                    return Err(Error::InvalidData);
+                }
+                // De-quantize, apply scale factor of Arai algorithm and descale 8 bits
+                let dfq = &self.qttbl[dqidx];
+                self.workbuf[0] = (d * dfq[0]) >> 8;
+
+                // Extract following 63 AC elements from input stream
+                self.workbuf[1..64].fill(0); // Initialize all AC elements
+                z = 1; // Top of the AC elements (in zigzag-order)
+                loop {
+                    // Extract a huffman coded value (zero runs and bit length)
+                    d = self.huffext(id as usize, 1)?;
+                    if d == 0 {
+                        // EOB?
+                        break;
+                    }
+                    bc = d as u32;
+                    z += bc >> 4; // Skip leading zero run
+                    if z >= 64 {
+                        // Too long zero run
+                        return Err(Error::InvalidData);
+                    }
+                    bc &= 0xf;
+                    if bc != 0 {
+                        // Bit length?
+                        d = self.bitext(bc)?; // Extract data bits
+                        bc = 1 << (bc - 1); // MSB position
+                        if d as u32 & bc == 0 {
+                            // Restore negative value if needed
+                            d -= ((bc << 1) - 1) as i32;
+                        }
+                        let i = ZIG[z as usize] as u32; // Get raster-order index
+                                                        // De-quantize, apply scale factor of Arai algorithm and descale 8 bits
+                        let dqidx = self.qtid[cmp as usize] as usize;
+                        if dqidx >= NUM_DEQUANTIZER_TABLES {
+                            return Err(Error::InvalidData);
+                        }
+                        let dfq = &self.qttbl[dqidx];
+                        self.workbuf[i as usize] = (d * dfq[i as usize]) >> 8;
+                    }
+                    z += 1;
+                    if z >= 64 {
+                        break;
+                    }
+                }
+
+                // C components may not be processed if in grayscale output
+                if JD_FORMAT != 2 || cmp == 0 {
+                    // If no AC element or scale ratio is 1/8, IDCT can be omitted and the block is
+                    // filled with DC value
+                    if z == 1 || JD_USE_SCALE != 0 && self.scale == 3 {
+                        d = (self.workbuf[0] / 256 + 128) as i32;
+                        if JD_FASTDECODE >= 1 {
+                            for i in 0..64 {
+                                self.mcubuf[mcu_buf_idx + i] = d as i16;
+                            }
+                        } else {
+                            self.mcubuf[..64].fill(d as i16);
+                        }
+                    } else {
+                        // Apply IDCT and store the block to the MCU buffer
+                        Self::block_idct(self.workbuf, &mut self.mcubuf[mcu_buf_idx..]);
+                    }
+                }
+            }
+            mcu_buf_idx += 64; // Next block
+            blk += 1;
+        }
+        Ok(()) // All blocks have been loaded successfully
+    }
+
+    /// Output an MCU: Convert YCrCb to RGB and output it in RGB form
+    /// `self`: decompressor object reference
+    /// `x`: MCU location in the image
+    /// `y`: MCU location in the image
+    #[optimize(speed)]
+    fn mcu_output(
+        &mut self,
+        mut x: u32,
+        mut y: u32,
+        output_func: &mut dyn JpegOutput,
+    ) -> Result<(), Error> {
+        // Adaptive accuracy for both 16-/32-bit systems
+        let cvacc: i32 = if mem::size_of::<i32>() > 2 { 1024 } else { 128 };
+        let mut yy: i32;
+        let mut cb: i32;
+        let mut cr: i32;
+        let mut py_idx: usize;
+        let mut pc_idx: usize;
+
+        // MCU size (pixel)
+        let mut mx = (self.msx as i32 * 8) as u32;
+        let my = (self.msy as i32 * 8) as u32;
+
+        // Output rectangular size (it may be clipped at right/bottom end of image)
+        let mut rx = if (x + mx) <= self.width as u32 {
+            mx
+        } else {
+            self.width as u32 - x
+        };
+        let mut ry = if (y + my) <= self.height as u32 {
+            my
+        } else {
+            self.height as u32 - y
+        };
+        if JD_USE_SCALE != 0 {
+            rx >>= self.scale;
+            ry >>= self.scale;
+            if rx == 0 || ry == 0 {
+                // Skip this MCU if all pixel is to be rounded off
+                return Ok(());
+            }
+            x >>= self.scale;
+            y >>= self.scale;
+        }
+        let rect = Rect::from_top_left_and_size(
+            Point::new(x as i16, y as i16),
+            Offset::new(rx as i16, ry as i16),
+        );
+
+        // SAFETY: Aligning to u8 slice is safe, because the original slice is aligned
+        // to 32 bits, therefore there are also no residuals (prefix/suffix).
+        // The data in the slices are integers, so these are valid for both i32
+        // and u8.
+        let (_, workbuf, _) = unsafe { self.workbuf.align_to_mut::<u8>() };
+
+        let mut pix_idx: usize = 0;
+        let mut op_idx: usize;
+
+        if JD_USE_SCALE == 0 || self.scale != 3 {
+            // Not for 1/8 scaling
+            if JD_FORMAT != 2 {
+                // RGB output (build an RGB MCU from Y/C component)
+                for iy in 0..my {
+                    py_idx = 0;
+                    pc_idx = 0;
+                    if my == 16 {
+                        // Double block height?
+                        pc_idx += (64 * 4) + ((iy as usize >> 1) * 8);
+                        if iy >= 8 {
+                            py_idx += 64;
+                        }
+                    } else {
+                        // Single block height
+                        pc_idx += (mx * 8 + iy * 8) as usize;
+                    }
+                    py_idx += (iy * 8) as usize;
+                    for ix in 0..mx {
+                        cb = self.mcubuf[pc_idx] as i32 - 128; // Get Cb/Cr component and remove offset
+                        cr = self.mcubuf[pc_idx + 64] as i32 - 128;
+                        if mx == 16 {
+                            // Double block width?
+                            if ix == 8 {
+                                // Jump to next block if double block height
+                                py_idx += 64 - 8;
+                            }
+                            // Step forward chroma pointer every two pixels
+                            pc_idx += (ix & 1) as usize;
+                        } else {
+                            // Single block width
+                            // Step forward chroma pointer every pixel
+                            pc_idx += 1;
+                        }
+                        // Get Y component
+                        yy = self.mcubuf[py_idx] as i32;
+                        py_idx += 1;
+                        // R
+                        workbuf[pix_idx] = (yy + (1.402f64 * cvacc as f64) as i32 * cr / cvacc)
+                            .clamp(0, 255) as u8;
+                        pix_idx += 1;
+                        // G
+                        workbuf[pix_idx] = (yy
+                            - ((0.344f64 * cvacc as f64) as i32 * cb
+                                + (0.714f64 * cvacc as f64) as i32 * cr)
+                                / cvacc)
+                            .clamp(0, 255) as u8;
+                        pix_idx += 1;
+                        // B
+                        workbuf[pix_idx] = (yy + (1.772f64 * cvacc as f64) as i32 * cb / cvacc)
+                            .clamp(0, 255) as u8;
+                        pix_idx += 1;
+                    }
+                }
+            } else {
+                // Monochrome output (build a grayscale MCU from Y comopnent)
+
+                for iy in 0..my {
+                    py_idx = (iy * 8) as usize;
+                    if my == 16 && iy >= 8 {
+                        // Double block height?
+                        py_idx += 64;
+                    }
+                    for ix in 0..mx {
+                        if mx == 16 && ix == 8 {
+                            // Double block width?
+                            // Jump to next block if double block height
+                            py_idx += 64 - 8;
+                        }
+                        // Get and store a Y value as grayscale
+                        workbuf[pix_idx] = self.mcubuf[py_idx] as u8;
+                        pix_idx += 1;
+                        py_idx += 1;
+                    }
+                }
+            }
+            // Descale the MCU rectangular if needed
+            if JD_USE_SCALE != 0 && self.scale != 0 {
+                // Get averaged RGB value of each square corresponds to a pixel
+                let s = (self.scale * 2) as u32; // Number of shifts for averaging
+                let w = 1 << self.scale as u32; // Width of square
+                let a = (mx - w) * (if JD_FORMAT != 2 { 3 } else { 1 }); // Bytes to skip for next line in the square
+                op_idx = 0;
+                for iy in (0..my).step_by(w as usize) {
+                    for ix in (0..mx).step_by(w as usize) {
+                        pix_idx = ((iy * mx + ix) * (if JD_FORMAT != 2 { 3 } else { 1 })) as usize;
+                        let mut b = 0;
+                        let mut g = 0;
+                        let mut r = 0;
+                        for _ in 0..w {
+                            // Accumulate RGB value in the square
+                            for _ in 0..w {
+                                // Accumulate R or Y (monochrome output)
+                                r += workbuf[pix_idx] as u32;
+                                pix_idx += 1;
+                                if JD_FORMAT != 2 {
+                                    // Accumulate G
+                                    g += workbuf[pix_idx] as u32;
+                                    pix_idx += 1;
+                                    // Accumulate B
+                                    b += workbuf[pix_idx] as u32;
+                                    pix_idx += 1;
+                                }
+                            }
+                            pix_idx += a as usize;
+                        }
+                        // Put the averaged pixel value
+                        // Put R or Y (monochrome output)
+                        workbuf[op_idx] = (r >> s) as u8;
+                        op_idx += 1;
+                        if JD_FORMAT != 2 {
+                            // RGB output?
+                            // Put G
+                            workbuf[op_idx] = (g >> s) as u8;
+                            op_idx += 1;
+                            // Put B
+                            workbuf[op_idx] = (b >> s) as u8;
+                            op_idx += 1;
+                        }
+                    }
+                }
+            }
+        } else {
+            // For only 1/8 scaling (left-top pixel in each block are the DC value of the
+            // block) Build a 1/8 descaled RGB MCU from discrete components
+            pix_idx = 0;
+            pc_idx = (mx * my) as usize;
+            cb = self.mcubuf[pc_idx] as i32 - 128; // Get Cb/Cr component and restore right level
+            cr = self.mcubuf[pc_idx + 64] as i32 - 128;
+
+            for iy in (0..my).step_by(8) {
+                py_idx = 0;
+                if iy == 8 {
+                    py_idx = 64 * 2;
+                }
+                for _ in (0..mx).step_by(8) {
+                    // Get Y component
+                    yy = self.mcubuf[py_idx] as i32;
+                    py_idx += 64;
+                    if JD_FORMAT != 2 {
+                        // R
+                        workbuf[pix_idx] = (yy + (1.402f64 * cvacc as f64) as i32 * cr / cvacc)
+                            .clamp(0, 255) as u8;
+                        pix_idx += 1;
+                        // G
+                        workbuf[pix_idx] = (yy
+                            - ((0.344f64 * cvacc as f64) as i32 * cb
+                                + (0.714f64 * cvacc as f64) as i32 * cr)
+                                / cvacc)
+                            .clamp(0, 255) as u8;
+                        //B
+                        pix_idx += 1;
+                        workbuf[pix_idx] = (yy + (1.772f64 * cvacc as f64) as i32 * cb / cvacc)
+                            .clamp(0, 255) as u8;
+                        pix_idx += 1;
+                    } else {
+                        workbuf[pix_idx] = yy as u8;
+                        pix_idx += 1;
+                    }
+                }
+            }
+        }
+
+        // Squeeze up pixel table if a part of MCU is to be truncated
+        mx >>= self.scale as i32;
+        if rx < mx {
+            // Is the MCU spans right edge?
+            let mut s_0_idx = 0;
+            let mut d_idx = 0;
+            for _ in 0..ry {
+                for _ in 0..rx {
+                    // Copy effective pixels
+                    workbuf[d_idx] = workbuf[s_0_idx];
+                    s_0_idx += 1;
+                    d_idx += 1;
+                    if JD_FORMAT != 2 {
+                        workbuf[d_idx] = workbuf[s_0_idx];
+                        s_0_idx += 1;
+                        d_idx += 1;
+                        workbuf[d_idx] = workbuf[s_0_idx];
+                        s_0_idx += 1;
+                        d_idx += 1;
+                    }
+                }
+                // Skip truncated pixels
+                s_0_idx += ((mx - rx) * (if JD_FORMAT != 2 { 3 } else { 1 })) as usize;
+            }
+        }
+
+        // Convert RGB888 to RGB565 if needed
+        if JD_FORMAT == 1 {
+            let mut s_1_idx = 0;
+            let mut d_0_idx = 0;
+            let mut w_0: u16;
+            for _ in 0..rx * ry {
+                // RRRRR-----------
+                w_0 = ((workbuf[s_1_idx] as i32 & 0xf8) << 8) as u16;
+                s_1_idx += 1;
+                // -----GGGGGG-----
+                w_0 = (w_0 as i32 | (workbuf[s_1_idx] as i32 & 0xfc) << 3) as u16;
+                s_1_idx += 1;
+                // -----------BBBBB
+                w_0 = (w_0 as i32 | workbuf[s_1_idx] as i32 >> 3) as u16;
+                s_1_idx += 1;
+
+                workbuf[d_0_idx] = (w_0 & 0xFF) as u8;
+                workbuf[d_0_idx + 1] = (w_0 >> 8) as u8;
+                d_0_idx += 2;
+            }
+        }
+
+        // Output the rectangular
+        // SAFETY: Aligning to u16 slice is safe, because the original slice is aligned
+        // to 32 bits, therefore there are also no residuals (prefix/suffix).
+        // The data in the slices are integers, so these are valid for both i32
+        // and u16.
+        let (_, bitmap, _) = unsafe { self.workbuf.align_to::<u16>() };
+        let bitmap = &bitmap[..(rect.width() * rect.height()) as usize];
+        if output_func.write(self, rect, bitmap) {
+            Ok(())
+        } else {
+            Err(Error::Interrupted)
+        }
+    }
+
+    pub fn mcu_height(&self) -> i16 {
+        self.msy as i16 * 8
+    }
+
+    pub fn width(&self) -> i16 {
+        self.width as i16
+    }
+
+    pub fn height(&self) -> i16 {
+        self.height as i16
+    }
+
+    pub fn set_scale(&mut self, scale: u8) -> Result<(), Error> {
+        if scale > (if JD_USE_SCALE != 0 { 3 } else { 0 }) {
+            return Err(Error::Parameter);
+        }
+        self.scale = scale;
+        Ok(())
+    }
+
+    /// Analyze the JPEG image and Initialize decompressor object
+    pub fn new(input_func: &'i mut dyn JpegInput, pool: &'p mut [u8]) -> Result<Self, Error> {
+        let mut jd = JDEC {
+            dctr: 0,
+            dptr: 0,
+            inbuf: &mut [],
+            dbit: 0,
+            scale: 0,
+            msx: 0,
+            msy: 0,
+            qtid: [0; 3],
+            pool,
+            dcv: [0; 3],
+            rsc: 0,
+            width: 0,
+            height: 0,
+            huffbits: [[&mut [], &mut []], [&mut [], &mut []]],
+            huffcode: [[&mut [], &mut []], [&mut [], &mut []]],
+            huffcode_len: [[0; 2]; 2],
+            huffdata: [[&mut [], &mut []], [&mut [], &mut []]],
+            qttbl: [&mut [], &mut [], &mut [], &mut []],
+            wreg: 0,
+            marker: 0,
+            longofs: [[0; 2]; 2],
+            hufflut_ac: [&mut [], &mut []],
+            hufflut_dc: [&mut [], &mut []],
+            workbuf: &mut [],
+            rst: 0,
+            ncomp: 0,
+            nrst: 0,
+            mcubuf: &mut [],
+            input_func,
+        };
+
+        let mut marker: u16;
+        let mut ofs: u32;
+        let mut len: usize;
+
+        // Allocate stream input buffer
+        jd.inbuf = jd.alloc_slice(JD_SZBUF)?;
+
+        // Find SOI marker
+        marker = 0;
+        ofs = marker as u32;
+        loop {
+            if jd.jpeg_in(Some(0), 1) != 1 {
+                // Err: SOI was not detected
+                return Err(Error::Input);
+            }
+            ofs += 1;
+            marker = ((marker as i32) << 8 | jd.inbuf[0] as i32) as u16;
+            if marker == 0xffd8 {
+                break;
+            }
+        }
+        loop {
+            // Parse JPEG segments
+            // Get a JPEG marker
+            if jd.jpeg_in(Some(0), 4) != 4 {
+                return Err(Error::Input);
+            }
+            // Marker
+            marker = ((jd.inbuf[0] as i32) << 8 | jd.inbuf[1] as i32) as u16;
+            // Length field
+            len = ((jd.inbuf[2] as i32) << 8 | jd.inbuf[3] as i32) as usize;
+            if len <= 2 || marker >> 8 != 0xff {
+                return Err(Error::InvalidData);
+            }
+            len -= 2; // Segment content size
+            ofs += (4 + len) as u32; // Number of bytes loaded
+
+            match marker & 0xff {
+                0xC0 => {
+                    // SOF0 (baseline JPEG)
+                    if len > JD_SZBUF {
+                        return Err(Error::MemoryInput);
+                    }
+                    // Load segment data
+                    if jd.jpeg_in(Some(0), len) != len {
+                        return Err(Error::Input);
+                    }
+                    // Image width in unit of pixel
+                    jd.width = ((jd.inbuf[3] as i32) << 8 | jd.inbuf[4] as i32) as u16;
+                    // Image height in unit of pixel
+                    jd.height = ((jd.inbuf[1] as i32) << 8 | jd.inbuf[2] as i32) as u16;
+                    // Number of color components
+                    jd.ncomp = jd.inbuf[5];
+                    if jd.ncomp != 3 && jd.ncomp != 1 {
+                        // Err: Supports only Grayscale and Y/Cb/Cr
+                        return Err(Error::UnsupportedJpeg);
+                    }
+                    // Check each image component
+                    for i in 0..jd.ncomp as usize {
+                        // Get sampling factor
+                        let b = jd.inbuf[7 + 3 * i];
+                        if i == 0 {
+                            // Y component
+                            if b != 0x11 && b != 0x22 && b != 0x21 {
+                                // Check sampling factor
+                                // Err: Supports only 4:4:4, 4:2:0 or 4:2:2
+                                return Err(Error::UnsupportedJpeg);
+                            }
+                            // Size of MCU [blocks]
+                            jd.msx = (b as i32 >> 4) as u8;
+                            jd.msy = (b as i32 & 15) as u8;
+                        } else if b as i32 != 0x11 {
+                            // Cb/Cr component
+                            // Err: Sampling factor of Cb/Cr must be 1
+                            return Err(Error::UnsupportedJpeg);
+                        }
+                        // Get dequantizer table ID for this component
+                        jd.qtid[i] = jd.inbuf[8 + 3 * i];
+                        if jd.qtid[i] as i32 > 3 {
+                            // Err: Invalid ID
+                            return Err(Error::UnsupportedJpeg);
+                        }
+                    }
+                }
+                0xDD => {
+                    // DRI - Define Restart Interval
+                    if len > JD_SZBUF {
+                        return Err(Error::MemoryInput);
+                    }
+                    // Load segment data
+                    if jd.jpeg_in(Some(0), len) != len {
+                        return Err(Error::Input);
+                    }
+                    // Get restart interval (MCUs)
+                    jd.nrst = ((jd.inbuf[0] as i32) << 8 | jd.inbuf[1] as i32) as u16;
+                }
+                0xC4 => {
+                    // DHT - Define Huffman Tables
+                    if len > JD_SZBUF {
+                        return Err(Error::MemoryInput);
+                    }
+                    // Load segment data
+                    if jd.jpeg_in(Some(0), len) != len {
+                        return Err(Error::Input);
+                    }
+                    // Create huffman tables
+                    jd.create_huffman_tbl(len)?;
+                }
+                0xDB => {
+                    // DQT - Define Quantizer Tables
+                    if len > JD_SZBUF {
+                        return Err(Error::MemoryInput);
+                    }
+                    // Load segment data
+                    if jd.jpeg_in(Some(0), len) != len {
+                        return Err(Error::Input);
+                    }
+                    // Create de-quantizer tables
+                    jd.create_qt_tbl(len)?;
+                }
+                0xDA => {
+                    // SOS - Start of Scan
+                    if len > JD_SZBUF {
+                        return Err(Error::MemoryInput);
+                    }
+                    // Load segment data
+                    if jd.jpeg_in(Some(0), len) != len {
+                        return Err(Error::Input);
+                    }
+                    if jd.width == 0 || jd.height == 0 {
+                        // Err: Invalid image size
+                        return Err(Error::InvalidData);
+                    }
+                    if jd.inbuf[0] as i32 != jd.ncomp as i32 {
+                        // Err: Wrong color components
+                        return Err(Error::UnsupportedJpeg);
+                    }
+                    // Check if all tables corresponding to each components have been loaded
+                    for i in 0..jd.ncomp as usize {
+                        // Get huffman table ID
+                        let b = jd.inbuf[2 + 2 * i];
+                        if b != 0 && b != 0x11 {
+                            // Err: Different table number for DC/AC element
+                            return Err(Error::UnsupportedJpeg);
+                        }
+                        let n = if i != 0 { 1 } else { 0 }; // Component class
+
+                        // Check huffman table for this component
+                        if (jd.huffbits[n][0]).is_empty() || (jd.huffbits[n][1]).is_empty() {
+                            // Err: Not loaded
+                            return Err(Error::InvalidData);
+                        }
+                        // Check dequantizer table for this component
+                        if (jd.qttbl[jd.qtid[i] as usize]).is_empty() {
+                            // Err: Not loaded
+                            return Err(Error::InvalidData);
+                        }
+                    }
+                    // Allocate working buffer for MCU and pixel output
+                    let n = jd.msy as i32 * jd.msx as i32; // Number of Y blocks in the MCU
+                    if n == 0 {
+                        // Err: SOF0 has not been loaded
+                        return Err(Error::InvalidData);
+                    }
+                    len = (n * 64 * 3 + 64) as usize; // Allocate buffer for IDCT and RGB output
+                    if len < 256 {
+                        // but at least 256 byte is required for IDCT
+                        len = 256;
+                    }
+
+                    jd.workbuf = jd.alloc_slice(len / 4)?;
+
+                    // Allocate MCU working buffer
+                    jd.mcubuf = jd.alloc_slice((n as usize + 2) * 64)?;
+
+                    // Align stream read offset to JD_SZBUF
+                    ofs %= JD_SZBUF as u32;
+                    if ofs != 0 {
+                        jd.dctr = jd.jpeg_in(Some(ofs as usize), (JD_SZBUF as u32 - ofs) as usize);
+                    }
+                    jd.dptr = (ofs - (if JD_FASTDECODE != 0 { 0 } else { 1 })) as usize;
+                    return Ok(jd); // Initialization succeeded. Ready to
+                                   // decompress the JPEG image.
+                }
+                // SOF1, SOF2, SOF3, SOF5, SOF6, SOF7, SOF9, SOF10, SOF11, SOF13, SOF14, SOF15, EOI
+                0xC1 | 0xC2 | 0xC3 | 0xC5 | 0xC6 | 0xC7 | 0xC9 | 0xCA | 0xCB | 0xCD | 0xCF
+                | 0xCE | 0xD9 => {
+                    // Unsupported JPEG standard (may be progressive JPEG)
+                    return Err(Error::UnsupportedJpeg);
+                }
+                _ => {
+                    // Unknown segment (comment, exif or etc..)
+                    // Skip segment data (null pointer specifies to remove data from the stream)
+                    if jd.jpeg_in(None, len) != len {
+                        return Err(Error::Input);
+                    }
+                }
+            }
+        }
+    }
+
+    /// Start to decompress the JPEG picture
+    /// `scale`: output de-scaling factor (0 to 3)
+    #[optimize(speed)]
+    pub fn decomp(&mut self, output_func: &mut dyn JpegOutput) -> Result<(), Error> {
+        let mx = (self.msx as i32 * 8) as u32; // Size of the MCU (pixel)
+        let my = (self.msy as i32 * 8) as u32; // Size of the MCU (pixel)
+        let mut y = 0;
+        while y < self.height as u32 {
+            // Vertical loop of MCUs
+            let mut x = 0;
+            while x < self.width as u32 {
+                // Horizontal loop of MCUs
+                if self.nrst != 0 && {
+                    // Process restart interval if enabled
+                    let val = self.rst;
+                    self.rst += 1;
+                    val == self.nrst
+                } {
+                    let val = self.rsc;
+                    self.rsc += 1;
+                    self.restart(val)?;
+                    self.rst = 1;
+                }
+                // Load an MCU (decompress huffman coded stream, dequantize and apply IDCT)
+                self.mcu_load()?;
+                // Output the MCU (YCbCr to RGB, scaling and output)
+                self.mcu_output(x, y, output_func)?;
+                x += mx;
+            }
+            y += my;
+        }
+        Ok(())
+    }
+}
+
+pub fn jpeg(data: &[u8], pos: Point, scale: u8) {
+    let pool = unsafe { get_jpeg_work_buffer(0, true).buffer.as_mut_slice() };
+    let mut out = PixelDataOutput(pos);
+    let mut inp = BufferInput(data);
+    if let Ok(mut jd) = JDEC::new(&mut inp, pool) {
+        let _ = jd.set_scale(scale);
+        let _ = jd.decomp(&mut out);
+    }
+}
+
+pub fn jpeg_info(data: &[u8]) -> Option<(Offset, i16)> {
+    let pool = unsafe { get_jpeg_work_buffer(0, true).buffer.as_mut_slice() };
+    let mut inp = BufferInput(data);
+    if let Ok(jd) = JDEC::new(&mut inp, pool) {
+        let mcu_height = jd.mcu_height();
+        if mcu_height > 16 {
+            return None;
+        }
+        Some((Offset::new(jd.width(), jd.height()), mcu_height))
+    } else {
+        None
+    }
+}
+
+pub fn jpeg_test(data: &[u8]) -> bool {
+    let pool = unsafe { get_jpeg_work_buffer(0, true).buffer.as_mut_slice() };
+    let mut inp = BufferInput(data);
+    if let Ok(mut jd) = JDEC::new(&mut inp, pool) {
+        if jd.mcu_height() > 16 {
+            return false;
+        }
+
+        let mut out = BlackHoleOutput;
+        let mut res = jd.decomp(&mut out);
+        while res == Err(Error::Interrupted) {
+            res = jd.decomp(&mut out);
+        }
+        res.is_ok()
+    } else {
+        false
+    }
+}
+
+pub trait JpegInput {
+    fn read(&mut self, buf: Option<&mut [u8]>, nread: usize) -> usize;
+}
+
+pub struct BufferInput<'i>(pub &'i [u8]);
+
+impl<'i> JpegInput for BufferInput<'i> {
+    fn read(&mut self, inbuf: Option<&mut [u8]>, n_data: usize) -> usize {
+        let len = n_data.min(self.0.len());
+        let (toread, newdata) = self.0.split_at(len);
+        if let Some(inbuf) = inbuf {
+            (inbuf[..len]).copy_from_slice(toread)
+        }
+        self.0 = newdata;
+        len
+    }
+}
+
+pub trait JpegOutput {
+    /// Return `false` to interrupt.
+    fn write(&mut self, jd: &JDEC, rect: Rect, pixels: &[u16]) -> bool;
+}
+
+pub struct BufferOutput<'o> {
+    buffer: &'o mut BufferJpeg,
+    buffer_width: i16,
+    buffer_height: i16,
+    current_line: i16,
+    current_line_pix: i16,
+}
+
+impl<'o> BufferOutput<'o> {
+    pub fn new(buffer: &'o mut BufferJpeg, buffer_width: i16, buffer_height: i16) -> Self {
+        Self {
+            buffer,
+            buffer_width,
+            buffer_height,
+            current_line: 0,
+            current_line_pix: 0,
+        }
+    }
+
+    pub fn buffer(&mut self) -> &mut BufferJpeg {
+        self.buffer
+    }
+}
+
+impl<'o> JpegOutput for BufferOutput<'o> {
+    fn write(&mut self, jd: &JDEC, rect: Rect, bitmap: &[u16]) -> bool {
+        let w = rect.width();
+        let h = rect.height();
+        let x = rect.x0;
+
+        if h > self.buffer_height {
+            // unsupported height, call and let know
+            return true;
+        }
+
+        let buffer_len = (self.buffer_width * self.buffer_height) as usize;
+
+        for i in 0..h {
+            for j in 0..w {
+                let buffer_pos = ((x + j) + (i * self.buffer_width)) as usize;
+                if buffer_pos < buffer_len {
+                    self.buffer.buffer[buffer_pos] = bitmap[(i * w + j) as usize];
+                }
+            }
+        }
+
+        self.current_line_pix += w;
+
+        if self.current_line_pix >= jd.width() {
+            self.current_line_pix = 0;
+            self.current_line += jd.mcu_height();
+            // finished line, abort and continue later
+            return false;
+        }
+
+        true
+    }
+}
+
+pub struct PixelDataOutput(Point);
+
+impl JpegOutput for PixelDataOutput {
+    fn write(&mut self, _jd: &JDEC, rect: Rect, bitmap: &[u16]) -> bool {
+        let pos = self.0;
+        let r = rect.translate(pos.into());
+        let clamped = r.clamp(constant::screen());
+        set_window(clamped);
+        for py in r.y0..r.y1 {
+            for px in r.x0..r.x1 {
+                let p = Point::new(px, py);
+                if clamped.contains(p) {
+                    let off = p - r.top_left();
+                    let c = bitmap[(off.y * rect.width() + off.x) as usize];
+                    pixeldata(c);
+                }
+            }
+        }
+        true
+    }
+}
+
+pub struct BlackHoleOutput;
+
+impl JpegOutput for BlackHoleOutput {
+    fn write(&mut self, _jd: &JDEC, _rect: Rect, _bitmap: &[u16]) -> bool {
+        true
+    }
+}
diff --git a/core/embed/rust/src/ui/display/toif.rs b/core/embed/rust/src/ui/display/toif.rs
new file mode 100644
index 0000000000..2da23f0b9a
--- /dev/null
+++ b/core/embed/rust/src/ui/display/toif.rs
@@ -0,0 +1,129 @@
+use crate::{
+    trezorhal::{
+        display::ToifFormat,
+        uzlib::{UzlibContext, UZLIB_WINDOW_SIZE},
+    },
+    ui::{
+        constant,
+        display::{get_color_table, get_offset, pixeldata, pixeldata_dirty, set_window},
+        geometry::{Alignment2D, Offset, Point, Rect},
+    },
+};
+
+use super::Color;
+
+const TOIF_HEADER_LENGTH: usize = 12;
+
+pub fn icon(icon: &Icon, center: Point, fg_color: Color, bg_color: Color) {
+    let r = Rect::from_center_and_size(center, icon.toif.size());
+    let area = r.translate(get_offset());
+    let clamped = area.clamp(constant::screen());
+    let colortable = get_color_table(fg_color, bg_color);
+
+    set_window(clamped);
+
+    let mut dest = [0_u8; 1];
+
+    let mut window = [0; UZLIB_WINDOW_SIZE];
+    let mut ctx = icon.toif.decompression_context(Some(&mut window));
+
+    for py in area.y0..area.y1 {
+        for px in area.x0..area.x1 {
+            let p = Point::new(px, py);
+            let x = p.x - area.x0;
+
+            if clamped.contains(p) {
+                if x % 2 == 0 {
+                    unwrap!(ctx.uncompress(&mut dest), "Decompression failed");
+                    pixeldata(colortable[(dest[0] & 0xF) as usize]);
+                } else {
+                    pixeldata(colortable[(dest[0] >> 4) as usize]);
+                }
+            } else if x % 2 == 0 {
+                //continue unzipping but dont write to display
+                unwrap!(ctx.uncompress(&mut dest), "Decompression failed");
+            }
+        }
+    }
+
+    pixeldata_dirty();
+}
+
+/// Holding toif data and allowing it to draw itself.
+/// See https://docs.trezor.io/trezor-firmware/misc/toif.html for data format.
+#[derive(PartialEq, Eq, Clone, Copy)]
+pub struct Toif {
+    data: &'static [u8],
+}
+
+impl Toif {
+    pub const fn new(data: &'static [u8]) -> Option<Self> {
+        if data.len() < TOIF_HEADER_LENGTH || data[0] != b'T' || data[1] != b'O' || data[2] != b'I'
+        {
+            return None;
+        }
+        let zdatalen = u32::from_le_bytes([data[8], data[9], data[10], data[11]]) as usize;
+        if zdatalen + TOIF_HEADER_LENGTH != data.len() {
+            return None;
+        }
+        Some(Self { data })
+    }
+
+    pub const fn format(&self) -> ToifFormat {
+        match self.data[3] {
+            b'f' => ToifFormat::FullColorBE,
+            b'g' => ToifFormat::GrayScaleOH,
+            b'F' => ToifFormat::FullColorLE,
+            b'G' => ToifFormat::GrayScaleEH,
+            _ => panic!(),
+        }
+    }
+
+    pub const fn width(&self) -> i16 {
+        u16::from_le_bytes([self.data[4], self.data[5]]) as i16
+    }
+
+    pub const fn height(&self) -> i16 {
+        u16::from_le_bytes([self.data[6], self.data[7]]) as i16
+    }
+
+    pub const fn size(&self) -> Offset {
+        Offset::new(self.width(), self.height())
+    }
+
+    pub fn zdata(&self) -> &'static [u8] {
+        &self.data[TOIF_HEADER_LENGTH..]
+    }
+
+    pub fn uncompress(&self, dest: &mut [u8]) {
+        let mut ctx = self.decompression_context(None);
+        unwrap!(ctx.uncompress(dest));
+    }
+
+    pub fn decompression_context<'a>(
+        &'a self,
+        window: Option<&'a mut [u8; UZLIB_WINDOW_SIZE]>,
+    ) -> UzlibContext {
+        UzlibContext::new(self.zdata(), window)
+    }
+}
+
+#[derive(PartialEq, Eq, Clone, Copy)]
+pub struct Icon {
+    pub toif: Toif,
+}
+
+impl Icon {
+    pub fn new(data: &'static [u8]) -> Self {
+        let toif = unwrap!(Toif::new(data));
+        assert!(toif.format() == ToifFormat::GrayScaleEH);
+        Self { toif }
+    }
+
+    /// Display the icon with baseline Point, aligned according to the
+    /// `alignment` argument.
+    pub fn draw(&self, baseline: Point, alignment: Alignment2D, fg_color: Color, bg_color: Color) {
+        let r = Rect::snap(baseline, self.toif.size(), alignment);
+        icon(self, r.center(), fg_color, bg_color);
+    }
+}
diff --git a/core/embed/rust/src/ui/event.rs b/core/embed/rust/src/ui/event.rs
index 0700335a86..3c273f9969 100644
--- a/core/embed/rust/src/ui/event.rs
+++ b/core/embed/rust/src/ui/event.rs
@@ -53,3 +53,9 @@ impl TouchEvent {
         Ok(result)
     }
 }
+
+#[derive(Copy, Clone, PartialEq, Eq)]
+pub enum USBEvent {
+    /// USB host has connected/disconnected.
+    Connected(bool),
+}
diff --git a/core/embed/rust/src/ui/geometry.rs b/core/embed/rust/src/ui/geometry.rs
index 09703cb76a..3397069216 100644
--- a/core/embed/rust/src/ui/geometry.rs
+++ b/core/embed/rust/src/ui/geometry.rs
@@ -77,13 +77,13 @@ impl Offset {
 
     /// With `self` representing a rectangle size, returns top-left corner of
     /// the rectangle such that it is aligned relative to the `point`.
-    pub const fn snap(self, point: Point, x: Alignment, y: Alignment) -> Point {
-        let x_off = match x {
+    pub const fn snap(self, point: Point, alignment: Alignment2D) -> Point {
+        let x_off = match alignment.0 {
             Alignment::Start => 0,
             Alignment::Center => self.x / 2,
             Alignment::End => self.x,
         };
-        let y_off = match y {
+        let y_off = match alignment.1 {
             Alignment::Start => 0,
             Alignment::Center => self.y / 2,
             Alignment::End => self.y,
@@ -224,6 +224,12 @@ impl Rect {
         Self::new(Point::zero(), Point::zero())
     }
 
+    /// Returns a rectangle of `size` such that `point` is on position specified
+    /// by `alignment`.
+    pub const fn snap(point: Point, size: Offset, alignment: Alignment2D) -> Rect {
+        Self::from_top_left_and_size(size.snap(point, alignment), size)
+    }
+
     pub const fn from_top_left_and_size(p0: Point, size: Offset) -> Self {
         Self {
             x0: p0.x,
@@ -234,12 +240,12 @@ impl Rect {
     }
 
     pub const fn from_center_and_size(p: Point, size: Offset) -> Self {
-        Self {
-            x0: p.x - size.x / 2,
-            y0: p.y - size.y / 2,
-            x1: p.x + size.x / 2,
-            y1: p.y + size.y / 2,
-        }
+        let x0 = p.x - size.x / 2;
+        let y0 = p.y - size.y / 2;
+        let x1 = x0 + size.x;
+        let y1 = y0 + size.y;
+
+        Self { x0, y0, x1, y1 }
     }
 
     pub const fn with_top_left(self, p0: Point) -> Self {
@@ -290,6 +296,10 @@ impl Rect {
         self.top_left().center(self.bottom_right())
     }
 
+    pub const fn top_center(&self) -> Point {
+        self.top_left().center(self.top_right())
+    }
+
     pub const fn bottom_center(&self) -> Point {
         self.bottom_left().center(self.bottom_right())
     }
@@ -447,6 +457,15 @@ pub enum Alignment {
     End,
 }
 
+pub type Alignment2D = (Alignment, Alignment);
+
+pub const TOP_LEFT: Alignment2D = (Alignment::Start, Alignment::Start);
+pub const TOP_RIGHT: Alignment2D = (Alignment::End, Alignment::Start);
+pub const TOP_CENTER: Alignment2D = (Alignment::Center, Alignment::Start);
+pub const CENTER: Alignment2D = (Alignment::Center, Alignment::Center);
+pub const BOTTOM_LEFT: Alignment2D = (Alignment::Start, Alignment::End);
+pub const BOTTOM_RIGHT: Alignment2D = (Alignment::End, Alignment::End);
+
 #[derive(Copy, Clone, PartialEq, Eq)]
 pub enum Axis {
     Horizontal,
diff --git a/core/embed/rust/src/ui/layout/obj.rs b/core/embed/rust/src/ui/layout/obj.rs
index e361141150..4f6c82462d 100644
--- a/core/embed/rust/src/ui/layout/obj.rs
+++ b/core/embed/rust/src/ui/layout/obj.rs
@@ -6,6 +6,7 @@ use core::{
 use crate::{
     error::Error,
     micropython::{
+        buffer::StrBuffer,
         gc::Gc,
         map::Map,
         obj::{Obj, ObjBase},
@@ -17,6 +18,7 @@ use crate::{
     ui::{
         component::{Child, Component, Event, EventCtx, Never, TimerToken},
         constant,
+        display::sync,
         geometry::Rect,
     },
 };
@@ -25,6 +27,7 @@ use crate::{
 use crate::ui::event::ButtonEvent;
 #[cfg(feature = "touch")]
 use crate::ui::event::TouchEvent;
+use crate::ui::event::USBEvent;
 
 /// Conversion trait implemented by components that know how to convert their
 /// message values into MicroPython `Obj`s.
@@ -60,8 +63,9 @@ use maybe_trace::MaybeTrace;
 pub trait ObjComponent: MaybeTrace {
     fn obj_place(&mut self, bounds: Rect) -> Rect;
     fn obj_event(&mut self, ctx: &mut EventCtx, event: Event) -> Result<Obj, Error>;
-    fn obj_paint(&mut self);
+    fn obj_paint(&mut self) -> bool;
     fn obj_bounds(&self, sink: &mut dyn FnMut(Rect));
+    fn obj_skip_paint(&mut self) {}
 }
 
 impl<T> ObjComponent for Child<T>
@@ -80,13 +84,19 @@ where
         }
     }
 
-    fn obj_paint(&mut self) {
+    fn obj_paint(&mut self) -> bool {
+        let will_paint = self.will_paint();
         self.paint();
+        will_paint
     }
 
     fn obj_bounds(&self, sink: &mut dyn FnMut(Rect)) {
         self.bounds(sink)
     }
+
+    fn obj_skip_paint(&mut self) {
+        self.skip_paint()
+    }
 }
 
 /// `LayoutObj` is a GC-allocated object exported to MicroPython, with type
@@ -126,6 +136,13 @@ impl LayoutObj {
         })
     }
 
+    pub fn skip_first_paint(&self) {
+        let mut inner = self.inner.borrow_mut();
+
+        // SAFETY: `inner.root` is unique because of the `inner.borrow_mut()`.
+        unsafe { Gc::as_mut(&mut inner.root) }.obj_skip_paint();
+    }
+
     /// Timer callback is expected to be a callable object of the following
     /// form: `def timer(token: int, deadline_in_ms: int)`.
     fn obj_set_timer_fn(&self, timer_fn: Obj) {
@@ -173,8 +190,9 @@ impl LayoutObj {
         Ok(msg)
     }
 
-    /// Run a paint pass over the component tree.
-    fn obj_paint_if_requested(&self) {
+    /// Run a paint pass over the component tree. Returns true if any component
+    /// actually requested painting since last invocation of the function.
+    fn obj_paint_if_requested(&self) -> bool {
         let mut inner = self.inner.borrow_mut();
 
         // Place the root component on the screen in case it was previously requested.
@@ -183,8 +201,10 @@ impl LayoutObj {
             unsafe { Gc::as_mut(&mut inner.root) }.obj_place(constant::screen());
         }
 
+        sync();
+
         // SAFETY: `inner.root` is unique because of the `inner.borrow_mut()`.
-        unsafe { Gc::as_mut(&mut inner.root) }.obj_paint();
+        unsafe { Gc::as_mut(&mut inner.root) }.obj_paint()
     }
 
     /// Run a tracing pass over the component tree. Passed `callback` is called
@@ -271,6 +291,8 @@ impl LayoutObj {
                 Qstr::MP_QSTR_attach_timer_fn => obj_fn_2!(ui_layout_attach_timer_fn).as_obj(),
                 Qstr::MP_QSTR_touch_event => obj_fn_var!(4, 4, ui_layout_touch_event).as_obj(),
                 Qstr::MP_QSTR_button_event => obj_fn_var!(3, 3, ui_layout_button_event).as_obj(),
+                Qstr::MP_QSTR_progress_event => obj_fn_var!(3, 3, ui_layout_progress_event).as_obj(),
+                Qstr::MP_QSTR_usb_event => obj_fn_var!(2, 2, ui_layout_usb_event).as_obj(),
                 Qstr::MP_QSTR_timer => obj_fn_2!(ui_layout_timer).as_obj(),
                 Qstr::MP_QSTR_paint => obj_fn_1!(ui_layout_paint).as_obj(),
                 Qstr::MP_QSTR_request_complete_repaint => obj_fn_1!(ui_layout_request_complete_repaint).as_obj(),
@@ -335,8 +357,10 @@ impl TryFrom<Duration> for Obj {
     }
 }
 
-impl From<Never> for Obj {
-    fn from(_: Never) -> Self {
+impl TryFrom<Never> for Obj {
+    type Error = Error;
+
+    fn try_from(_: Never) -> Result<Self, Self::Error> {
         unreachable!()
     }
 }
@@ -394,6 +418,33 @@ extern "C" fn ui_layout_button_event(_n_args: usize, _args: *const Obj) -> Obj {
     Obj::const_none()
 }
 
+extern "C" fn ui_layout_progress_event(n_args: usize, args: *const Obj) -> Obj {
+    let block = |args: &[Obj], _kwargs: &Map| {
+        if args.len() != 3 {
+            return Err(Error::TypeError);
+        }
+        let this: Gc<LayoutObj> = args[0].try_into()?;
+        let value: u16 = args[1].try_into()?;
+        let description: StrBuffer = args[2].try_into()?;
+        let msg = this.obj_event(Event::Progress(value, description.as_ref()))?;
+        Ok(msg)
+    };
+    unsafe { util::try_with_args_and_kwargs(n_args, args, &Map::EMPTY, block) }
+}
+
+extern "C" fn ui_layout_usb_event(n_args: usize, args: *const Obj) -> Obj {
+    let block = |args: &[Obj], _kwargs: &Map| {
+        if args.len() != 2 {
+            return Err(Error::TypeError);
+        }
+        let this: Gc<LayoutObj> = args[0].try_into()?;
+        let event = USBEvent::Connected(args[1].try_into()?);
+        let msg = this.obj_event(Event::USB(event))?;
+        Ok(msg)
+    };
+    unsafe { util::try_with_args_and_kwargs(n_args, args, &Map::EMPTY, block) }
+}
+
 extern "C" fn ui_layout_timer(this: Obj, token: Obj) -> Obj {
     let block = || {
         let this: Gc<LayoutObj> = this.try_into()?;
@@ -407,8 +458,8 @@ extern "C" fn ui_layout_timer(this: Obj, token: Obj) -> Obj {
 extern "C" fn ui_layout_paint(this: Obj) -> Obj {
     let block = || {
         let this: Gc<LayoutObj> = this.try_into()?;
-        this.obj_paint_if_requested();
-        Ok(Obj::const_true())
+        let painted = this.obj_paint_if_requested().into();
+        Ok(painted)
     };
     unsafe { util::try_or_raise(block) }
 }
diff --git a/core/embed/rust/src/ui/layout/util.rs b/core/embed/rust/src/ui/layout/util.rs
index c07773954b..e97ea0cd43 100644
--- a/core/embed/rust/src/ui/layout/util.rs
+++ b/core/embed/rust/src/ui/layout/util.rs
@@ -6,15 +6,28 @@ use crate::{
         iter::{Iter, IterBuf},
         list::List,
         obj::Obj,
+        util::try_or_raise,
     },
-    ui::component::text::{
-        paragraphs::{Paragraph, ParagraphSource, ParagraphStrType},
-        TextStyle,
+    ui::{
+        component::text::{
+            paragraphs::{Paragraph, ParagraphSource, ParagraphStrType},
+            TextStyle,
+        },
+        util::set_animation_disabled,
     },
 };
 use cstr_core::cstr;
 use heapless::Vec;
 
+#[cfg(feature = "jpeg")]
+use crate::{
+    micropython::{
+        buffer::get_buffer,
+        ffi::{mp_obj_new_int, mp_obj_new_tuple},
+    },
+    ui::display::tjpgd::{jpeg_info, jpeg_test},
+};
+
 pub fn iter_into_objs<const N: usize>(iterable: Obj) -> Result<[Obj; N], Error> {
     let err = Error::ValueError(cstr!("Invalid iterable length"));
     let mut vec = Vec::<Obj, N>::new();
@@ -228,3 +241,53 @@ impl ParagraphStrType for StrBuffer {
         self.offset(chars)
     }
 }
+
+pub extern "C" fn upy_disable_animation(disable: Obj) -> Obj {
+    let block = || {
+        set_animation_disabled(disable.try_into()?);
+        Ok(Obj::const_none())
+    };
+    unsafe { try_or_raise(block) }
+}
+
+#[cfg(feature = "jpeg")]
+pub extern "C" fn upy_jpeg_info(data: Obj) -> Obj {
+    let block = || {
+        let buffer = unsafe { get_buffer(data) };
+
+        if let Ok(buffer) = buffer {
+            let info = jpeg_info(buffer);
+
+            if let Some(info) = info {
+                let obj = unsafe {
+                    let values = [
+                        mp_obj_new_int(info.0.x as _),
+                        mp_obj_new_int(info.0.y as _),
+                        mp_obj_new_int(info.1 as _),
+                    ];
+                    mp_obj_new_tuple(3, values.as_ptr())
+                };
+
+                Ok(obj)
+            } else {
+                Err(Error::ValueError(cstr!("Invalid image format.")))
+            }
+        } else {
+            Err(Error::ValueError(cstr!("Buffer error.")))
+        }
+    };
+
+    unsafe { try_or_raise(block) }
+}
+
+#[cfg(feature = "jpeg")]
+pub extern "C" fn upy_jpeg_test(data: Obj) -> Obj {
+    let block = || {
+        let buffer =
+            unsafe { get_buffer(data) }.map_err(|_| Error::ValueError(cstr!("Buffer error.")))?;
+        let result = jpeg_test(buffer);
+        Ok(result.into())
+    };
+
+    unsafe { try_or_raise(block) }
+}
diff --git a/core/embed/rust/src/ui/mod.rs b/core/embed/rust/src/ui/mod.rs
index 4d792aa7ba..e7aec850f3 100644
--- a/core/embed/rust/src/ui/mod.rs
+++ b/core/embed/rust/src/ui/mod.rs
@@ -13,8 +13,6 @@ mod util;
 #[cfg(feature = "micropython")]
 pub mod layout;
 
-#[cfg(feature = "model_t1")]
-pub mod model_t1;
 #[cfg(feature = "model_tr")]
 pub mod model_tr;
 #[cfg(feature = "model_tt")]
diff --git a/core/embed/rust/src/ui/model_t1/component/button.rs b/core/embed/rust/src/ui/model_t1/component/button.rs
deleted file mode 100644
index cf9ee45d04..0000000000
--- a/core/embed/rust/src/ui/model_t1/component/button.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-use crate::ui::{
-    component::{Component, Event, EventCtx},
-    display::{self, Color, Font},
-    event::{ButtonEvent, PhysicalButton},
-    geometry::{Offset, Point, Rect},
-};
-
-use super::theme;
-
-pub enum ButtonMsg {
-    Clicked,
-}
-
-#[derive(Copy, Clone)]
-pub enum ButtonPos {
-    Left,
-    Right,
-}
-
-impl ButtonPos {
-    fn hit(&self, b: &PhysicalButton) -> bool {
-        matches!(
-            (self, b),
-            (Self::Left, PhysicalButton::Left) | (Self::Right, PhysicalButton::Right)
-        )
-    }
-}
-
-pub struct Button<T> {
-    area: Rect,
-    pos: ButtonPos,
-    baseline: Point,
-    content: ButtonContent<T>,
-    styles: ButtonStyleSheet,
-    state: State,
-}
-
-impl<T: AsRef<str>> Button<T> {
-    pub fn new(pos: ButtonPos, content: ButtonContent<T>, styles: ButtonStyleSheet) -> Self {
-        Self {
-            pos,
-            content,
-            styles,
-            baseline: Point::zero(),
-            area: Rect::zero(),
-            state: State::Released,
-        }
-    }
-
-    pub fn with_text(pos: ButtonPos, text: T, styles: ButtonStyleSheet) -> Self {
-        Self::new(pos, ButtonContent::Text(text), styles)
-    }
-
-    pub fn with_icon(pos: ButtonPos, image: &'static [u8], styles: ButtonStyleSheet) -> Self {
-        Self::new(pos, ButtonContent::Icon(image), styles)
-    }
-
-    pub fn content(&self) -> &ButtonContent<T> {
-        &self.content
-    }
-
-    fn style(&self) -> &ButtonStyle {
-        match self.state {
-            State::Released => self.styles.normal,
-            State::Pressed => self.styles.active,
-        }
-    }
-
-    fn set(&mut self, ctx: &mut EventCtx, state: State) {
-        if self.state != state {
-            self.state = state;
-            ctx.request_paint();
-        }
-    }
-
-    fn placement(
-        area: Rect,
-        pos: ButtonPos,
-        content: &ButtonContent<T>,
-        styles: &ButtonStyleSheet,
-    ) -> (Rect, Point) {
-        let border_width = if styles.normal.border_horiz { 2 } else { 0 };
-        let content_width = match content {
-            ButtonContent::Text(text) => styles.normal.font.text_width(text.as_ref()) - 1,
-            ButtonContent::Icon(_icon) => todo!(),
-        };
-        let button_width = content_width + 2 * border_width;
-        let area = match pos {
-            ButtonPos::Left => area.split_left(button_width).0,
-            ButtonPos::Right => area.split_right(button_width).1,
-        };
-
-        let start_of_baseline = area.bottom_left() + Offset::new(border_width, -2);
-
-        (area, start_of_baseline)
-    }
-}
-
-impl<T> Component for Button<T>
-where
-    T: AsRef<str>,
-{
-    type Msg = ButtonMsg;
-
-    fn place(&mut self, bounds: Rect) -> Rect {
-        let (area, baseline) = Self::placement(bounds, self.pos, &self.content, &self.styles);
-        self.area = area;
-        self.baseline = baseline;
-        self.area
-    }
-
-    fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
-        match event {
-            Event::Button(ButtonEvent::ButtonPressed(which)) if self.pos.hit(&which) => {
-                self.set(ctx, State::Pressed);
-            }
-            Event::Button(ButtonEvent::ButtonReleased(which)) if self.pos.hit(&which) => {
-                if matches!(self.state, State::Pressed) {
-                    self.set(ctx, State::Released);
-                    return Some(ButtonMsg::Clicked);
-                }
-            }
-            _ => {}
-        };
-        None
-    }
-
-    fn paint(&mut self) {
-        let style = self.style();
-
-        match &self.content {
-            ButtonContent::Text(text) => {
-                let background_color = style.text_color.negate();
-                if style.border_horiz {
-                    display::rect_fill_rounded1(self.area, background_color, theme::BG);
-                } else {
-                    display::rect_fill(self.area, background_color)
-                }
-
-                display::text(
-                    self.baseline,
-                    text.as_ref(),
-                    style.font,
-                    style.text_color,
-                    background_color,
-                );
-            }
-            ButtonContent::Icon(_image) => {
-                todo!();
-            }
-        }
-    }
-}
-
-#[cfg(feature = "ui_debug")]
-impl<T> crate::trace::Trace for Button<T>
-where
-    T: AsRef<str> + crate::trace::Trace,
-{
-    fn trace(&self, t: &mut dyn crate::trace::Tracer) {
-        t.open("Button");
-        match &self.content {
-            ButtonContent::Text(text) => t.field("text", text),
-            ButtonContent::Icon(_) => t.symbol("icon"),
-        }
-        t.close();
-    }
-}
-
-#[derive(PartialEq, Eq)]
-enum State {
-    Released,
-    Pressed,
-}
-
-pub enum ButtonContent<T> {
-    Text(T),
-    Icon(&'static [u8]),
-}
-
-pub struct ButtonStyleSheet {
-    pub normal: &'static ButtonStyle,
-    pub active: &'static ButtonStyle,
-}
-
-pub struct ButtonStyle {
-    pub font: Font,
-    pub text_color: Color,
-    pub border_horiz: bool,
-}
diff --git a/core/embed/rust/src/ui/model_t1/component/dialog.rs b/core/embed/rust/src/ui/model_t1/component/dialog.rs
deleted file mode 100644
index 39820b3b36..0000000000
--- a/core/embed/rust/src/ui/model_t1/component/dialog.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use super::button::{Button, ButtonMsg::Clicked};
-use crate::ui::{
-    component::{Child, Component, Event, EventCtx},
-    display::Font,
-    geometry::Rect,
-};
-
-pub enum DialogMsg<T> {
-    Content(T),
-    LeftClicked,
-    RightClicked,
-}
-
-pub struct Dialog<T, U> {
-    content: Child<T>,
-    left_btn: Option<Child<Button<U>>>,
-    right_btn: Option<Child<Button<U>>>,
-}
-
-impl<T, U> Dialog<T, U>
-where
-    T: Component,
-    U: AsRef<str>,
-{
-    pub fn new(content: T, left: Option<Button<U>>, right: Option<Button<U>>) -> Self {
-        Self {
-            content: Child::new(content),
-            left_btn: left.map(Child::new),
-            right_btn: right.map(Child::new),
-        }
-    }
-
-    pub fn inner(&self) -> &T {
-        self.content.inner()
-    }
-}
-
-impl<T, U> Component for Dialog<T, U>
-where
-    T: Component,
-    U: AsRef<str>,
-{
-    type Msg = DialogMsg<T::Msg>;
-
-    fn place(&mut self, bounds: Rect) -> Rect {
-        let button_height = Font::BOLD.line_height() + 2;
-        let (content_area, button_area) = bounds.split_bottom(button_height);
-        self.content.place(content_area);
-        self.left_btn.as_mut().map(|b| b.place(button_area));
-        self.right_btn.as_mut().map(|b| b.place(button_area));
-        bounds
-    }
-
-    fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
-        if let Some(msg) = self.content.event(ctx, event) {
-            Some(DialogMsg::Content(msg))
-        } else if let Some(Clicked) = self.left_btn.as_mut().and_then(|b| b.event(ctx, event)) {
-            Some(DialogMsg::LeftClicked)
-        } else if let Some(Clicked) = self.right_btn.as_mut().and_then(|b| b.event(ctx, event)) {
-            Some(DialogMsg::RightClicked)
-        } else {
-            None
-        }
-    }
-
-    fn paint(&mut self) {
-        self.content.paint();
-        if let Some(b) = self.left_btn.as_mut() {
-            b.paint();
-        }
-        if let Some(b) = self.right_btn.as_mut() {
-            b.paint();
-        }
-    }
-}
-
-#[cfg(feature = "ui_debug")]
-impl<T, U> crate::trace::Trace for Dialog<T, U>
-where
-    T: crate::trace::Trace,
-    U: crate::trace::Trace + AsRef<str>,
-{
-    fn trace(&self, t: &mut dyn crate::trace::Tracer) {
-        t.open("Dialog");
-        t.field("content", &self.content);
-        if let Some(label) = &self.left_btn {
-            t.field("left", label);
-        }
-        if let Some(label) = &self.right_btn {
-            t.field("right", label);
-        }
-        t.close();
-    }
-}
diff --git a/core/embed/rust/src/ui/model_t1/component/frame.rs b/core/embed/rust/src/ui/model_t1/component/frame.rs
deleted file mode 100644
index 47e7a489cf..0000000000
--- a/core/embed/rust/src/ui/model_t1/component/frame.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use super::theme;
-use crate::ui::{
-    component::{Child, Component, Event, EventCtx},
-    display::{self, Font},
-    geometry::{Insets, Offset, Rect},
-};
-
-pub struct Frame<T, U> {
-    area: Rect,
-    title: U,
-    content: Child<T>,
-}
-
-impl<T, U> Frame<T, U>
-where
-    T: Component,
-    U: AsRef<str>,
-{
-    pub fn new(title: U, content: T) -> Self {
-        Self {
-            title,
-            area: Rect::zero(),
-            content: Child::new(content),
-        }
-    }
-
-    pub fn inner(&self) -> &T {
-        self.content.inner()
-    }
-}
-
-impl<T, U> Component for Frame<T, U>
-where
-    T: Component,
-    U: AsRef<str>,
-{
-    type Msg = T::Msg;
-
-    fn place(&mut self, bounds: Rect) -> Rect {
-        const TITLE_SPACE: i16 = 4;
-
-        let (title_area, content_area) = bounds.split_top(Font::BOLD.line_height());
-        let content_area = content_area.inset(Insets::top(TITLE_SPACE));
-
-        self.area = title_area;
-        self.content.place(content_area);
-        bounds
-    }
-
-    fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
-        self.content.event(ctx, event)
-    }
-
-    fn paint(&mut self) {
-        display::text(
-            self.area.bottom_left() - Offset::y(2),
-            self.title.as_ref(),
-            Font::BOLD,
-            theme::FG,
-            theme::BG,
-        );
-        display::dotted_line(self.area.bottom_left(), self.area.width(), theme::FG);
-        self.content.paint();
-    }
-}
-
-#[cfg(feature = "ui_debug")]
-impl<T, U> crate::trace::Trace for Frame<T, U>
-where
-    T: crate::trace::Trace,
-    U: crate::trace::Trace + AsRef<str>,
-{
-    fn trace(&self, t: &mut dyn crate::trace::Tracer) {
-        t.open("Frame");
-        t.field("title", &self.title);
-        t.field("content", &self.content);
-        t.close();
-    }
-}
diff --git a/core/embed/rust/src/ui/model_t1/component/mod.rs b/core/embed/rust/src/ui/model_t1/component/mod.rs
deleted file mode 100644
index dc8c10edb5..0000000000
--- a/core/embed/rust/src/ui/model_t1/component/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-mod button;
-mod dialog;
-mod frame;
-mod page;
-
-use super::theme;
-
-pub use button::{Button, ButtonContent, ButtonMsg, ButtonPos, ButtonStyle, ButtonStyleSheet};
-pub use dialog::{Dialog, DialogMsg};
-pub use frame::Frame;
-pub use page::ButtonPage;
diff --git a/core/embed/rust/src/ui/model_t1/component/page.rs b/core/embed/rust/src/ui/model_t1/component/page.rs
deleted file mode 100644
index dadb410937..0000000000
--- a/core/embed/rust/src/ui/model_t1/component/page.rs
+++ /dev/null
@@ -1,227 +0,0 @@
-use crate::ui::{
-    component::{Component, ComponentExt, Event, EventCtx, Never, Pad, PageMsg, Paginate},
-    display::{self, Color, Font},
-    geometry::{Insets, Offset, Point, Rect},
-};
-
-use super::{theme, Button, ButtonMsg, ButtonPos};
-
-pub struct ButtonPage<T> {
-    content: T,
-    scrollbar: ScrollBar,
-    pad: Pad,
-    prev: Button<&'static str>,
-    next: Button<&'static str>,
-    cancel: Button<&'static str>,
-    confirm: Button<&'static str>,
-}
-
-impl<T> ButtonPage<T>
-where
-    T: Paginate,
-    T: Component,
-{
-    pub fn new(content: T, background: Color) -> Self {
-        Self {
-            content,
-            scrollbar: ScrollBar::vertical(),
-            pad: Pad::with_background(background),
-            prev: Button::with_text(ButtonPos::Left, "BACK", theme::button_cancel()),
-            next: Button::with_text(ButtonPos::Right, "NEXT", theme::button_default()),
-            cancel: Button::with_text(ButtonPos::Left, "CANCEL", theme::button_cancel()),
-            confirm: Button::with_text(ButtonPos::Right, "CONFIRM", theme::button_default()),
-        }
-    }
-
-    fn change_page(&mut self, ctx: &mut EventCtx, page: usize) {
-        // Change the page in the content, clear the background under it and make sure
-        // it gets completely repainted.
-        self.content.change_page(page);
-        self.content.request_complete_repaint(ctx);
-        self.pad.clear();
-    }
-}
-
-impl<T> Component for ButtonPage<T>
-where
-    T: Component,
-    T: Paginate,
-{
-    type Msg = PageMsg<T::Msg, bool>;
-
-    fn place(&mut self, bounds: Rect) -> Rect {
-        let button_height = Font::BOLD.line_height() + 2;
-        let (content_area, button_area) = bounds.split_bottom(button_height);
-        let (content_area, scrollbar_area) = content_area.split_right(ScrollBar::WIDTH);
-        let content_area = content_area.inset(Insets::top(1));
-        self.pad.place(bounds);
-        self.content.place(content_area);
-        let page_count = self.content.page_count();
-        self.scrollbar.set_count_and_active_page(page_count, 0);
-        self.scrollbar.place(scrollbar_area);
-        self.prev.place(button_area);
-        self.next.place(button_area);
-        self.cancel.place(button_area);
-        self.confirm.place(button_area);
-        bounds
-    }
-
-    fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
-        ctx.set_page_count(self.scrollbar.page_count);
-        if self.scrollbar.has_previous_page() {
-            if let Some(ButtonMsg::Clicked) = self.prev.event(ctx, event) {
-                // Scroll up.
-                self.scrollbar.go_to_previous_page();
-                self.change_page(ctx, self.scrollbar.active_page);
-                return None;
-            }
-        } else if let Some(ButtonMsg::Clicked) = self.cancel.event(ctx, event) {
-            return Some(PageMsg::Controls(false));
-        }
-
-        if self.scrollbar.has_next_page() {
-            if let Some(ButtonMsg::Clicked) = self.next.event(ctx, event) {
-                // Scroll down.
-                self.scrollbar.go_to_next_page();
-                self.change_page(ctx, self.scrollbar.active_page);
-                return None;
-            }
-        } else if let Some(ButtonMsg::Clicked) = self.confirm.event(ctx, event) {
-            return Some(PageMsg::Controls(true));
-        }
-
-        if let Some(msg) = self.content.event(ctx, event) {
-            return Some(PageMsg::Content(msg));
-        }
-        None
-    }
-
-    fn paint(&mut self) {
-        self.pad.paint();
-        self.content.paint();
-        self.scrollbar.paint();
-        if self.scrollbar.has_previous_page() {
-            self.prev.paint();
-        } else {
-            self.cancel.paint();
-        }
-        if self.scrollbar.has_next_page() {
-            self.next.paint();
-        } else {
-            self.confirm.paint();
-        }
-    }
-}
-
-#[cfg(feature = "ui_debug")]
-impl<T> crate::trace::Trace for ButtonPage<T>
-where
-    T: crate::trace::Trace,
-{
-    fn trace(&self, t: &mut dyn crate::trace::Tracer) {
-        t.open("ButtonPage");
-        t.field("active_page", &self.scrollbar.active_page);
-        t.field("page_count", &self.scrollbar.page_count);
-        t.field("content", &self.content);
-        t.close();
-    }
-}
-
-pub struct ScrollBar {
-    area: Rect,
-    page_count: usize,
-    active_page: usize,
-}
-
-impl ScrollBar {
-    pub const WIDTH: i16 = 8;
-    pub const DOT_SIZE: Offset = Offset::new(4, 4);
-    pub const DOT_INTERVAL: i16 = 6;
-
-    pub fn vertical() -> Self {
-        Self {
-            area: Rect::zero(),
-            page_count: 0,
-            active_page: 0,
-        }
-    }
-
-    pub fn set_count_and_active_page(&mut self, page_count: usize, active_page: usize) {
-        self.page_count = page_count;
-        self.active_page = active_page;
-    }
-
-    pub fn has_next_page(&self) -> bool {
-        self.active_page < self.page_count - 1
-    }
-
-    pub fn has_previous_page(&self) -> bool {
-        self.active_page > 0
-    }
-
-    pub fn go_to_next_page(&mut self) {
-        self.active_page = self.active_page.saturating_add(1).min(self.page_count - 1);
-    }
-
-    pub fn go_to_previous_page(&mut self) {
-        self.active_page = self.active_page.saturating_sub(1);
-    }
-
-    fn paint_dot(&self, active: bool, top_left: Point) {
-        let sides = [
-            Rect::from_top_left_and_size(top_left + Offset::x(1), Offset::new(2, 1)),
-            Rect::from_top_left_and_size(top_left + Offset::y(1), Offset::new(1, 2)),
-            Rect::from_top_left_and_size(
-                top_left + Offset::new(1, Self::DOT_SIZE.y - 1),
-                Offset::new(2, 1),
-            ),
-            Rect::from_top_left_and_size(
-                top_left + Offset::new(Self::DOT_SIZE.x - 1, 1),
-                Offset::new(1, 2),
-            ),
-        ];
-        for side in sides {
-            display::rect_fill(side, theme::FG)
-        }
-        if active {
-            display::rect_fill(
-                Rect::from_top_left_and_size(top_left, Self::DOT_SIZE).inset(Insets::uniform(1)),
-                theme::FG,
-            )
-        }
-    }
-}
-
-impl Component for ScrollBar {
-    type Msg = Never;
-
-    fn place(&mut self, bounds: Rect) -> Rect {
-        self.area = bounds;
-        self.area
-    }
-
-    fn event(&mut self, _ctx: &mut EventCtx, _event: Event) -> Option<Self::Msg> {
-        None
-    }
-
-    fn paint(&mut self) {
-        let count = self.page_count as i16;
-        let interval = {
-            let available_height = self.area.height();
-            let naive_height = count * Self::DOT_INTERVAL;
-            if naive_height > available_height {
-                available_height / count
-            } else {
-                Self::DOT_INTERVAL
-            }
-        };
-        let mut dot = Point::new(
-            self.area.center().x - Self::DOT_SIZE.x / 2,
-            self.area.center().y - (count / 2) * interval,
-        );
-        for i in 0..self.page_count {
-            self.paint_dot(i == self.active_page, dot);
-            dot.y += interval
-        }
-    }
-}
diff --git a/core/embed/rust/src/ui/model_t1/constant.rs b/core/embed/rust/src/ui/model_t1/constant.rs
deleted file mode 100644
index d4de5b79bf..0000000000
--- a/core/embed/rust/src/ui/model_t1/constant.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use crate::ui::geometry::{Offset, Point, Rect};
-
-pub const WIDTH: i16 = 128;
-pub const HEIGHT: i16 = 64;
-pub const LINE_SPACE: i16 = 1;
-pub const FONT_BPP: i16 = 1;
-
-pub const fn size() -> Offset {
-    Offset::new(WIDTH, HEIGHT)
-}
-
-pub const fn screen() -> Rect {
-    Rect::from_top_left_and_size(Point::zero(), size())
-}
diff --git a/core/embed/rust/src/ui/model_t1/layout.rs b/core/embed/rust/src/ui/model_t1/layout.rs
deleted file mode 100644
index d983771aa2..0000000000
--- a/core/embed/rust/src/ui/model_t1/layout.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-use core::convert::TryInto;
-
-use crate::{
-    error::Error,
-    micropython::{buffer::StrBuffer, map::Map, module::Module, obj::Obj, qstr::Qstr, util},
-    ui::{
-        component::{
-            base::Component,
-            paginated::{PageMsg, Paginate},
-            text::paragraphs::{Paragraph, Paragraphs},
-            FormattedText,
-        },
-        layout::{
-            obj::{ComponentMsgObj, LayoutObj},
-            result::{CANCELLED, CONFIRMED},
-        },
-    },
-};
-
-use super::{
-    component::{Button, ButtonPage, ButtonPos, Frame},
-    theme,
-};
-
-impl<T> ComponentMsgObj for ButtonPage<T>
-where
-    T: Component + Paginate,
-{
-    fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
-        match msg {
-            PageMsg::Content(_) => Err(Error::TypeError),
-            PageMsg::Controls(true) => Ok(CONFIRMED.as_obj()),
-            PageMsg::Controls(false) => Ok(CANCELLED.as_obj()),
-            PageMsg::GoBack => unreachable!(),
-        }
-    }
-}
-
-impl<T, U> ComponentMsgObj for Frame<T, U>
-where
-    T: ComponentMsgObj,
-    U: AsRef<str>,
-{
-    fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
-        self.inner().msg_try_into_obj(msg)
-    }
-}
-
-extern "C" fn new_confirm_action(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
-    let block = |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let action: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_action)?.try_into_option()?;
-        let description: Option<StrBuffer> =
-            kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?;
-        let verb: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_verb)?.try_into_option()?;
-        let verb_cancel: Option<StrBuffer> =
-            kwargs.get(Qstr::MP_QSTR_verb_cancel)?.try_into_option()?;
-        let reverse: bool = kwargs.get(Qstr::MP_QSTR_reverse)?.try_into()?;
-
-        let format = match (&action, &description, reverse) {
-            (Some(_), Some(_), false) => "{bold}{action}\n\r{normal}{description}",
-            (Some(_), Some(_), true) => "{normal}{description}\n\r{bold}{action}",
-            (Some(_), None, _) => "{bold}{action}",
-            (None, Some(_), _) => "{normal}{description}",
-            _ => "",
-        };
-
-        let _left = verb_cancel
-            .map(|label| Button::with_text(ButtonPos::Left, label, theme::button_cancel()));
-        let _right =
-            verb.map(|label| Button::with_text(ButtonPos::Right, label, theme::button_default()));
-
-        let obj = LayoutObj::new(Frame::new(
-            title,
-            ButtonPage::new(
-                FormattedText::new(theme::TEXT_NORMAL, theme::FORMATTED, format)
-                    .with("action", action.unwrap_or_default())
-                    .with("description", description.unwrap_or_default()),
-                theme::BG,
-            ),
-        ))?;
-        Ok(obj.into())
-    };
-    unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
-}
-
-extern "C" fn new_confirm_text(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
-    let block = |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let data: StrBuffer = kwargs.get(Qstr::MP_QSTR_data)?.try_into()?;
-        let description: Option<StrBuffer> =
-            kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?;
-
-        let obj = LayoutObj::new(Frame::new(
-            title,
-            ButtonPage::new(
-                Paragraphs::new([
-                    Paragraph::new(&theme::TEXT_NORMAL, description.unwrap_or_default()),
-                    Paragraph::new(&theme::TEXT_BOLD, data),
-                ]),
-                theme::BG,
-            ),
-        ))?;
-        Ok(obj.into())
-    };
-    unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
-}
-
-#[no_mangle]
-pub static mp_module_trezorui2: Module = obj_module! {
-    Qstr::MP_QSTR___name__ => Qstr::MP_QSTR_trezorui2.to_obj(),
-
-    /// CONFIRMED: object
-    Qstr::MP_QSTR_CONFIRMED => CONFIRMED.as_obj(),
-
-    /// CANCELLED: object
-    Qstr::MP_QSTR_CANCELLED => CANCELLED.as_obj(),
-
-    /// def confirm_action(
-    ///     *,
-    ///     title: str,
-    ///     action: str | None = None,
-    ///     description: str | None = None,
-    ///     verb: str | None = None,
-    ///     verb_cancel: str | None = None,
-    ///     hold: bool | None = None,
-    ///     reverse: bool = False,
-    /// ) -> object:
-    ///     """Confirm action."""
-    Qstr::MP_QSTR_confirm_action => obj_fn_kw!(0, new_confirm_action).as_obj(),
-
-    /// def confirm_text(
-    ///     *,
-    ///     title: str,
-    ///     data: str,
-    ///     description: str | None,
-    /// ) -> object:
-    ///     """Confirm text."""
-    Qstr::MP_QSTR_confirm_text => obj_fn_kw!(0, new_confirm_text).as_obj(),
-};
-
-#[cfg(test)]
-mod tests {
-    use crate::{
-        trace::Trace,
-        ui::{
-            component::Component,
-            model_t1::{
-                component::{Dialog, DialogMsg},
-                constant,
-            },
-        },
-    };
-
-    use super::*;
-
-    fn trace(val: &impl Trace) -> String {
-        let mut t = Vec::new();
-        val.trace(&mut t);
-        String::from_utf8(t).unwrap()
-    }
-
-    impl<T, U> ComponentMsgObj for Dialog<T, U>
-    where
-        T: ComponentMsgObj,
-        U: AsRef<str>,
-    {
-        fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
-            match msg {
-                DialogMsg::Content(c) => self.inner().msg_try_into_obj(c),
-                DialogMsg::LeftClicked => Ok(CANCELLED.as_obj()),
-                DialogMsg::RightClicked => Ok(CONFIRMED.as_obj()),
-            }
-        }
-    }
-
-    #[test]
-    fn trace_example_layout() {
-        let mut layout = Dialog::new(
-            FormattedText::new(
-                theme::TEXT_NORMAL,
-                theme::FORMATTED,
-                "Testing text layout, with some text, and some more text. And {param}",
-            )
-            .with("param", "parameters!"),
-            Some(Button::with_text(
-                ButtonPos::Left,
-                "Left",
-                theme::button_cancel(),
-            )),
-            Some(Button::with_text(
-                ButtonPos::Right,
-                "Right",
-                theme::button_default(),
-            )),
-        );
-        layout.place(constant::screen());
-        assert_eq!(
-            trace(&layout),
-            r#"<Dialog content:<Text content:Testing text layout,
-with some text, and
-some more text. And p-
-arameters! > left:<Button text:Left > right:<Button text:Right > >"#
-        )
-    }
-
-    #[test]
-    fn trace_layout_title() {
-        let mut layout = Frame::new(
-            "Please confirm",
-            Dialog::new(
-                FormattedText::new(
-                    theme::TEXT_NORMAL,
-                    theme::FORMATTED,
-                    "Testing text layout, with some text, and some more text. And {param}",
-                )
-                .with("param", "parameters!"),
-                Some(Button::with_text(
-                    ButtonPos::Left,
-                    "Left",
-                    theme::button_cancel(),
-                )),
-                Some(Button::with_text(
-                    ButtonPos::Right,
-                    "Right",
-                    theme::button_default(),
-                )),
-            ),
-        );
-        layout.place(constant::screen());
-        assert_eq!(
-            trace(&layout),
-            r#"<Frame title:Please confirm content:<Dialog content:<Text content:Testing text layout,
-with some text, and
-some more text. And p-
-arameters! > left:<Button text:Left > right:<Button text:Right > > >"#
-        )
-    }
-}
diff --git a/core/embed/rust/src/ui/model_t1/mod.rs b/core/embed/rust/src/ui/model_t1/mod.rs
deleted file mode 100644
index c6eb39480c..0000000000
--- a/core/embed/rust/src/ui/model_t1/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod component;
-pub mod constant;
-pub mod theme;
-
-#[cfg(feature = "micropython")]
-pub mod layout;
diff --git a/core/embed/rust/src/ui/model_t1/theme.rs b/core/embed/rust/src/ui/model_t1/theme.rs
deleted file mode 100644
index 74b1ef6b8a..0000000000
--- a/core/embed/rust/src/ui/model_t1/theme.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use crate::ui::{
-    component::text::{formatted::FormattedFonts, TextStyle},
-    display::{Color, Font},
-};
-
-use super::component::{ButtonStyle, ButtonStyleSheet};
-
-// Color palette.
-pub const WHITE: Color = Color::rgb(255, 255, 255);
-pub const BLACK: Color = Color::rgb(0, 0, 0);
-pub const GREY_LIGHT: Color = WHITE; // Word/page break characters.
-pub const FG: Color = WHITE; // Default foreground (text & icon) color.
-pub const BG: Color = BLACK; // Default background color.
-
-pub fn button_default() -> ButtonStyleSheet {
-    ButtonStyleSheet {
-        normal: &ButtonStyle {
-            font: Font::BOLD,
-            text_color: BG,
-            border_horiz: true,
-        },
-        active: &ButtonStyle {
-            font: Font::BOLD,
-            text_color: FG,
-            border_horiz: true,
-        },
-    }
-}
-
-pub fn button_cancel() -> ButtonStyleSheet {
-    ButtonStyleSheet {
-        normal: &ButtonStyle {
-            font: Font::BOLD,
-            text_color: FG,
-            border_horiz: false,
-        },
-        active: &ButtonStyle {
-            font: Font::BOLD,
-            text_color: BG,
-            border_horiz: false,
-        },
-    }
-}
-
-pub const TEXT_NORMAL: TextStyle = TextStyle::new(Font::NORMAL, FG, BG, FG, FG);
-pub const TEXT_DEMIBOLD: TextStyle = TextStyle::new(Font::DEMIBOLD, FG, BG, FG, FG);
-pub const TEXT_BOLD: TextStyle = TextStyle::new(Font::BOLD, FG, BG, FG, FG);
-pub const TEXT_MONO: TextStyle = TextStyle::new(Font::MONO, FG, BG, FG, FG);
-
-pub const FORMATTED: FormattedFonts = FormattedFonts {
-    normal: Font::NORMAL,
-    demibold: Font::DEMIBOLD,
-    bold: Font::BOLD,
-    mono: Font::MONO,
-};
diff --git a/core/embed/rust/src/ui/model_tr/component/result_anim.rs b/core/embed/rust/src/ui/model_tr/component/result_anim.rs
index 9cd03a0259..8cde4e309d 100644
--- a/core/embed/rust/src/ui/model_tr/component/result_anim.rs
+++ b/core/embed/rust/src/ui/model_tr/component/result_anim.rs
@@ -4,6 +4,7 @@ use crate::{
         animation::Animation,
         component::{Component, Event, EventCtx},
         display,
+        display::toif::Icon,
         geometry::Rect,
         model_tr::theme,
     },
@@ -23,11 +24,11 @@ pub struct ResultAnim {
     area: Rect,
     state: State,
     growing_duration: Duration,
-    icon: &'static [u8],
+    icon: Icon,
 }
 
 impl ResultAnim {
-    pub fn new(icon: &'static [u8]) -> Self {
+    pub fn new(icon: Icon) -> Self {
         Self {
             area: Rect::zero(),
             state: State::Initial,
diff --git a/core/embed/rust/src/ui/model_tr/component/result_popup.rs b/core/embed/rust/src/ui/model_tr/component/result_popup.rs
index ca5cc5e6ee..923c254ec5 100644
--- a/core/embed/rust/src/ui/model_tr/component/result_popup.rs
+++ b/core/embed/rust/src/ui/model_tr/component/result_popup.rs
@@ -6,6 +6,7 @@ use crate::{
             Child, Component, ComponentExt, Event, EventCtx, Label, Pad,
         },
         constant::screen,
+        display::toif::Icon,
         geometry::{Alignment, Insets, LinearPlacement, Point, Rect},
         model_tr::{
             component::{Button, ButtonMsg, ButtonPos, ResultAnim, ResultAnimMsg},
@@ -38,7 +39,7 @@ const ANIM_POS_ADJ_BUTTON: i16 = 6;
 
 impl<S: ParagraphStrType> ResultPopup<S> {
     pub fn new(
-        icon: &'static [u8],
+        icon: Icon,
         text: S,
         headline: Option<&'static str>,
         button_text: Option<&'static str>,
diff --git a/core/embed/rust/src/ui/model_tr/constant.rs b/core/embed/rust/src/ui/model_tr/constant.rs
index dc5f341e5c..c4ce3780b4 100644
--- a/core/embed/rust/src/ui/model_tr/constant.rs
+++ b/core/embed/rust/src/ui/model_tr/constant.rs
@@ -5,9 +5,9 @@ pub const HEIGHT: i16 = 128;
 pub const LINE_SPACE: i16 = 1;
 pub const FONT_BPP: i16 = 1;
 
-pub const LOADER_OUTER: f32 = 20_f32;
-pub const LOADER_INNER: f32 = 14_f32;
-pub const LOADER_ICON_MAX_SIZE: i16 = 24;
+pub const LOADER_OUTER: f32 = 32_f32;
+pub const LOADER_INNER: f32 = 18_f32;
+pub const LOADER_ICON_MAX_SIZE: i16 = 8;
 
 pub const fn size() -> Offset {
     Offset::new(WIDTH, HEIGHT)
diff --git a/core/embed/rust/src/ui/model_tr/layout.rs b/core/embed/rust/src/ui/model_tr/layout.rs
index bc8114925e..9b8636aedc 100644
--- a/core/embed/rust/src/ui/model_tr/layout.rs
+++ b/core/embed/rust/src/ui/model_tr/layout.rs
@@ -13,6 +13,7 @@ use crate::{
         layout::{
             obj::{ComponentMsgObj, LayoutObj},
             result::{CANCELLED, CONFIRMED},
+            util::upy_disable_animation,
         },
     },
 };
@@ -116,6 +117,10 @@ pub static mp_module_trezorui2: Module = obj_module! {
     /// CANCELLED: object
     Qstr::MP_QSTR_CANCELLED => CANCELLED.as_obj(),
 
+    /// def disable_animation(disable: bool) -> None:
+    ///     """Disable animations, debug builds only."""
+    Qstr::MP_QSTR_disable_animation => obj_fn_1!(upy_disable_animation).as_obj(),
+
     /// def confirm_action(
     ///     *,
     ///     title: str,
@@ -123,7 +128,8 @@ pub static mp_module_trezorui2: Module = obj_module! {
     ///     description: str | None = None,
     ///     verb: str | None = None,
     ///     verb_cancel: str | None = None,
-    ///     hold: bool | None = None,
+    ///     hold: bool = False,
+    ///     hold_danger: bool = False,  # unused on TR
     ///     reverse: bool = False,
     /// ) -> object:
     ///     """Confirm action."""
diff --git a/core/embed/rust/src/ui/model_tt/component/button.rs b/core/embed/rust/src/ui/model_tt/component/button.rs
index 1c08645092..b9d74f5ca1 100644
--- a/core/embed/rust/src/ui/model_tt/component/button.rs
+++ b/core/embed/rust/src/ui/model_tt/component/button.rs
@@ -4,9 +4,9 @@ use crate::{
         component::{
             Component, ComponentExt, Event, EventCtx, FixedHeightBar, GridPlaced, Map, TimerToken,
         },
-        display::{self, Color, Font},
+        display::{self, toif::Icon, Color, Font},
         event::TouchEvent,
-        geometry::{Insets, Offset, Rect},
+        geometry::{Insets, Offset, Rect, CENTER},
     },
 };
 
@@ -48,11 +48,11 @@ impl<T> Button<T> {
         Self::new(ButtonContent::Text(text))
     }
 
-    pub fn with_icon(image: &'static [u8]) -> Self {
-        Self::new(ButtonContent::Icon(image))
+    pub fn with_icon(icon: Icon) -> Self {
+        Self::new(ButtonContent::Icon(icon))
     }
 
-    pub fn with_icon_blend(bg: &'static [u8], fg: &'static [u8], fg_offset: Offset) -> Self {
+    pub fn with_icon_blend(bg: Icon, fg: Icon, fg_offset: Offset) -> Self {
         Self::new(ButtonContent::IconBlend(bg, fg, fg_offset))
     }
 
@@ -198,17 +198,17 @@ impl<T> Button<T> {
                 );
             }
             ButtonContent::Icon(icon) => {
-                display::icon(
+                icon.draw(
                     self.area.center(),
-                    icon,
+                    CENTER,
                     style.text_color,
                     style.button_color,
                 );
             }
             ButtonContent::IconBlend(bg, fg, offset) => display::icon_over_icon(
                 Some(self.area),
-                (bg, Offset::zero(), style.button_color),
-                (fg, *offset, style.text_color),
+                (*bg, Offset::zero(), style.button_color),
+                (*fg, *offset, style.text_color),
                 style.background_color,
             ),
         }
@@ -247,11 +247,6 @@ where
             }
             Event::Touch(TouchEvent::TouchMove(pos)) => {
                 match self.state {
-                    State::Released if self.area.contains(pos) => {
-                        // Touch entered our area, transform to `Pressed` state.
-                        self.set(ctx, State::Pressed);
-                        return Some(ButtonMsg::Pressed);
-                    }
                     State::Pressed if !self.area.contains(pos) => {
                         // Touch is leaving our area, transform to `Released` state.
                         self.set(ctx, State::Released);
@@ -333,8 +328,8 @@ enum State {
 pub enum ButtonContent<T> {
     Empty,
     Text(T),
-    Icon(&'static [u8]),
-    IconBlend(&'static [u8], &'static [u8], Offset),
+    Icon(Icon),
+    IconBlend(Icon, Icon, Offset),
 }
 
 #[derive(PartialEq, Eq)]
@@ -401,7 +396,7 @@ impl<T> Button<T> {
         let (left, right_size_factor) = if let Some(verb) = left {
             (Button::with_text(verb), 1)
         } else {
-            (Button::with_icon(theme::ICON_CANCEL), 2)
+            (Button::with_icon(Icon::new(theme::ICON_CANCEL)), 2)
         };
         let right = Button::with_text(right).styled(theme::button_confirm());
 
@@ -422,7 +417,7 @@ impl<T> Button<T> {
     {
         let right = Button::with_text(confirm).styled(theme::button_confirm());
         let top = Button::with_text(info);
-        let left = Button::with_icon(theme::ICON_CANCEL);
+        let left = Button::with_icon(Icon::new(theme::ICON_CANCEL));
         theme::button_bar_rows(
             2,
             (
diff --git a/core/embed/rust/src/ui/model_tt/component/dialog.rs b/core/embed/rust/src/ui/model_tt/component/dialog.rs
index c16ca41cdd..7c64ce92bb 100644
--- a/core/embed/rust/src/ui/model_tt/component/dialog.rs
+++ b/core/embed/rust/src/ui/model_tt/component/dialog.rs
@@ -6,6 +6,7 @@ use crate::ui::{
         },
         Child, Component, Event, EventCtx, Never,
     },
+    display::toif::Icon,
     geometry::{Insets, LinearPlacement, Rect},
 };
 
@@ -128,8 +129,8 @@ where
         let [l0, l1, l2, l3] = lines;
         Self {
             image: Child::new(BlendedImage::new(
-                theme::IMAGE_BG_CIRCLE,
-                theme::IMAGE_FG_SUCCESS,
+                Icon::new(theme::IMAGE_BG_CIRCLE),
+                Icon::new(theme::IMAGE_FG_SUCCESS),
                 theme::SUCCESS_COLOR,
                 theme::FG,
                 theme::BG,
diff --git a/core/embed/rust/src/ui/model_tt/component/fido.rs b/core/embed/rust/src/ui/model_tt/component/fido.rs
index eacabdcfce..ed2e7dffbf 100644
--- a/core/embed/rust/src/ui/model_tt/component/fido.rs
+++ b/core/embed/rust/src/ui/model_tt/component/fido.rs
@@ -1,7 +1,5 @@
-use core::ops::Deref;
-
 use crate::ui::{
-    component::{Child, Component, Event, EventCtx, Image, Label},
+    component::{image::Image, Child, Component, Event, EventCtx, Label},
     display,
     geometry::{Alignment, Insets, Rect},
     model_tt::component::{
@@ -39,7 +37,7 @@ pub struct FidoConfirm<F: Fn(usize) -> T, T, U> {
 impl<F, T, U> FidoConfirm<F, T, U>
 where
     F: Fn(usize) -> T,
-    T: Deref<Target = str> + From<&'static str>,
+    T: AsRef<str> + From<&'static str>,
     U: Component<Msg = CancelConfirmMsg>,
 {
     pub fn new(
@@ -49,7 +47,7 @@ where
         icon_name: Option<T>,
         controls: U,
     ) -> Self {
-        let icon_data = get_fido_icon_data(icon_name.as_deref());
+        let icon_data = get_fido_icon_data(icon_name.as_ref());
 
         // Preparing scrollbar and setting its page-count.
         let mut scrollbar = ScrollBar::horizontal();
@@ -104,7 +102,7 @@ where
 impl<F, T, U> Component for FidoConfirm<F, T, U>
 where
     F: Fn(usize) -> T,
-    T: Deref<Target = str> + From<&'static str>,
+    T: AsRef<str> + From<&'static str>,
     U: Component<Msg = CancelConfirmMsg>,
 {
     type Msg = FidoMsg;
@@ -179,7 +177,9 @@ where
         // Account name is optional.
         // Showing it only if it differs from app name.
         // (Dummy requests usually have some text as both app_name and account_name.)
-        if !current_account.is_empty() && current_account.deref() != self.app_name.text().deref() {
+        if !current_account.as_ref().is_empty()
+            && current_account.as_ref() != self.app_name.text().as_ref()
+        {
             self.account_name.set_text(current_account);
             self.account_name.paint();
         }
diff --git a/core/embed/rust/src/ui/model_tt/component/fido_icons.rs b/core/embed/rust/src/ui/model_tt/component/fido_icons.rs
index 3861545166..df39e17a65 100644
--- a/core/embed/rust/src/ui/model_tt/component/fido_icons.rs
+++ b/core/embed/rust/src/ui/model_tt/component/fido_icons.rs
@@ -2,6 +2,8 @@
 //! (by running `make templates` in `core`)
 //! do not edit manually!
 
+
+const ICON_APPLE: &[u8] = include_res!("model_tt/res/fido/icon_apple.toif");
 const ICON_AWS: &[u8] = include_res!("model_tt/res/fido/icon_aws.toif");
 const ICON_BINANCE: &[u8] = include_res!("model_tt/res/fido/icon_binance.toif");
 const ICON_BITBUCKET: &[u8] = include_res!("model_tt/res/fido/icon_bitbucket.toif");
@@ -40,6 +42,7 @@ const ICON_WEBAUTHN: &[u8] = include_res!("model_tt/res/fido/icon_webauthn.toif"
 pub fn get_fido_icon_data<T: AsRef<str>>(icon_name: Option<T>) -> &'static [u8] {
     if let Some(icon_name) = icon_name {
         match icon_name.as_ref() {
+            "apple" => ICON_APPLE,
             "aws" => ICON_AWS,
             "binance" => ICON_BINANCE,
             "bitbucket" => ICON_BITBUCKET,
diff --git a/core/embed/rust/src/ui/model_tt/component/fido_icons.rs.mako b/core/embed/rust/src/ui/model_tt/component/fido_icons.rs.mako
index 3de5e4af8e..cca05ce390 100644
--- a/core/embed/rust/src/ui/model_tt/component/fido_icons.rs.mako
+++ b/core/embed/rust/src/ui/model_tt/component/fido_icons.rs.mako
@@ -1,6 +1,7 @@
 //! generated from webauthn_icons.rs.mako
 //! (by running `make templates` in `core`)
 //! do not edit manually!
+
 <%
 icons: list[tuple[str, str]] = []
 for app in fido:
diff --git a/core/embed/rust/src/ui/model_tt/component/frame.rs b/core/embed/rust/src/ui/model_tt/component/frame.rs
index ad8889c02d..522454751e 100644
--- a/core/embed/rust/src/ui/model_tt/component/frame.rs
+++ b/core/embed/rust/src/ui/model_tt/component/frame.rs
@@ -1,14 +1,14 @@
 use super::theme;
 use crate::ui::{
-    component::{Child, Component, Event, EventCtx},
-    display::{self, Color, Font},
-    geometry::{Insets, Offset, Rect},
+    component::{label::Label, text::TextStyle, Child, Component, Event, EventCtx},
+    display::{self, toif::Icon, Color},
+    geometry::{Alignment, Insets, Offset, Rect},
+    util::icon_text_center,
 };
 
 pub struct Frame<T, U> {
-    area: Rect,
     border: Insets,
-    title: U,
+    title: Child<Label<U>>,
     content: Child<T>,
 }
 
@@ -17,15 +17,26 @@ where
     T: Component,
     U: AsRef<str>,
 {
-    pub fn new(title: U, content: T) -> Self {
+    pub fn new(style: TextStyle, alignment: Alignment, title: U, content: T) -> Self {
         Self {
-            title,
-            area: Rect::zero(),
+            title: Child::new(Label::new(title, alignment, style)),
             border: theme::borders_scroll(),
             content: Child::new(content),
         }
     }
 
+    pub fn left_aligned(style: TextStyle, title: U, content: T) -> Self {
+        Self::new(style, Alignment::Start, title, content)
+    }
+
+    pub fn right_aligned(style: TextStyle, title: U, content: T) -> Self {
+        Self::new(style, Alignment::End, title, content)
+    }
+
+    pub fn centered(style: TextStyle, title: U, content: T) -> Self {
+        Self::new(style, Alignment::Center, title, content)
+    }
+
     pub fn with_border(mut self, border: Insets) -> Self {
         self.border = border;
         self
@@ -46,34 +57,26 @@ where
     fn place(&mut self, bounds: Rect) -> Rect {
         const TITLE_SPACE: i16 = theme::BUTTON_SPACING;
 
-        let (title_area, content_area) = bounds
-            .inset(self.border)
-            .split_top(Font::BOLD.text_height());
-        let title_area = title_area.inset(Insets::left(theme::CONTENT_BORDER));
-        let content_area = content_area.inset(Insets::top(TITLE_SPACE));
-
-        self.area = title_area;
+        let bounds = bounds.inset(self.border);
+        let title_area = bounds.inset(Insets::sides(theme::CONTENT_BORDER));
+        let title_area = self.title.place(title_area);
+        let content_area = bounds.inset(Insets::top(title_area.height() + TITLE_SPACE));
         self.content.place(content_area);
         bounds
     }
 
     fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
+        self.title.event(ctx, event);
         self.content.event(ctx, event)
     }
 
     fn paint(&mut self) {
-        display::text(
-            self.area.bottom_left(),
-            self.title.as_ref(),
-            Font::BOLD,
-            theme::GREY_LIGHT,
-            theme::BG,
-        );
+        self.title.paint();
         self.content.paint();
     }
 
     fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
-        sink(self.area);
+        self.title.bounds(sink);
         self.content.bounds(sink);
     }
 }
@@ -94,8 +97,7 @@ where
 
 pub struct NotificationFrame<T, U> {
     area: Rect,
-    border: Insets,
-    icon: &'static [u8],
+    icon: Icon,
     title: U,
     content: Child<T>,
 }
@@ -105,18 +107,17 @@ where
     T: Component,
     U: AsRef<str>,
 {
-    const HEIGHT: i16 = 42;
+    const HEIGHT: i16 = 32;
     const COLOR: Color = theme::YELLOW;
-    const FONT: Font = Font::BOLD;
     const TEXT_OFFSET: Offset = Offset::new(1, -2);
     const ICON_SPACE: i16 = 8;
+    const BORDER: i16 = 8;
 
-    pub fn new(icon: &'static [u8], title: U, content: T) -> Self {
+    pub fn new(icon: Icon, title: U, content: T) -> Self {
         Self {
             icon,
             title,
             area: Rect::zero(),
-            border: theme::borders_notification(),
             content: Child::new(content),
         }
     }
@@ -124,6 +125,25 @@ where
     pub fn inner(&self) -> &T {
         self.content.inner()
     }
+
+    pub fn paint_notification(area: Rect, icon: Icon, title: &str, color: Color) {
+        let (area, _) = area
+            .inset(Insets::uniform(Self::BORDER))
+            .split_top(Self::HEIGHT);
+        let style = TextStyle {
+            background_color: color,
+            ..theme::TEXT_BOLD
+        };
+        display::rect_fill_rounded(area, color, theme::BG, 2);
+        icon_text_center(
+            area.center(),
+            icon,
+            Self::ICON_SPACE,
+            title,
+            style,
+            Self::TEXT_OFFSET,
+        );
+    }
 }
 
 impl<T, U> Component for NotificationFrame<T, U>
@@ -134,10 +154,8 @@ where
     type Msg = T::Msg;
 
     fn place(&mut self, bounds: Rect) -> Rect {
-        let (title_area, content_area) = bounds.split_top(Self::HEIGHT);
-        let content_area = content_area.inset(self.border);
-
-        self.area = title_area;
+        let content_area = bounds.inset(theme::borders_notification());
+        self.area = bounds;
         self.content.place(content_area);
         bounds
     }
@@ -147,24 +165,7 @@ where
     }
 
     fn paint(&mut self) {
-        let toif_info = unwrap!(display::toif_info(self.icon), "Invalid TOIF data");
-        let icon_width = toif_info.0.y;
-        let text_width = Self::FONT.text_width(self.title.as_ref());
-        let text_height = Self::FONT.text_height();
-        let text_center =
-            self.area.center() + Offset::new((icon_width + Self::ICON_SPACE) / 2, text_height / 2);
-        let icon_center = self.area.center() - Offset::x((text_width + Self::ICON_SPACE) / 2);
-
-        display::rect_fill_rounded(self.area, Self::COLOR, theme::BG, 2);
-        display::text_center(
-            text_center + Self::TEXT_OFFSET,
-            self.title.as_ref(),
-            Self::FONT,
-            theme::BG,
-            Self::COLOR,
-        );
-        display::icon(icon_center, self.icon, theme::BG, Self::COLOR);
-
+        Self::paint_notification(self.area, self.icon, self.title.as_ref(), Self::COLOR);
         self.content.paint();
     }
 
diff --git a/core/embed/rust/src/ui/model_tt/component/hold_to_confirm.rs b/core/embed/rust/src/ui/model_tt/component/hold_to_confirm.rs
index 923e0ddc12..2524878adc 100644
--- a/core/embed/rust/src/ui/model_tt/component/hold_to_confirm.rs
+++ b/core/embed/rust/src/ui/model_tt/component/hold_to_confirm.rs
@@ -2,7 +2,9 @@ use crate::{
     time::Instant,
     ui::{
         component::{Child, Component, ComponentExt, Event, EventCtx, FixedHeightBar, Pad},
+        display::toif::Icon,
         geometry::{Grid, Insets, Rect},
+        util::animation_disabled,
     },
 };
 
@@ -125,7 +127,7 @@ pub enum CancelHoldMsg {
 impl CancelHold {
     pub fn new(button_style: ButtonStyleSheet) -> FixedHeightBar<Self> {
         theme::button_bar(Self {
-            cancel: Some(Button::with_icon(theme::ICON_CANCEL).into_child()),
+            cancel: Some(Button::with_icon(Icon::new(theme::ICON_CANCEL)).into_child()),
             hold: Button::with_text("HOLD TO CONFIRM")
                 .styled(button_style)
                 .into_child(),
@@ -220,7 +222,7 @@ where
             loader.start_shrinking(ctx, now);
         }
         Some(ButtonMsg::Clicked) => {
-            if loader.is_completely_grown(now) {
+            if loader.is_completely_grown(now) || animation_disabled() {
                 return true;
             } else {
                 loader.start_shrinking(ctx, now);
diff --git a/core/embed/rust/src/ui/model_tt/component/homescreen/mod.rs b/core/embed/rust/src/ui/model_tt/component/homescreen/mod.rs
new file mode 100644
index 0000000000..1b47ad51c1
--- /dev/null
+++ b/core/embed/rust/src/ui/model_tt/component/homescreen/mod.rs
@@ -0,0 +1,328 @@
+mod render;
+
+use crate::{
+    micropython::gc::Gc,
+    storage::{get_avatar, get_avatar_len},
+    time::{Duration, Instant},
+    trezorhal::usb::usb_configured,
+    ui::{
+        component::{Component, Event, EventCtx, Pad, TimerToken},
+        display::{self, tjpgd::jpeg_info, toif::Icon, Color, Font},
+        event::{TouchEvent, USBEvent},
+        geometry::{Offset, Point, Rect},
+        model_tt::{constant, theme::IMAGE_HOMESCREEN},
+    },
+};
+
+use render::{
+    homescreen, homescreen_blurred, HomescreenNotification, HomescreenText, HOMESCREEN_IMAGE_SIZE,
+};
+
+use super::{theme, Loader, LoaderMsg};
+
+const AREA: Rect = constant::screen();
+const TOP_CENTER: Point = AREA.top_center();
+const LABEL_Y: i16 = 216;
+const LOCKED_Y: i16 = 107;
+const TAP_Y: i16 = 134;
+const HOLD_Y: i16 = 35;
+const LOADER_OFFSET: Offset = Offset::y(-10);
+const LOADER_DELAY: Duration = Duration::from_millis(500);
+const LOADER_DURATION: Duration = Duration::from_millis(2000);
+
+pub struct Homescreen<T> {
+    label: T,
+    notification: Option<(T, u8)>,
+    hold_to_lock: bool,
+    loader: Loader,
+    pad: Pad,
+    paint_notification_only: bool,
+    delay: Option<TimerToken>,
+}
+
+pub enum HomescreenMsg {
+    Dismissed,
+}
+
+impl<T> Homescreen<T>
+where
+    T: AsRef<str>,
+{
+    pub fn new(label: T, notification: Option<(T, u8)>, hold_to_lock: bool) -> Self {
+        Self {
+            label,
+            notification,
+            hold_to_lock,
+            loader: Loader::new().with_durations(LOADER_DURATION, LOADER_DURATION / 3),
+            pad: Pad::with_background(theme::BG),
+            paint_notification_only: false,
+            delay: None,
+        }
+    }
+
+    fn level_to_style(level: u8) -> (Color, Icon) {
+        match level {
+            2 => (theme::VIOLET, Icon::new(theme::ICON_MAGIC)),
+            1 => (theme::YELLOW, Icon::new(theme::ICON_WARN)),
+            _ => (theme::RED, Icon::new(theme::ICON_WARN)),
+        }
+    }
+
+    fn get_notification(&self) -> Option<HomescreenNotification> {
+        if !usb_configured() {
+            let (color, icon) = Self::level_to_style(0);
+            Some(HomescreenNotification {
+                text: "NO USB CONNECTION",
+                icon,
+                color,
+            })
+        } else if let Some((notification, level)) = &self.notification {
+            let (color, icon) = Self::level_to_style(*level);
+            Some(HomescreenNotification {
+                text: notification.as_ref(),
+                icon,
+                color,
+            })
+        } else {
+            None
+        }
+    }
+
+    fn paint_loader(&mut self) {
+        display::text_center(
+            TOP_CENTER + Offset::y(HOLD_Y),
+            "HOLD TO LOCK",
+            Font::BOLD,
+            theme::FG,
+            theme::BG,
+        );
+        self.loader.paint()
+    }
+
+    pub fn set_paint_notification(&mut self) {
+        self.paint_notification_only = true;
+    }
+
+    fn event_usb(&mut self, ctx: &mut EventCtx, event: Event) {
+        if let Event::USB(USBEvent::Connected(_)) = event {
+            self.paint_notification_only = true;
+            ctx.request_paint();
+        }
+    }
+
+    fn event_hold(&mut self, ctx: &mut EventCtx, event: Event) -> bool {
+        match event {
+            Event::Touch(TouchEvent::TouchStart(_)) => {
+                if self.loader.is_animating() {
+                    self.loader.start_growing(ctx, Instant::now());
+                } else {
+                    self.delay = Some(ctx.request_timer(LOADER_DELAY));
+                }
+            }
+            Event::Touch(TouchEvent::TouchEnd(_)) => {
+                self.delay = None;
+                let now = Instant::now();
+                if self.loader.is_completely_grown(now) {
+                    return true;
+                }
+                if self.loader.is_animating() {
+                    self.loader.start_shrinking(ctx, now);
+                }
+            }
+            Event::Timer(token) if Some(token) == self.delay => {
+                self.delay = None;
+                self.pad.clear();
+                self.paint_notification_only = false;
+                self.loader.start_growing(ctx, Instant::now());
+            }
+            _ => {}
+        }
+
+        match self.loader.event(ctx, event) {
+            Some(LoaderMsg::GrownCompletely) => {
+                // Wait for TouchEnd before returning.
+            }
+            Some(LoaderMsg::ShrunkCompletely) => {
+                self.loader.reset();
+                self.pad.clear();
+                self.paint_notification_only = false;
+                ctx.request_paint()
+            }
+            None => {}
+        }
+
+        false
+    }
+}
+
+impl<T> Component for Homescreen<T>
+where
+    T: AsRef<str>,
+{
+    type Msg = HomescreenMsg;
+
+    fn place(&mut self, bounds: Rect) -> Rect {
+        self.pad.place(AREA);
+        self.loader.place(AREA.translate(LOADER_OFFSET));
+        bounds
+    }
+
+    fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
+        Self::event_usb(self, ctx, event);
+        if self.hold_to_lock {
+            Self::event_hold(self, ctx, event).then_some(HomescreenMsg::Dismissed)
+        } else {
+            None
+        }
+    }
+
+    fn paint(&mut self) {
+        self.pad.paint();
+        if self.loader.is_animating() || self.loader.is_completely_grown(Instant::now()) {
+            self.paint_loader();
+        } else {
+            let mut label_style = theme::TEXT_BOLD;
+            label_style.text_color = theme::FG;
+
+            let text = HomescreenText {
+                text: self.label.as_ref(),
+                style: label_style,
+                offset: Offset::new(10, LABEL_Y),
+                icon: None,
+            };
+
+            let notification = self.get_notification();
+
+            let res = get_image();
+            if let Ok(data) = res {
+                homescreen(
+                    data.as_ref(),
+                    &[text],
+                    notification,
+                    self.paint_notification_only,
+                );
+            } else {
+                homescreen(
+                    IMAGE_HOMESCREEN,
+                    &[text],
+                    notification,
+                    self.paint_notification_only,
+                );
+            }
+        }
+    }
+
+    fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
+        self.loader.bounds(sink);
+        sink(self.pad.area);
+    }
+}
+
+#[cfg(feature = "ui_debug")]
+impl<T: AsRef<str>> crate::trace::Trace for Homescreen<T> {
+    fn trace(&self, d: &mut dyn crate::trace::Tracer) {
+        d.open("Homescreen");
+        d.field("label", &self.label.as_ref());
+        d.close();
+    }
+}
+
+pub struct Lockscreen<T> {
+    label: T,
+    bootscreen: bool,
+}
+
+impl<T> Lockscreen<T> {
+    pub fn new(label: T, bootscreen: bool) -> Self {
+        Lockscreen { label, bootscreen }
+    }
+}
+
+impl<T> Component for Lockscreen<T>
+where
+    T: AsRef<str>,
+{
+    type Msg = HomescreenMsg;
+
+    fn place(&mut self, bounds: Rect) -> Rect {
+        bounds
+    }
+
+    fn event(&mut self, _ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
+        if let Event::Touch(TouchEvent::TouchEnd(_)) = event {
+            return Some(HomescreenMsg::Dismissed);
+        }
+        None
+    }
+
+    fn paint(&mut self) {
+        let (locked, tap) = if self.bootscreen {
+            ("NOT CONNECTED", "Tap to connect")
+        } else {
+            ("LOCKED", "Tap to unlock")
+        };
+
+        let mut tap_style = theme::TEXT_NORMAL;
+        tap_style.text_color = theme::OFF_WHITE;
+
+        let mut label_style = theme::TEXT_BOLD;
+        label_style.text_color = theme::GREY_LIGHT;
+
+        let texts: [HomescreenText; 3] = [
+            HomescreenText {
+                text: locked,
+                style: theme::TEXT_BOLD,
+                offset: Offset::new(10, LOCKED_Y),
+                icon: Some(Icon::new(theme::ICON_LOCK)),
+            },
+            HomescreenText {
+                text: tap,
+                style: tap_style,
+                offset: Offset::new(10, TAP_Y),
+                icon: None,
+            },
+            HomescreenText {
+                text: self.label.as_ref(),
+                style: label_style,
+                offset: Offset::new(10, LABEL_Y),
+                icon: None,
+            },
+        ];
+
+        let res = get_image();
+        if let Ok(data) = res {
+            homescreen_blurred(data.as_ref(), &texts);
+        } else {
+            homescreen_blurred(IMAGE_HOMESCREEN, &texts);
+        }
+    }
+}
+
+fn get_image() -> Result<Gc<[u8]>, ()> {
+    if let Ok(len) = get_avatar_len() {
+        let result = Gc::<[u8]>::new_slice(len);
+        if let Ok(mut buffer) = result {
+            let buf = unsafe { Gc::<[u8]>::as_mut(&mut buffer) };
+            if get_avatar(buf).is_ok() {
+                let jpeg = jpeg_info(buffer.as_ref());
+                if let Some((size, mcu_height)) = jpeg {
+                    if size.x == HOMESCREEN_IMAGE_SIZE
+                        && size.y == HOMESCREEN_IMAGE_SIZE
+                        && mcu_height <= 16
+                    {
+                        return Ok(buffer);
+                    }
+                }
+            }
+        }
+    };
+    Err(())
+}
+
+#[cfg(feature = "ui_debug")]
+impl<T> crate::trace::Trace for Lockscreen<T> {
+    fn trace(&self, d: &mut dyn crate::trace::Tracer) {
+        d.open("Lockscreen");
+        d.close();
+    }
+}
diff --git a/core/embed/rust/src/ui/model_tt/component/homescreen/render.rs b/core/embed/rust/src/ui/model_tt/component/homescreen/render.rs
new file mode 100644
index 0000000000..70f91713ba
--- /dev/null
+++ b/core/embed/rust/src/ui/model_tt/component/homescreen/render.rs
@@ -0,0 +1,622 @@
+#[cfg(feature = "dma2d")]
+use crate::trezorhal::{
+    buffers::{get_buffer_16bpp, get_buffer_4bpp, get_text_buffer, BufferText, LineBuffer4Bpp},
+    dma2d::{dma2d_setup_4bpp_over_16bpp, dma2d_start_blend, dma2d_wait_for_transfer},
+};
+use crate::{
+    trezorhal::{
+        buffers::{get_blurring_buffer, get_jpeg_buffer, get_jpeg_work_buffer, BufferJpeg},
+        display,
+        display::bar_radius_buffer,
+    },
+    ui::{
+        constant::screen,
+        display::{position_buffer, set_window, Color},
+        geometry::{Offset, Point, Rect},
+    },
+};
+
+use crate::ui::{
+    component::text::TextStyle,
+    constant::{HEIGHT, WIDTH},
+    display::{
+        tjpgd::{BufferInput, BufferOutput, JDEC},
+        Icon,
+    },
+    model_tt::theme,
+    util::icon_text_center,
+};
+
+#[derive(Clone, Copy)]
+pub struct HomescreenText<'a> {
+    pub text: &'a str,
+    pub style: TextStyle,
+    pub offset: Offset,
+    pub icon: Option<Icon>,
+}
+
+#[derive(Clone, Copy)]
+pub struct HomescreenNotification<'a> {
+    pub text: &'a str,
+    pub icon: Icon,
+    pub color: Color,
+}
+
+#[derive(Clone, Copy)]
+struct HomescreenTextInfo {
+    pub text_area: Rect,
+    pub text_width: i16,
+    pub text_color: Color,
+    pub icon_area: Option<Rect>,
+}
+
+pub const HOMESCREEN_IMAGE_SIZE: i16 = 240;
+
+const HOMESCREEN_MAX_ICON_SIZE: i16 = 20;
+const NOTIFICATION_HEIGHT: i16 = 32;
+const NOTIFICATION_BORDER: i16 = 8;
+const NOTIFICATION_ICON_SPACE: i16 = 8;
+const NOTIFICATION_TEXT_OFFSET: Offset = Offset::new(1, -2);
+const TEXT_ICON_SPACE: i16 = 2;
+
+const HOMESCREEN_DIM_HIEGHT: i16 = 30;
+const HOMESCREEN_DIM_START: i16 = 195;
+const HOMESCREEN_DIM: f32 = 0.85;
+const HOMESCREEN_DIM_BORDER: i16 = 20;
+
+const LOCKSCREEN_DIM: f32 = 0.85;
+const LOCKSCREEN_DIM_BG: f32 = 0.0;
+
+const BLUR_SIZE: usize = 9;
+const BLUR_DIV: u32 =
+    ((65536_f32 * (1_f32 - LOCKSCREEN_DIM_BG)) as u32) / ((BLUR_SIZE * BLUR_SIZE) as u32);
+const DECOMP_LINES: usize = BLUR_SIZE + 1;
+const BLUR_RADIUS: i16 = (BLUR_SIZE / 2) as i16;
+
+const COLORS: usize = 3;
+const RED_IDX: usize = 0;
+const GREEN_IDX: usize = 1;
+const BLUE_IDX: usize = 2;
+
+fn homescreen_get_fg_text(
+    y_tmp: i16,
+    text_info: HomescreenTextInfo,
+    text_buffer: &BufferText,
+    fg_buffer: &mut LineBuffer4Bpp,
+) -> bool {
+    if y_tmp >= text_info.text_area.y0 && y_tmp < text_info.text_area.y1 {
+        let y_pos = y_tmp - text_info.text_area.y0;
+        position_buffer(
+            &mut fg_buffer.buffer,
+            &text_buffer.buffer[(y_pos * WIDTH / 2) as usize..((y_pos + 1) * WIDTH / 2) as usize],
+            4,
+            text_info.text_area.x0,
+            text_info.text_width,
+        );
+    }
+
+    y_tmp == (text_info.text_area.y1 - 1)
+}
+
+fn homescreen_get_fg_icon(
+    y_tmp: i16,
+    text_info: HomescreenTextInfo,
+    icon_data: &[u8],
+    fg_buffer: &mut LineBuffer4Bpp,
+) {
+    if let Some(icon_area) = text_info.icon_area {
+        let icon_size = icon_area.size();
+        if y_tmp >= icon_area.y0 && y_tmp < icon_area.y1 {
+            let y_pos = y_tmp - icon_area.y0;
+            position_buffer(
+                &mut fg_buffer.buffer,
+                &icon_data
+                    [(y_pos * icon_size.x / 2) as usize..((y_pos + 1) * icon_size.x / 2) as usize],
+                4,
+                icon_area.x0,
+                icon_size.x,
+            );
+        }
+    }
+}
+
+fn homescreen_position_text(
+    text: &HomescreenText,
+    buffer: &mut BufferText,
+    icon_buffer: &mut [u8],
+) -> HomescreenTextInfo {
+    let text_width = display::text_width(text.text, text.style.text_font.into());
+    let font_max_height = display::text_max_height(text.style.text_font.into());
+    let font_baseline = display::text_baseline(text.style.text_font.into());
+    let text_width_clamped = text_width.clamp(0, screen().width());
+
+    let icon_size = if let Some(icon) = text.icon {
+        let size = icon.toif.size();
+        assert!(size.x <= HOMESCREEN_MAX_ICON_SIZE);
+        assert!(size.y <= HOMESCREEN_MAX_ICON_SIZE);
+        icon.toif.uncompress(icon_buffer);
+        size
+    } else {
+        Offset::zero()
+    };
+
+    let text_top = screen().y0 + text.offset.y - font_max_height + font_baseline;
+    let text_bottom = screen().y0 + text.offset.y + font_baseline;
+    let icon_left = screen().center().x - (text_width_clamped + icon_size.x + TEXT_ICON_SPACE) / 2;
+    let text_left = icon_left + icon_size.x + TEXT_ICON_SPACE;
+    let text_right = screen().center().x + (text_width_clamped + icon_size.x + TEXT_ICON_SPACE) / 2;
+
+    let text_area = Rect::new(
+        Point::new(text_left, text_top),
+        Point::new(text_right, text_bottom),
+    );
+
+    let icon_area = if text.icon.is_some() {
+        Some(Rect::from_top_left_and_size(
+            Point::new(icon_left, text_bottom - icon_size.y - font_baseline),
+            icon_size,
+        ))
+    } else {
+        None
+    };
+
+    display::text_into_buffer(text.text, text.style.text_font.into(), buffer, 0);
+
+    HomescreenTextInfo {
+        text_area,
+        text_width,
+        text_color: text.style.text_color,
+        icon_area,
+    }
+}
+
+#[inline(always)]
+fn homescreen_dim_area(x: i16, y: i16) -> bool {
+    y >= HOMESCREEN_DIM_START
+        && (y > HOMESCREEN_DIM_START + 1
+            && y < (HOMESCREEN_DIM_START + HOMESCREEN_DIM_HIEGHT - 1)
+            && x > HOMESCREEN_DIM_BORDER
+            && x < WIDTH - HOMESCREEN_DIM_BORDER)
+        || (y > HOMESCREEN_DIM_START
+            && y < (HOMESCREEN_DIM_START + HOMESCREEN_DIM_HIEGHT)
+            && x > HOMESCREEN_DIM_BORDER + 1
+            && x < WIDTH - (HOMESCREEN_DIM_BORDER + 1))
+        || ((HOMESCREEN_DIM_START..=(HOMESCREEN_DIM_START + HOMESCREEN_DIM_HIEGHT)).contains(&y)
+            && x > HOMESCREEN_DIM_BORDER + 2
+            && x < WIDTH - (HOMESCREEN_DIM_BORDER + 2))
+}
+
+fn homescreen_line_blurred(
+    icon_data: &[u8],
+    text_buffer: &mut BufferText,
+    text_info: HomescreenTextInfo,
+    blurring: &BlurringContext,
+    y: i16,
+) -> bool {
+    let t_buffer = unsafe { get_buffer_4bpp((y & 0x1) as u16, true) };
+    let mut img_buffer = unsafe { get_buffer_16bpp((y & 0x1) as u16, false) };
+
+    for x in 0..HOMESCREEN_IMAGE_SIZE {
+        let c = if homescreen_dim_area(x, y) {
+            let x = x as usize;
+
+            let coef = (65536_f32 * LOCKSCREEN_DIM) as u32;
+
+            let r = (blurring.totals[RED_IDX][x] as u32 * BLUR_DIV) >> 16;
+            let g = (blurring.totals[GREEN_IDX][x] as u32 * BLUR_DIV) >> 16;
+            let b = (blurring.totals[BLUE_IDX][x] as u32 * BLUR_DIV) >> 16;
+
+            let r = (((coef * r) >> 8) & 0xF800) as u16;
+            let g = (((coef * g) >> 13) & 0x07E0) as u16;
+            let b = (((coef * b) >> 19) & 0x001F) as u16;
+
+            r | g | b
+        } else {
+            let x = x as usize;
+
+            let r = (((blurring.totals[RED_IDX][x] as u32 * BLUR_DIV) >> 8) & 0xF800) as u16;
+            let g = (((blurring.totals[GREEN_IDX][x] as u32 * BLUR_DIV) >> 13) & 0x07E0) as u16;
+            let b = (((blurring.totals[BLUE_IDX][x] as u32 * BLUR_DIV) >> 19) & 0x001F) as u16;
+            r | g | b
+        };
+
+        let j = (2 * x) as usize;
+        img_buffer.buffer[j + 1] = (c >> 8) as u8;
+        img_buffer.buffer[j] = (c & 0xFF) as u8;
+    }
+
+    let done = homescreen_get_fg_text(y, text_info, text_buffer, t_buffer);
+    homescreen_get_fg_icon(y, text_info, icon_data, t_buffer);
+
+    dma2d_wait_for_transfer();
+    dma2d_setup_4bpp_over_16bpp(text_info.text_color.into());
+    dma2d_start_blend(&t_buffer.buffer, &img_buffer.buffer, WIDTH);
+
+    done
+}
+
+fn homescreen_line(
+    icon_data: &[u8],
+    text_buffer: &mut BufferText,
+    text_info: HomescreenTextInfo,
+    data_buffer: &mut BufferJpeg,
+    mcu_height: i16,
+    y: i16,
+) -> bool {
+    let t_buffer = unsafe { get_buffer_4bpp((y & 0x1) as u16, true) };
+    let mut img_buffer = unsafe { get_buffer_16bpp((y & 0x1) as u16, false) };
+
+    let image_data = get_data(data_buffer, y, mcu_height);
+
+    for x in 0..HOMESCREEN_IMAGE_SIZE {
+        let d = image_data[x as usize];
+
+        let c = if homescreen_dim_area(x, y) {
+            let coef = (65536_f32 * HOMESCREEN_DIM) as u32;
+
+            let r = (d & 0xF800) >> 8;
+            let g = (d & 0x07E0) >> 3;
+            let b = (d & 0x001F) << 3;
+
+            let r = (((coef * r as u32) >> 8) & 0xF800) as u16;
+            let g = (((coef * g as u32) >> 13) & 0x07E0) as u16;
+            let b = (((coef * b as u32) >> 19) & 0x001F) as u16;
+            r | g | b
+        } else {
+            d
+        };
+
+        let j = 2 * x as usize;
+        img_buffer.buffer[j + 1] = (c >> 8) as u8;
+        img_buffer.buffer[j] = (c & 0xFF) as u8;
+    }
+
+    let done = homescreen_get_fg_text(y, text_info, text_buffer, t_buffer);
+    homescreen_get_fg_icon(y, text_info, icon_data, t_buffer);
+
+    dma2d_wait_for_transfer();
+    dma2d_setup_4bpp_over_16bpp(text_info.text_color.into());
+    dma2d_start_blend(&t_buffer.buffer, &img_buffer.buffer, WIDTH);
+
+    done
+}
+
+fn homescreen_next_text(
+    texts: &[HomescreenText],
+    text_buffer: &mut BufferText,
+    icon_data: &mut [u8],
+    text_info: HomescreenTextInfo,
+    text_idx: usize,
+) -> (HomescreenTextInfo, usize) {
+    let mut next_text_idx = text_idx;
+    let mut next_text_info = text_info;
+
+    if next_text_idx < texts.len() {
+        if let Some(txt) = texts.get(next_text_idx) {
+            text_buffer.buffer.fill(0);
+            next_text_info = homescreen_position_text(txt, text_buffer, icon_data);
+            next_text_idx += 1;
+        }
+    }
+
+    (next_text_info, next_text_idx)
+}
+
+#[inline(always)]
+fn update_accs_add(data: &[u16], idx: usize, acc_r: &mut u16, acc_g: &mut u16, acc_b: &mut u16) {
+    let d = data[idx];
+    let r = (d & 0xF800) >> 8;
+    let g = (d & 0x07E0) >> 3;
+    let b = (d & 0x001F) << 3;
+    *acc_r += r;
+    *acc_g += g;
+    *acc_b += b;
+}
+
+#[inline(always)]
+fn update_accs_sub(data: &[u16], idx: usize, acc_r: &mut u16, acc_g: &mut u16, acc_b: &mut u16) {
+    let d = data[idx];
+    let r = (d & 0xF800) >> 8;
+    let g = (d & 0x07E0) >> 3;
+    let b = (d & 0x001F) << 3;
+    *acc_r -= r;
+    *acc_g -= g;
+    *acc_b -= b;
+}
+
+struct BlurringContext {
+    pub lines: &'static mut [[[u16; 240usize]; 3usize]],
+    pub totals: [[u16; HOMESCREEN_IMAGE_SIZE as usize]; COLORS],
+    line_num: i16,
+    add_idx: usize,
+    rem_idx: usize,
+}
+
+impl BlurringContext {
+    pub fn new() -> Self {
+        let mem = unsafe { get_blurring_buffer(0, true) };
+        Self {
+            lines: &mut mem.buffer[0..DECOMP_LINES],
+            totals: [[0; HOMESCREEN_IMAGE_SIZE as usize]; COLORS],
+            line_num: 0,
+            add_idx: 0,
+            rem_idx: 0,
+        }
+    }
+
+    fn clear(&mut self) {
+        for (i, total) in self.totals.iter_mut().enumerate() {
+            for line in self.lines.iter_mut() {
+                line[i].fill(0);
+            }
+            total.fill(0);
+        }
+    }
+
+    // computes color averages for one line of image data
+    fn compute_line_avgs(&mut self, buffer: &mut BufferJpeg, mcu_height: i16) {
+        let mut acc_r = 0;
+        let mut acc_g = 0;
+        let mut acc_b = 0;
+        let data = get_data(buffer, self.line_num, mcu_height);
+
+        for i in -BLUR_RADIUS..=BLUR_RADIUS {
+            let ic = i.clamp(0, HOMESCREEN_IMAGE_SIZE as i16 - 1) as usize;
+            update_accs_add(data, ic, &mut acc_r, &mut acc_g, &mut acc_b);
+        }
+
+        for i in 0..HOMESCREEN_IMAGE_SIZE {
+            self.lines[self.add_idx][RED_IDX][i as usize] = acc_r;
+            self.lines[self.add_idx][GREEN_IDX][i as usize] = acc_g;
+            self.lines[self.add_idx][BLUE_IDX][i as usize] = acc_b;
+
+            // clamping handles left and right edges
+            let ic = (i - BLUR_RADIUS).clamp(0, HOMESCREEN_IMAGE_SIZE as i16 - 1) as usize;
+            let ic2 = (i + BLUR_SIZE as i16 - BLUR_RADIUS)
+                .clamp(0, HOMESCREEN_IMAGE_SIZE as i16 - 1) as usize;
+            update_accs_add(data, ic2, &mut acc_r, &mut acc_g, &mut acc_b);
+            update_accs_sub(data, ic, &mut acc_r, &mut acc_g, &mut acc_b);
+        }
+        self.line_num += 1;
+    }
+
+    // adds one line of averages to sliding total averages
+    fn vertical_avg_add(&mut self) {
+        for i in 0..HOMESCREEN_IMAGE_SIZE as usize {
+            self.totals[RED_IDX][i] += self.lines[self.add_idx][RED_IDX][i];
+            self.totals[GREEN_IDX][i] += self.lines[self.add_idx][GREEN_IDX][i];
+            self.totals[BLUE_IDX][i] += self.lines[self.add_idx][BLUE_IDX][i];
+        }
+    }
+
+    // adds one line and removes one line of averages to/from sliding total averages
+    fn vertical_avg(&mut self) {
+        for i in 0..HOMESCREEN_IMAGE_SIZE as usize {
+            self.totals[RED_IDX][i] +=
+                self.lines[self.add_idx][RED_IDX][i] - self.lines[self.rem_idx][RED_IDX][i];
+            self.totals[GREEN_IDX][i] +=
+                self.lines[self.add_idx][GREEN_IDX][i] - self.lines[self.rem_idx][GREEN_IDX][i];
+            self.totals[BLUE_IDX][i] +=
+                self.lines[self.add_idx][BLUE_IDX][i] - self.lines[self.rem_idx][BLUE_IDX][i];
+        }
+    }
+
+    fn inc_add(&mut self) {
+        self.add_idx += 1;
+        if self.add_idx >= DECOMP_LINES {
+            self.add_idx = 0;
+        }
+    }
+
+    fn inc_rem(&mut self) {
+        self.rem_idx += 1;
+        if self.rem_idx >= DECOMP_LINES {
+            self.rem_idx = 0;
+        }
+    }
+
+    fn get_line_num(&self) -> i16 {
+        self.line_num
+    }
+}
+
+#[inline(always)]
+fn get_data(buffer: &mut BufferJpeg, line_num: i16, mcu_height: i16) -> &mut [u16] {
+    let data_start = ((line_num % mcu_height) * WIDTH) as usize;
+    let data_end = (((line_num % mcu_height) + 1) * WIDTH) as usize;
+    &mut buffer.buffer[data_start..data_end]
+}
+
+pub fn homescreen_blurred(data: &[u8], texts: &[HomescreenText]) {
+    let mut icon_data = [0_u8; (HOMESCREEN_MAX_ICON_SIZE * HOMESCREEN_MAX_ICON_SIZE / 2) as usize];
+
+    let text_buffer = unsafe { get_text_buffer(0, true) };
+
+    let mut next_text_idx = 1;
+    let mut text_info =
+        homescreen_position_text(unwrap!(texts.get(0)), text_buffer, &mut icon_data);
+
+    let jpeg_pool = unsafe { get_jpeg_work_buffer(0, true).buffer.as_mut_slice() };
+    let jpeg_buffer = unsafe { get_jpeg_buffer(0, true) };
+    let mut jpeg_input = BufferInput(data);
+    let mut jpeg_output = BufferOutput::new(jpeg_buffer, WIDTH, 16);
+    let mut mcu_height = 8;
+    let mut jd: Option<JDEC> = JDEC::new(&mut jpeg_input, jpeg_pool).ok();
+
+    if let Some(dec) = &jd {
+        mcu_height = dec.mcu_height();
+        if !(dec.width() == WIDTH && dec.height() == HEIGHT && mcu_height <= 16) {
+            jd = None
+        }
+    }
+    jd.as_mut().map(|dec| dec.decomp(&mut jpeg_output));
+
+    set_window(screen());
+
+    let mut blurring = BlurringContext::new();
+
+    // handling top edge case: preload the edge value N+1 times
+    blurring.compute_line_avgs(jpeg_output.buffer(), mcu_height);
+
+    for _ in 0..=BLUR_RADIUS {
+        blurring.vertical_avg_add();
+    }
+    blurring.inc_add();
+
+    // load enough values to be able to compute first line averages
+    for _ in 0..BLUR_RADIUS {
+        blurring.compute_line_avgs(jpeg_output.buffer(), mcu_height);
+        blurring.vertical_avg_add();
+        blurring.inc_add();
+
+        if (blurring.get_line_num() % mcu_height) == 0 {
+            jd.as_mut().map(|dec| dec.decomp(&mut jpeg_output));
+        }
+    }
+
+    for y in 0..HEIGHT {
+        // several lines have been already decompressed before this loop, adjust for
+        // that
+        if y < HOMESCREEN_IMAGE_SIZE - (BLUR_RADIUS + 1) {
+            blurring.compute_line_avgs(jpeg_output.buffer(), mcu_height);
+        }
+
+        let done = homescreen_line_blurred(&icon_data, text_buffer, text_info, &blurring, y);
+
+        if done {
+            (text_info, next_text_idx) =
+                homescreen_next_text(texts, text_buffer, &mut icon_data, text_info, next_text_idx);
+        }
+
+        blurring.vertical_avg();
+
+        // handling bottom edge case: stop incrementing counter, adding the edge value
+        // for the rest of image
+        // the extra -1 is to indicate that this was the last decompressed line,
+        // in the next pass the docompression and compute_line_avgs won't happen
+        if y < HOMESCREEN_IMAGE_SIZE - (BLUR_RADIUS + 1) - 1 {
+            blurring.inc_add();
+        }
+
+        if y == HOMESCREEN_IMAGE_SIZE {
+            // reached end of image, clear avgs (display black)
+            blurring.clear();
+        }
+
+        // only start incrementing remove index when enough lines have been loaded
+        if y >= (BLUR_RADIUS) {
+            blurring.inc_rem();
+        }
+
+        if (blurring.get_line_num() % mcu_height) == 0 && (blurring.get_line_num() < HEIGHT) {
+            jd.as_mut().map(|dec| dec.decomp(&mut jpeg_output));
+        }
+    }
+    dma2d_wait_for_transfer();
+}
+
+pub fn homescreen(
+    data: &[u8],
+    texts: &[HomescreenText],
+    notification: Option<HomescreenNotification>,
+    notification_only: bool,
+) {
+    let mut icon_data = [0_u8; (HOMESCREEN_MAX_ICON_SIZE * HOMESCREEN_MAX_ICON_SIZE / 2) as usize];
+
+    let text_buffer = unsafe { get_text_buffer(0, true) };
+
+    let mut next_text_idx = 0;
+    let mut text_info = if let Some(notification) = notification {
+        bar_radius_buffer(
+            NOTIFICATION_BORDER,
+            0,
+            WIDTH - NOTIFICATION_BORDER * 2,
+            NOTIFICATION_HEIGHT,
+            2,
+            text_buffer,
+        );
+        let area = Rect::new(
+            Point::new(0, NOTIFICATION_BORDER),
+            Point::new(WIDTH, NOTIFICATION_HEIGHT + NOTIFICATION_BORDER),
+        );
+        HomescreenTextInfo {
+            text_area: area,
+            text_width: WIDTH,
+            text_color: notification.color,
+            icon_area: None,
+        }
+    } else {
+        next_text_idx += 1;
+        homescreen_position_text(unwrap!(texts.get(0)), text_buffer, &mut icon_data)
+    };
+
+    let jpeg_pool = unsafe { get_jpeg_work_buffer(0, true).buffer.as_mut_slice() };
+    let jpeg_buffer = unsafe { get_jpeg_buffer(0, true) };
+    let mut jpeg_input = BufferInput(data);
+    let mut jpeg_output = BufferOutput::new(jpeg_buffer, WIDTH, 16);
+    let mut mcu_height = 8;
+    let mut jd: Option<JDEC> = JDEC::new(&mut jpeg_input, jpeg_pool).ok();
+
+    if let Some(dec) = &jd {
+        mcu_height = dec.mcu_height();
+        if !(dec.width() == WIDTH && dec.height() == HEIGHT && mcu_height <= 16) {
+            jd = None
+        }
+    }
+
+    set_window(screen());
+
+    let mcu_height = mcu_height as i16;
+
+    for y in 0..HEIGHT {
+        if (y % mcu_height) == 0 {
+            jd.as_mut().map(|dec| dec.decomp(&mut jpeg_output));
+        }
+
+        let done = homescreen_line(
+            &icon_data,
+            text_buffer,
+            text_info,
+            jpeg_output.buffer(),
+            mcu_height,
+            y,
+        );
+
+        if done {
+            if notification.is_some() && next_text_idx == 0 {
+                //finished notification area, let interrupt and draw the text
+                let notification = unwrap!(notification);
+
+                let style = TextStyle {
+                    background_color: notification.color,
+                    ..theme::TEXT_BOLD
+                };
+
+                dma2d_wait_for_transfer();
+
+                icon_text_center(
+                    text_info.text_area.center(),
+                    notification.icon,
+                    8,
+                    notification.text,
+                    style,
+                    Offset::new(1, -2),
+                );
+                set_window(
+                    screen()
+                        .split_top(NOTIFICATION_HEIGHT + NOTIFICATION_BORDER)
+                        .1,
+                );
+            }
+
+            if notification_only && next_text_idx == 0 {
+                dma2d_wait_for_transfer();
+                return;
+            }
+
+            (text_info, next_text_idx) =
+                homescreen_next_text(texts, text_buffer, &mut icon_data, text_info, next_text_idx);
+        }
+    }
+    dma2d_wait_for_transfer();
+}
diff --git a/core/embed/rust/src/ui/model_tt/component/keyboard/bip39.rs b/core/embed/rust/src/ui/model_tt/component/keyboard/bip39.rs
index b91b24b02d..6ea210ee13 100644
--- a/core/embed/rust/src/ui/model_tt/component/keyboard/bip39.rs
+++ b/core/embed/rust/src/ui/model_tt/component/keyboard/bip39.rs
@@ -3,7 +3,8 @@ use crate::{
     ui::{
         component::{Component, Event, EventCtx},
         display,
-        geometry::{Offset, Rect},
+        display::toif::Icon,
+        geometry::{Offset, Rect, CENTER},
         model_tt::{
             component::{
                 keyboard::{
@@ -23,6 +24,7 @@ pub struct Bip39Input {
     button: Button<&'static str>,
     textbox: TextBox<MAX_LENGTH>,
     multi_tap: MultiTapKeyboard,
+    options_num: Option<usize>,
     suggested_word: Option<&'static str>,
 }
 
@@ -61,6 +63,14 @@ impl MnemonicInput for Bip39Input {
         self.complete_word_from_dictionary(ctx);
     }
 
+    /// Backspace button was long pressed, let's delete all characters of input
+    /// and clear the pending marker.
+    fn on_backspace_long_press(&mut self, ctx: &mut EventCtx) {
+        self.multi_tap.clear_pending_state(ctx);
+        self.textbox.clear(ctx);
+        self.complete_word_from_dictionary(ctx);
+    }
+
     fn is_empty(&self) -> bool {
         self.textbox.is_empty()
     }
@@ -130,7 +140,7 @@ impl Component for Bip39Input {
             // Icon is painted in the right-center point, of expected size 16x16 pixels, and
             // 16px from the right edge.
             let icon_center = area.top_right().center(area.bottom_right()) - Offset::new(16 + 8, 0);
-            display::icon(icon_center, icon, style.text_color, style.button_color);
+            icon.draw(icon_center, CENTER, style.text_color, style.button_color);
         }
     }
 
@@ -145,6 +155,7 @@ impl Bip39Input {
             button: Button::empty(),
             textbox: TextBox::empty(),
             multi_tap: MultiTapKeyboard::new(),
+            options_num: None,
             suggested_word: None,
         }
     }
@@ -164,17 +175,21 @@ impl Bip39Input {
     /// Input button was clicked.  If the content matches the suggested word,
     /// let's confirm it, otherwise just auto-complete.
     fn on_input_click(&mut self, ctx: &mut EventCtx) -> Option<MnemonicInputMsg> {
-        match self.suggested_word {
-            Some(word) if word == self.textbox.content() => {
+        if let (Some(word), Some(num)) = (self.suggested_word, self.options_num) {
+            return if num == 1 && word.starts_with(self.textbox.content())
+                || num > 1 && word.eq(self.textbox.content())
+            {
+                // Confirm button.
                 self.textbox.clear(ctx);
                 Some(MnemonicInputMsg::Confirmed)
-            }
-            Some(word) => {
+            } else {
+                // Auto-complete button.
                 self.textbox.replace(ctx, word);
+                self.complete_word_from_dictionary(ctx);
                 Some(MnemonicInputMsg::Completed)
-            }
-            None => None,
+            };
         }
+        None
     }
 
     /// Timeout occurred.  If we can auto-complete current input, let's just
@@ -190,22 +205,25 @@ impl Bip39Input {
     }
 
     fn complete_word_from_dictionary(&mut self, ctx: &mut EventCtx) {
+        self.options_num = bip39::options_num(self.textbox.content());
         self.suggested_word = bip39::complete_word(self.textbox.content());
 
         // Change the style of the button depending on the completed word.
-        if let Some(word) = self.suggested_word {
-            if self.textbox.content() == word {
+        if let (Some(word), Some(num)) = (self.suggested_word, self.options_num) {
+            if num == 1 && word.starts_with(self.textbox.content())
+                || num > 1 && word.eq(self.textbox.content())
+            {
                 // Confirm button.
                 self.button.enable(ctx);
                 self.button.set_stylesheet(ctx, theme::button_confirm());
                 self.button
-                    .set_content(ctx, ButtonContent::Icon(theme::ICON_CONFIRM));
+                    .set_content(ctx, ButtonContent::Icon(Icon::new(theme::ICON_CONFIRM)));
             } else {
                 // Auto-complete button.
                 self.button.enable(ctx);
                 self.button.set_stylesheet(ctx, theme::button_default());
                 self.button
-                    .set_content(ctx, ButtonContent::Icon(theme::ICON_CLICK));
+                    .set_content(ctx, ButtonContent::Icon(Icon::new(theme::ICON_CLICK)));
             }
         } else {
             // Disabled button.
diff --git a/core/embed/rust/src/ui/model_tt/component/keyboard/mnemonic.rs b/core/embed/rust/src/ui/model_tt/component/keyboard/mnemonic.rs
index de0f31175f..fa34523522 100644
--- a/core/embed/rust/src/ui/model_tt/component/keyboard/mnemonic.rs
+++ b/core/embed/rust/src/ui/model_tt/component/keyboard/mnemonic.rs
@@ -1,8 +1,7 @@
-use core::ops::Deref;
-
 use crate::ui::{
     component::{maybe::paint_overlapping, Child, Component, Event, EventCtx, Label, Maybe},
-    geometry::{Alignment, Grid, Offset, Rect},
+    display::toif::Icon,
+    geometry::{Grid, Offset, Rect, CENTER},
     model_tt::{
         component::{Button, ButtonMsg},
         theme,
@@ -29,7 +28,7 @@ pub struct MnemonicKeyboard<T, U> {
 impl<T, U> MnemonicKeyboard<T, U>
 where
     T: MnemonicInput,
-    U: Deref<Target = str>,
+    U: AsRef<str>,
 {
     pub fn new(input: T, prompt: U) -> Self {
         Self {
@@ -40,11 +39,12 @@ where
             back: Child::new(Maybe::hidden(
                 theme::BG,
                 Button::with_icon_blend(
-                    theme::IMAGE_BG_BACK_BTN_TALL,
-                    theme::ICON_BACK,
+                    Icon::new(theme::IMAGE_BG_BACK_BTN_TALL),
+                    Icon::new(theme::ICON_BACK),
                     Offset::new(30, 17),
                 )
-                .styled(theme::button_clear()),
+                .styled(theme::button_clear())
+                .with_long_press(theme::ERASE_HOLD_DURATION),
             )),
             input: Child::new(Maybe::hidden(theme::BG, input)),
             keys: T::keys().map(Button::with_text).map(Child::new),
@@ -89,7 +89,7 @@ where
 impl<T, U> Component for MnemonicKeyboard<T, U>
 where
     T: MnemonicInput,
-    U: Deref<Target = str>,
+    U: AsRef<str>,
 {
     type Msg = MnemonicKeyboardMsg;
 
@@ -101,8 +101,7 @@ where
 
         let prompt_center = grid.row_col(0, 0).union(grid.row_col(0, 3)).center();
         let prompt_size = self.prompt.inner().inner().max_size();
-        let prompt_top_left = prompt_size.snap(prompt_center, Alignment::Center, Alignment::Center);
-        let prompt_area = Rect::from_top_left_and_size(prompt_top_left, prompt_size);
+        let prompt_area = Rect::snap(prompt_center, prompt_size, CENTER);
 
         self.prompt.place(prompt_area);
         self.back.place(back_area);
@@ -126,11 +125,21 @@ where
             }
             _ => {}
         }
-        if let Some(ButtonMsg::Clicked) = self.back.event(ctx, event) {
-            self.input
-                .mutate(ctx, |ctx, i| i.inner_mut().on_backspace_click(ctx));
-            self.on_input_change(ctx);
-            return None;
+
+        match self.back.event(ctx, event) {
+            Some(ButtonMsg::Clicked) => {
+                self.input
+                    .mutate(ctx, |ctx, i| i.inner_mut().on_backspace_click(ctx));
+                self.on_input_change(ctx);
+                return None;
+            }
+            Some(ButtonMsg::LongPressed) => {
+                self.input
+                    .mutate(ctx, |ctx, i| i.inner_mut().on_backspace_long_press(ctx));
+                self.on_input_change(ctx);
+                return None;
+            }
+            _ => {}
         }
         for (key, btn) in self.keys.iter_mut().enumerate() {
             if let Some(ButtonMsg::Clicked) = btn.event(ctx, event) {
@@ -165,6 +174,7 @@ pub trait MnemonicInput: Component<Msg = MnemonicInputMsg> {
     fn can_key_press_lead_to_a_valid_word(&self, key: usize) -> bool;
     fn on_key_click(&mut self, ctx: &mut EventCtx, key: usize);
     fn on_backspace_click(&mut self, ctx: &mut EventCtx);
+    fn on_backspace_long_press(&mut self, ctx: &mut EventCtx);
     fn is_empty(&self) -> bool;
     fn mnemonic(&self) -> Option<&'static str>;
 }
diff --git a/core/embed/rust/src/ui/model_tt/component/keyboard/passphrase.rs b/core/embed/rust/src/ui/model_tt/component/keyboard/passphrase.rs
index 4b39a930bb..23b6750b03 100644
--- a/core/embed/rust/src/ui/model_tt/component/keyboard/passphrase.rs
+++ b/core/embed/rust/src/ui/model_tt/component/keyboard/passphrase.rs
@@ -1,9 +1,10 @@
 use crate::ui::{
     component::{base::ComponentExt, Child, Component, Event, EventCtx, Never},
     display,
+    display::toif::Icon,
     geometry::{Grid, Insets, Offset, Rect},
     model_tt::component::{
-        button::{Button, ButtonContent, ButtonMsg::Clicked},
+        button::{Button, ButtonContent, ButtonMsg},
         keyboard::common::{
             paint_pending_marker, MultiTapKeyboard, TextBox, HEADER_HEIGHT, HEADER_PADDING_BOTTOM,
             HEADER_PADDING_SIDE,
@@ -23,7 +24,7 @@ pub struct PassphraseKeyboard {
     input: Child<Input>,
     back: Child<Button<&'static str>>,
     confirm: Child<Button<&'static str>>,
-    keys: [[Child<Button<&'static str>>; KEY_COUNT]; PAGE_COUNT],
+    keys: [Child<Button<&'static str>>; KEY_COUNT],
     scrollbar: ScrollBar,
     fade: bool,
 }
@@ -46,27 +47,20 @@ impl PassphraseKeyboard {
         Self {
             page_swipe: Swipe::horizontal(),
             input: Input::new().into_child(),
-            confirm: Button::with_icon(theme::ICON_CONFIRM)
+            confirm: Button::with_icon(Icon::new(theme::ICON_CONFIRM))
                 .styled(theme::button_confirm())
                 .into_child(),
             back: Button::with_icon_blend(
-                theme::IMAGE_BG_BACK_BTN,
-                theme::ICON_BACK,
+                Icon::new(theme::IMAGE_BG_BACK_BTN),
+                Icon::new(theme::ICON_BACK),
                 Offset::new(30, 12),
             )
             .styled(theme::button_reset())
             .initially_enabled(false)
+            .with_long_press(theme::ERASE_HOLD_DURATION)
             .into_child(),
-            keys: KEYBOARD.map(|page| {
-                page.map(|text| {
-                    if text == " " {
-                        let icon = theme::ICON_SPACE;
-                        Child::new(Button::with_icon(icon))
-                    } else {
-                        Child::new(Button::with_text(text))
-                    }
-                })
-            }),
+            keys: KEYBOARD[STARTING_PAGE]
+                .map(|text| Child::new(Button::new(Self::key_content(text)))),
             scrollbar: ScrollBar::horizontal(),
             fade: false,
         }
@@ -81,6 +75,13 @@ impl PassphraseKeyboard {
         }
     }
 
+    fn key_content(text: &'static str) -> ButtonContent<&'static str> {
+        match text {
+            " " => ButtonContent::Icon(Icon::new(theme::ICON_SPACE)),
+            t => ButtonContent::Text(t),
+        }
+    }
+
     fn on_page_swipe(&mut self, ctx: &mut EventCtx, swipe: SwipeDirection) {
         // Change the page number.
         let key_page = self.scrollbar.active_page;
@@ -93,10 +94,8 @@ impl PassphraseKeyboard {
         // Clear the pending state.
         self.input
             .mutate(ctx, |ctx, i| i.multi_tap.clear_pending_state(ctx));
-        // Make sure to completely repaint the new buttons.
-        for btn in &mut self.keys[key_page] {
-            btn.request_complete_repaint(ctx);
-        }
+        // Update buttons.
+        self.replace_button_content(ctx, key_page);
         // Reset backlight to normal level on next paint.
         self.fade = true;
         // So that swipe does not visually enable the input buttons when max length
@@ -104,6 +103,15 @@ impl PassphraseKeyboard {
         self.update_input_btns_state(ctx);
     }
 
+    fn replace_button_content(&mut self, ctx: &mut EventCtx, page: usize) {
+        for (i, btn) in self.keys.iter_mut().enumerate() {
+            let text = KEYBOARD[page][i];
+            let content = Self::key_content(text);
+            btn.mutate(ctx, |ctx, b| b.set_content(ctx, content));
+            btn.request_complete_repaint(ctx);
+        }
+    }
+
     /// Possibly changing the buttons' state after change of the input.
     fn after_edit(&mut self, ctx: &mut EventCtx) {
         self.update_back_btn_state(ctx);
@@ -121,7 +129,7 @@ impl PassphraseKeyboard {
 
     /// When the input has reached max length, disable all the input buttons.
     fn update_input_btns_state(&mut self, ctx: &mut EventCtx) {
-        for btn in self.keys[self.scrollbar.active_page].iter_mut() {
+        for btn in self.keys.iter_mut() {
             btn.mutate(ctx, |ctx, b| {
                 if self.input.inner().textbox.is_full() {
                     b.disable(ctx);
@@ -162,20 +170,18 @@ impl Component for PassphraseKeyboard {
         self.scrollbar
             .set_count_and_active_page(PAGE_COUNT, STARTING_PAGE);
 
-        // Place all the possible character buttons on all swipe-separated screens.
-        for swipe_screen in &mut self.keys {
-            for (key, btn) in swipe_screen.iter_mut().enumerate() {
-                // Assign the keys in each page to buttons on a 5x3 grid, starting
-                // from the second row.
-                let area = key_grid.cell(if key < 9 {
-                    // The grid has 3 columns, and we skip the first row.
-                    key
-                } else {
-                    // For the last key (the "0" position) we skip one cell.
-                    key + 1
-                });
-                btn.place(area);
-            }
+        // Place all the character buttons.
+        for (key, btn) in &mut self.keys.iter_mut().enumerate() {
+            // Assign the keys in each page to buttons on a 5x3 grid, starting
+            // from the second row.
+            let area = key_grid.cell(if key < 9 {
+                // The grid has 3 columns, and we skip the first row.
+                key
+            } else {
+                // For the last key (the "0" position) we skip one cell.
+                key + 1
+            });
+            btn.place(area);
         }
 
         bounds
@@ -192,31 +198,43 @@ impl Component for PassphraseKeyboard {
             self.on_page_swipe(ctx, swipe);
             return None;
         }
-        if let Some(Clicked) = self.confirm.event(ctx, event) {
+        if let Some(ButtonMsg::Clicked) = self.confirm.event(ctx, event) {
             // Confirm button was clicked, we're done.
             return Some(PassphraseKeyboardMsg::Confirmed);
         }
-        if let Some(Clicked) = self.back.event(ctx, event) {
-            // Backspace button was clicked. If we have any content in the textbox, let's
-            // delete the last character. Otherwise cancel.
-            return if self.input.inner().textbox.is_empty() {
-                Some(PassphraseKeyboardMsg::Cancelled)
-            } else {
+
+        match self.back.event(ctx, event) {
+            Some(ButtonMsg::Clicked) => {
+                // Backspace button was clicked. If we have any content in the textbox, let's
+                // delete the last character. Otherwise cancel.
+                return if self.input.inner().textbox.is_empty() {
+                    Some(PassphraseKeyboardMsg::Cancelled)
+                } else {
+                    self.input.mutate(ctx, |ctx, i| {
+                        i.multi_tap.clear_pending_state(ctx);
+                        i.textbox.delete_last(ctx);
+                    });
+                    self.after_edit(ctx);
+                    None
+                };
+            }
+            Some(ButtonMsg::LongPressed) => {
                 self.input.mutate(ctx, |ctx, i| {
                     i.multi_tap.clear_pending_state(ctx);
-                    i.textbox.delete_last(ctx);
+                    i.textbox.clear(ctx);
                 });
                 self.after_edit(ctx);
-                None
-            };
+                return None;
+            }
+            _ => {}
         }
 
         // Process key button events in case we did not reach maximum passphrase length.
         // (All input buttons should be disallowed in that case, this is just a safety
         // measure.)
         if !self.input.inner().textbox.is_full() {
-            for (key, btn) in self.keys[self.scrollbar.active_page].iter_mut().enumerate() {
-                if let Some(Clicked) = btn.event(ctx, event) {
+            for (key, btn) in self.keys.iter_mut().enumerate() {
+                if let Some(ButtonMsg::Clicked) = btn.event(ctx, event) {
                     // Key button was clicked. If this button is pending, let's cycle the pending
                     // character in textbox. If not, let's just append the first character.
                     let text = Self::key_text(btn.inner().content());
@@ -237,7 +255,7 @@ impl Component for PassphraseKeyboard {
         self.scrollbar.paint();
         self.confirm.paint();
         self.back.paint();
-        for btn in &mut self.keys[self.scrollbar.active_page] {
+        for btn in &mut self.keys {
             btn.paint();
         }
         if self.fade {
@@ -252,7 +270,7 @@ impl Component for PassphraseKeyboard {
         self.scrollbar.bounds(sink);
         self.confirm.bounds(sink);
         self.back.bounds(sink);
-        for btn in &self.keys[self.scrollbar.active_page] {
+        for btn in &self.keys {
             btn.bounds(sink)
         }
     }
@@ -287,7 +305,7 @@ impl Component for Input {
     }
 
     fn paint(&mut self) {
-        let style = theme::label_default();
+        let style = theme::label_keyboard();
 
         let mut text_baseline = self.area.top_left() + Offset::y(style.text_font.text_height())
             - Offset::y(style.text_font.text_baseline());
diff --git a/core/embed/rust/src/ui/model_tt/component/keyboard/pin.rs b/core/embed/rust/src/ui/model_tt/component/keyboard/pin.rs
index a16bbb5114..8b3d70a0fc 100644
--- a/core/embed/rust/src/ui/model_tt/component/keyboard/pin.rs
+++ b/core/embed/rust/src/ui/model_tt/component/keyboard/pin.rs
@@ -1,4 +1,4 @@
-use core::{mem, ops::Deref};
+use core::mem;
 use heapless::String;
 
 use crate::{
@@ -9,9 +9,9 @@ use crate::{
             base::ComponentExt, text::TextStyle, Child, Component, Event, EventCtx, Label, Maybe,
             Never, Pad, TimerToken,
         },
-        display::{self, Font},
+        display::{self, toif::Icon, Font},
         event::TouchEvent,
-        geometry::{Alignment, Grid, Insets, Offset, Rect},
+        geometry::{Grid, Insets, Offset, Rect, CENTER, TOP_LEFT},
         model_tt::component::{
             button::{Button, ButtonContent, ButtonMsg, ButtonMsg::Clicked},
             theme,
@@ -28,7 +28,6 @@ const MAX_LENGTH: usize = 50;
 const MAX_VISIBLE_DOTS: usize = 14;
 const MAX_VISIBLE_DIGITS: usize = 16;
 const DIGIT_COUNT: usize = 10; // 0..10
-const ERASE_HOLD_DURATION: Duration = Duration::from_secs(2);
 
 const HEADER_HEIGHT: i16 = 25;
 const HEADER_PADDING_SIDE: i16 = 5;
@@ -57,7 +56,7 @@ pub struct PinKeyboard<T> {
 
 impl<T> PinKeyboard<T>
 where
-    T: Deref<Target = str>,
+    T: AsRef<str>,
 {
     // Label position fine-tuning.
     const MAJOR_OFF: Offset = Offset::y(-2);
@@ -71,16 +70,17 @@ where
     ) -> Self {
         // Control buttons.
         let erase_btn = Button::with_icon_blend(
-            theme::IMAGE_BG_BACK_BTN,
-            theme::ICON_BACK,
+            Icon::new(theme::IMAGE_BG_BACK_BTN),
+            Icon::new(theme::ICON_BACK),
             Offset::new(30, 12),
         )
         .styled(theme::button_reset())
-        .with_long_press(ERASE_HOLD_DURATION)
+        .with_long_press(theme::ERASE_HOLD_DURATION)
         .initially_enabled(false);
         let erase_btn = Maybe::hidden(theme::BG, erase_btn).into_child();
 
-        let cancel_btn = Button::with_icon(theme::ICON_CANCEL).styled(theme::button_cancel());
+        let cancel_btn =
+            Button::with_icon(Icon::new(theme::ICON_CANCEL)).styled(theme::button_cancel());
         let cancel_btn =
             Maybe::new(Pad::with_background(theme::BG), cancel_btn, allow_cancel).into_child();
 
@@ -96,7 +96,7 @@ where
             textbox_pad: Pad::with_background(theme::label_default().background_color),
             erase_btn,
             cancel_btn,
-            confirm_btn: Button::with_icon(theme::ICON_CONFIRM)
+            confirm_btn: Button::with_icon(Icon::new(theme::ICON_CONFIRM))
                 .styled(theme::button_confirm())
                 .initially_enabled(false)
                 .into_child(),
@@ -151,7 +151,7 @@ where
 
 impl<T> Component for PinKeyboard<T>
 where
-    T: Deref<Target = str>,
+    T: AsRef<str>,
 {
     type Msg = PinKeyboardMsg;
 
@@ -370,9 +370,7 @@ impl PinDots {
     }
 
     fn paint_dots(&self, area: Rect) {
-        let mut cursor = self
-            .size()
-            .snap(area.center(), Alignment::Center, Alignment::Center);
+        let mut cursor = self.size().snap(area.center(), CENTER);
 
         let digits = self.digits.len();
         let dots_visible = digits.min(MAX_VISIBLE_DOTS);
@@ -385,9 +383,9 @@ impl PinDots {
 
         // Small leftmost dot.
         if digits > dots_visible + 1 {
-            display::icon_top_left(
+            Icon::new(theme::DOT_SMALL).draw(
                 cursor - Offset::x(2 * step),
-                theme::DOT_SMALL,
+                TOP_LEFT,
                 self.style.text_color,
                 self.style.background_color,
             );
@@ -395,9 +393,9 @@ impl PinDots {
 
         // Greyed out dot.
         if digits > dots_visible {
-            display::icon_top_left(
+            Icon::new(theme::DOT_ACTIVE).draw(
                 cursor - Offset::x(step),
-                theme::DOT_ACTIVE,
+                TOP_LEFT,
                 theme::GREY_LIGHT,
                 self.style.background_color,
             );
@@ -405,9 +403,9 @@ impl PinDots {
 
         // Draw a dot for each PIN digit.
         for _ in 0..dots_visible {
-            display::icon_top_left(
+            Icon::new(theme::DOT_ACTIVE).draw(
                 cursor,
-                theme::DOT_ACTIVE,
+                TOP_LEFT,
                 self.style.text_color,
                 self.style.background_color,
             );
@@ -465,7 +463,7 @@ impl Component for PinDots {
 #[cfg(feature = "ui_debug")]
 impl<T> crate::trace::Trace for PinKeyboard<T>
 where
-    T: Deref<Target = str>,
+    T: AsRef<str>,
 {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.open("PinKeyboard");
diff --git a/core/embed/rust/src/ui/model_tt/component/keyboard/slip39.rs b/core/embed/rust/src/ui/model_tt/component/keyboard/slip39.rs
index 90c35e7b5f..034f7af600 100644
--- a/core/embed/rust/src/ui/model_tt/component/keyboard/slip39.rs
+++ b/core/embed/rust/src/ui/model_tt/component/keyboard/slip39.rs
@@ -7,7 +7,8 @@ use crate::{
     ui::{
         component::{Component, Event, EventCtx},
         display,
-        geometry::{Offset, Rect},
+        display::toif::Icon,
+        geometry::{Offset, Rect, CENTER},
         model_tt::{
             component::{
                 keyboard::{
@@ -78,6 +79,14 @@ impl MnemonicInput for Slip39Input {
         self.complete_word_from_dictionary(ctx);
     }
 
+    /// Backspace button was long pressed, let's delete all characters of input
+    /// and clear the pending marker.
+    fn on_backspace_long_press(&mut self, ctx: &mut EventCtx) {
+        self.multi_tap.clear_pending_state(ctx);
+        self.textbox.clear(ctx);
+        self.complete_word_from_dictionary(ctx);
+    }
+
     fn is_empty(&self) -> bool {
         self.textbox.is_empty()
     }
@@ -165,7 +174,7 @@ impl Component for Slip39Input {
             // Icon is painted in the right-center point, of expected size 16x16 pixels, and
             // 16px from the right edge.
             let icon_center = area.top_right().center(area.bottom_right()) - Offset::new(16 + 8, 0);
-            display::icon(icon_center, icon, style.text_color, style.button_color);
+            icon.draw(icon_center, CENTER, style.text_color, style.button_color);
         }
     }
 
@@ -217,7 +226,7 @@ impl Slip39Input {
             self.button.enable(ctx);
             self.button.set_stylesheet(ctx, theme::button_confirm());
             self.button
-                .set_content(ctx, ButtonContent::Icon(theme::ICON_CONFIRM));
+                .set_content(ctx, ButtonContent::Icon(Icon::new(theme::ICON_CONFIRM)));
         } else {
             // Disabled button.
             self.button.disable(ctx);
diff --git a/core/embed/rust/src/ui/model_tt/component/loader.rs b/core/embed/rust/src/ui/model_tt/component/loader.rs
index 09dd31983b..ef6bb13fbf 100644
--- a/core/embed/rust/src/ui/model_tt/component/loader.rs
+++ b/core/embed/rust/src/ui/model_tt/component/loader.rs
@@ -3,9 +3,10 @@ use crate::{
     ui::{
         animation::Animation,
         component::{Component, Event, EventCtx},
-        display::{self, Color},
+        display::{self, toif::Icon, Color},
         geometry::{Offset, Rect},
         model_tt::constant,
+        util::animation_disabled,
     },
 };
 
@@ -43,6 +44,16 @@ impl Loader {
         }
     }
 
+    pub fn with_durations(
+        mut self,
+        growing_duration: Duration,
+        shrinking_duration: Duration,
+    ) -> Self {
+        self.growing_duration = growing_duration;
+        self.shrinking_duration = shrinking_duration;
+        self
+    }
+
     pub fn start_growing(&mut self, ctx: &mut EventCtx, now: Instant) {
         let mut anim = Animation::new(
             display::LOADER_MIN,
@@ -131,7 +142,9 @@ impl Component for Loader {
         if let Event::Timer(EventCtx::ANIM_FRAME_TIMER) = event {
             if self.is_animating() {
                 // We have something to paint, so request to be painted in the next pass.
-                ctx.request_paint();
+                if !animation_disabled() {
+                    ctx.request_paint();
+                }
 
                 if self.is_completely_grown(now) {
                     return Some(LoaderMsg::GrownCompletely);
@@ -160,6 +173,7 @@ impl Component for Loader {
             } else {
                 self.styles.active
             };
+
             display::loader(
                 progress,
                 self.offset_y,
@@ -177,7 +191,7 @@ pub struct LoaderStyleSheet {
 }
 
 pub struct LoaderStyle {
-    pub icon: Option<(&'static [u8], Color)>,
+    pub icon: Option<(Icon, Color)>,
     pub loader_color: Color,
     pub background_color: Color,
 }
diff --git a/core/embed/rust/src/ui/model_tt/component/mod.rs b/core/embed/rust/src/ui/model_tt/component/mod.rs
index 55f40330dc..bb3a68e136 100644
--- a/core/embed/rust/src/ui/model_tt/component/mod.rs
+++ b/core/embed/rust/src/ui/model_tt/component/mod.rs
@@ -1,15 +1,19 @@
 mod button;
 mod dialog;
 mod fido;
+#[rustfmt::skip]
 mod fido_icons;
 mod frame;
 mod hold_to_confirm;
+mod homescreen;
 mod keyboard;
 mod loader;
 mod number_input;
 mod page;
+mod progress;
 mod scroll;
 mod swipe;
+mod welcome_screen;
 
 pub use button::{
     Button, ButtonContent, ButtonMsg, ButtonStyle, ButtonStyleSheet, CancelConfirmMsg,
@@ -19,6 +23,7 @@ pub use dialog::{Dialog, DialogMsg, IconDialog};
 pub use fido::{FidoConfirm, FidoMsg};
 pub use frame::{Frame, NotificationFrame};
 pub use hold_to_confirm::{HoldToConfirm, HoldToConfirmMsg};
+pub use homescreen::{Homescreen, HomescreenMsg, Lockscreen};
 pub use keyboard::{
     bip39::Bip39Input,
     mnemonic::{MnemonicInput, MnemonicKeyboard, MnemonicKeyboardMsg},
@@ -30,7 +35,9 @@ pub use keyboard::{
 pub use loader::{Loader, LoaderMsg, LoaderStyle, LoaderStyleSheet};
 pub use number_input::{NumberInputDialog, NumberInputDialogMsg};
 pub use page::{SwipeHoldPage, SwipePage};
+pub use progress::Progress;
 pub use scroll::ScrollBar;
 pub use swipe::{Swipe, SwipeDirection};
+pub use welcome_screen::WelcomeScreen;
 
 use super::theme;
diff --git a/core/embed/rust/src/ui/model_tt/component/page.rs b/core/embed/rust/src/ui/model_tt/component/page.rs
index e0de300978..8ba49e6b59 100644
--- a/core/embed/rust/src/ui/model_tt/component/page.rs
+++ b/core/embed/rust/src/ui/model_tt/component/page.rs
@@ -3,7 +3,7 @@ use crate::ui::{
         base::ComponentExt, paginated::PageMsg, Component, Event, EventCtx, FixedHeightBar, Label,
         Pad, Paginate,
     },
-    display::{self, Color},
+    display::{self, toif::Icon, Color},
     geometry::{Insets, Rect},
     model_tt::component::{Button, ButtonMsg},
 };
@@ -44,7 +44,7 @@ where
     }
 
     pub fn with_back_button(mut self) -> Self {
-        self.button_back = Some(Button::with_icon(theme::ICON_BACK));
+        self.button_back = Some(Button::with_icon(Icon::new(theme::ICON_BACK)));
         self
     }
 
diff --git a/core/embed/rust/src/ui/model_tt/component/progress.rs b/core/embed/rust/src/ui/model_tt/component/progress.rs
new file mode 100644
index 0000000000..344410575e
--- /dev/null
+++ b/core/embed/rust/src/ui/model_tt/component/progress.rs
@@ -0,0 +1,138 @@
+use core::mem;
+
+use crate::{
+    error::Error,
+    ui::{
+        component::{
+            base::ComponentExt,
+            paginated::Paginate,
+            text::paragraphs::{Paragraph, ParagraphStrType, Paragraphs},
+            Child, Component, Event, EventCtx, Label, Never, Pad,
+        },
+        display::{self, Font},
+        geometry::{Insets, Rect},
+        model_tt::constant,
+        util::animation_disabled,
+    },
+};
+
+use super::theme;
+
+pub struct Progress<T> {
+    title: Child<Label<T>>,
+    value: u16,
+    loader_y_offset: i16,
+    indeterminate: bool,
+    description: Child<Paragraphs<Paragraph<T>>>,
+    description_pad: Pad,
+    update_description: fn(&str) -> Result<T, Error>,
+}
+
+impl<T> Progress<T>
+where
+    T: ParagraphStrType,
+{
+    const AREA: Rect = constant::screen().inset(theme::borders());
+
+    pub fn new(
+        title: T,
+        indeterminate: bool,
+        description: T,
+        update_description: fn(&str) -> Result<T, Error>,
+    ) -> Self {
+        Self {
+            title: Label::centered(title, theme::label_progress()).into_child(),
+            value: 0,
+            loader_y_offset: 0,
+            indeterminate,
+            description: Paragraphs::new(
+                Paragraph::new(&theme::TEXT_NORMAL, description).centered(),
+            )
+            .into_child(),
+            description_pad: Pad::with_background(theme::BG),
+            update_description,
+        }
+    }
+}
+
+impl<T> Component for Progress<T>
+where
+    T: ParagraphStrType,
+{
+    type Msg = Never;
+
+    fn place(&mut self, _bounds: Rect) -> Rect {
+        let description_lines = 1 + self
+            .description
+            .inner()
+            .inner()
+            .content()
+            .as_ref()
+            .chars()
+            .filter(|c| *c == '\n')
+            .count() as i16;
+        let (title, rest) = Self::AREA.split_top(self.title.inner().max_size().y);
+        let (loader, description) =
+            rest.split_bottom(Font::NORMAL.line_height() * description_lines);
+        let loader = loader.inset(Insets::top(theme::CONTENT_BORDER));
+        self.title.place(title);
+        self.loader_y_offset = loader.center().y - constant::screen().center().y;
+        self.description.place(description);
+        self.description_pad.place(description);
+        Self::AREA
+    }
+
+    fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
+        if let Event::Progress(new_value, new_description) = event {
+            if mem::replace(&mut self.value, new_value) != new_value {
+                if !animation_disabled() {
+                    ctx.request_paint();
+                }
+                self.description.mutate(ctx, |ctx, para| {
+                    if para.inner_mut().content().as_ref() != new_description {
+                        let new_description = unwrap!((self.update_description)(new_description));
+                        para.inner_mut().update(new_description);
+                        para.change_page(0); // Recompute bounding box.
+                        ctx.request_paint();
+                        self.description_pad.clear();
+                    }
+                });
+            }
+        }
+        None
+    }
+
+    fn paint(&mut self) {
+        self.title.paint();
+        if self.indeterminate {
+            display::loader_indeterminate(
+                self.value,
+                self.loader_y_offset,
+                theme::FG,
+                theme::BG,
+                None,
+            );
+        } else {
+            display::loader(self.value, self.loader_y_offset, theme::FG, theme::BG, None);
+        }
+        self.description_pad.paint();
+        self.description.paint();
+    }
+
+    fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
+        sink(Self::AREA);
+        self.title.bounds(sink);
+        self.description.bounds(sink);
+    }
+}
+
+#[cfg(feature = "ui_debug")]
+impl<T> crate::trace::Trace for Progress<T>
+where
+    T: ParagraphStrType,
+{
+    fn trace(&self, t: &mut dyn crate::trace::Tracer) {
+        t.open("Progress");
+        t.close();
+    }
+}
diff --git a/core/embed/rust/src/ui/model_tt/component/scroll.rs b/core/embed/rust/src/ui/model_tt/component/scroll.rs
index a684fea6b5..e96715170c 100644
--- a/core/embed/rust/src/ui/model_tt/component/scroll.rs
+++ b/core/embed/rust/src/ui/model_tt/component/scroll.rs
@@ -1,7 +1,7 @@
 use crate::ui::{
     component::{Component, Event, EventCtx, Never},
-    display,
-    geometry::{LinearPlacement, Offset, Rect},
+    display::toif::Icon,
+    geometry::{LinearPlacement, Offset, Rect, CENTER},
 };
 
 use super::theme;
@@ -76,11 +76,11 @@ impl Component for ScrollBar {
     }
 
     fn paint(&mut self) {
-        fn dotsize(distance: usize, nhidden: usize) -> &'static [u8] {
+        fn dotsize(distance: usize, nhidden: usize) -> Icon {
             match (nhidden.saturating_sub(distance)).min(2 - distance) {
-                0 => theme::DOT_INACTIVE,
-                1 => theme::DOT_INACTIVE_HALF,
-                _ => theme::DOT_INACTIVE_QUARTER,
+                0 => Icon::new(theme::DOT_INACTIVE),
+                1 => Icon::new(theme::DOT_INACTIVE_HALF),
+                _ => Icon::new(theme::DOT_INACTIVE_QUARTER),
             }
         }
 
@@ -100,7 +100,7 @@ impl Component for ScrollBar {
             );
         for i in first_shown..(last_shown + 1) {
             let icon = if i == self.active_page {
-                theme::DOT_ACTIVE
+                Icon::new(theme::DOT_ACTIVE)
             } else if i <= first_shown + 1 {
                 let before_first_shown = first_shown;
                 dotsize(i - first_shown, before_first_shown)
@@ -108,9 +108,9 @@ impl Component for ScrollBar {
                 let after_last_shown = self.page_count - 1 - last_shown;
                 dotsize(last_shown - i, after_last_shown)
             } else {
-                theme::DOT_INACTIVE
+                Icon::new(theme::DOT_INACTIVE)
             };
-            display::icon(cursor, icon, theme::FG, theme::BG);
+            icon.draw(cursor, CENTER, theme::FG, theme::BG);
             cursor = cursor + Offset::on_axis(self.layout.axis, Self::DOT_INTERVAL);
         }
     }
diff --git a/core/embed/rust/src/ui/model_tt/component/welcome_screen.rs b/core/embed/rust/src/ui/model_tt/component/welcome_screen.rs
new file mode 100644
index 0000000000..e5bc2af4b2
--- /dev/null
+++ b/core/embed/rust/src/ui/model_tt/component/welcome_screen.rs
@@ -0,0 +1,59 @@
+use crate::ui::{
+    component::{Component, Event, EventCtx, Never},
+    display::{self, Icon},
+    geometry::{self, Offset, Rect},
+    model_tt::theme,
+};
+
+const TEXT_BOTTOM_MARGIN: i16 = 24; // matching the homescreen label margin
+const ICON_TOP_MARGIN: i16 = 62;
+const MODEL_NAME: &str = "Trezor Model T";
+const MODEL_NAME_FONT: display::Font = display::Font::DEMIBOLD;
+
+pub struct WelcomeScreen {
+    area: Rect,
+}
+
+impl WelcomeScreen {
+    pub fn new() -> Self {
+        Self { area: Rect::zero() }
+    }
+}
+
+impl Component for WelcomeScreen {
+    type Msg = Never;
+
+    fn place(&mut self, bounds: Rect) -> Rect {
+        self.area = bounds;
+        self.area
+    }
+
+    fn event(&mut self, _ctx: &mut EventCtx, _event: Event) -> Option<Self::Msg> {
+        None
+    }
+
+    fn paint(&mut self) {
+        display::text_center(
+            self.area.bottom_center() - Offset::y(TEXT_BOTTOM_MARGIN),
+            MODEL_NAME,
+            MODEL_NAME_FONT,
+            theme::FG,
+            theme::BG,
+        );
+        Icon::new(theme::ICON_LOGO).draw(
+            self.area.top_center() + Offset::y(ICON_TOP_MARGIN),
+            geometry::TOP_CENTER,
+            theme::FG,
+            theme::BG,
+        );
+    }
+}
+
+#[cfg(feature = "ui_debug")]
+impl crate::trace::Trace for WelcomeScreen {
+    fn trace(&self, t: &mut dyn crate::trace::Tracer) {
+        t.open("WelcomeScreen");
+        t.string(MODEL_NAME);
+        t.close();
+    }
+}
diff --git a/core/embed/rust/src/ui/model_tt/layout.rs b/core/embed/rust/src/ui/model_tt/layout.rs
index 3dee6a2013..f5b5a2427f 100644
--- a/core/embed/rust/src/ui/model_tt/layout.rs
+++ b/core/embed/rust/src/ui/model_tt/layout.rs
@@ -1,9 +1,10 @@
-use core::{cmp::Ordering, convert::TryInto, ops::Deref};
+use core::{cmp::Ordering, convert::TryInto};
+use cstr_core::cstr;
 
 use crate::{
     error::Error,
     micropython::{
-        buffer::StrBuffer,
+        buffer::{get_buffer, StrBuffer},
         gc::Gc,
         iter::{Iter, IterBuf},
         list::List,
@@ -19,6 +20,7 @@ use crate::{
             image::BlendedImage,
             paginated::{PageMsg, Paginate},
             painter,
+            placed::GridPlaced,
             text::{
                 paragraphs::{
                     Checklist, Paragraph, ParagraphSource, ParagraphStrType, ParagraphVecLong,
@@ -26,13 +28,17 @@ use crate::{
                 },
                 TextStyle,
             },
-            Border, Component, Timeout, TimeoutMsg,
+            Border, Component, Empty, FormattedText, Timeout, TimeoutMsg,
         },
+        display::{self, tjpgd::jpeg_info, toif::Icon},
         geometry,
         layout::{
             obj::{ComponentMsgObj, LayoutObj},
             result::{CANCELLED, CONFIRMED, INFO},
-            util::{iter_into_array, iter_into_objs, ConfirmBlob, PropsList},
+            util::{
+                iter_into_array, iter_into_objs, upy_disable_animation, upy_jpeg_info,
+                upy_jpeg_test, ConfirmBlob, PropsList,
+            },
         },
     },
 };
@@ -41,12 +47,13 @@ use super::{
     component::{
         Bip39Input, Button, ButtonMsg, ButtonStyleSheet, CancelConfirmMsg, CancelInfoConfirmMsg,
         Dialog, DialogMsg, FidoConfirm, FidoMsg, Frame, HoldToConfirm, HoldToConfirmMsg,
-        IconDialog, MnemonicInput, MnemonicKeyboard, MnemonicKeyboardMsg, NotificationFrame,
-        NumberInputDialog, NumberInputDialogMsg, PassphraseKeyboard, PassphraseKeyboardMsg,
-        PinKeyboard, PinKeyboardMsg, SelectWordCount, SelectWordCountMsg, SelectWordMsg,
-        Slip39Input, SwipeHoldPage, SwipePage,
+        Homescreen, HomescreenMsg, IconDialog, Lockscreen, MnemonicInput, MnemonicKeyboard,
+        MnemonicKeyboardMsg, NotificationFrame, NumberInputDialog, NumberInputDialogMsg,
+        PassphraseKeyboard, PassphraseKeyboardMsg, PinKeyboard, PinKeyboardMsg, Progress,
+        SelectWordCount, SelectWordCountMsg, SelectWordMsg, Slip39Input, SwipeHoldPage, SwipePage,
+        WelcomeScreen,
     },
-    theme,
+    constant, theme,
 };
 
 impl TryFrom<CancelConfirmMsg> for Obj {
@@ -95,7 +102,7 @@ impl TryFrom<SelectWordCountMsg> for Obj {
 impl<F, T, U> ComponentMsgObj for FidoConfirm<F, T, U>
 where
     F: Fn(usize) -> T,
-    T: Deref<Target = str> + From<&'static str>,
+    T: ParagraphStrType + From<&'static str>,
     U: Component<Msg = CancelConfirmMsg>,
 {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
@@ -149,7 +156,7 @@ where
 
 impl<T> ComponentMsgObj for PinKeyboard<T>
 where
-    T: Deref<Target = str>,
+    T: AsRef<str>,
 {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         match msg {
@@ -171,7 +178,7 @@ impl ComponentMsgObj for PassphraseKeyboard {
 impl<T, U> ComponentMsgObj for MnemonicKeyboard<T, U>
 where
     T: MnemonicInput,
-    U: Deref<Target = str>,
+    U: AsRef<str>,
 {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         match msg {
@@ -284,6 +291,47 @@ where
     }
 }
 
+impl<T> ComponentMsgObj for Progress<T>
+where
+    T: ParagraphStrType,
+{
+    fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
+        unreachable!()
+    }
+}
+
+impl<T> ComponentMsgObj for Homescreen<T>
+where
+    T: AsRef<str>,
+{
+    fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
+        match msg {
+            HomescreenMsg::Dismissed => Ok(CANCELLED.as_obj()),
+        }
+    }
+}
+
+impl<T> ComponentMsgObj for Lockscreen<T>
+where
+    T: AsRef<str>,
+{
+    fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
+        match msg {
+            HomescreenMsg::Dismissed => Ok(CANCELLED.as_obj()),
+        }
+    }
+}
+
+impl<T, S> ComponentMsgObj for (GridPlaced<Paragraphs<T>>, GridPlaced<FormattedText<S, S>>)
+where
+    T: ParagraphSource,
+    S: AsRef<str>,
+{
+    fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
+        unreachable!()
+    }
+}
+
 extern "C" fn new_confirm_action(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
         let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
@@ -321,10 +369,11 @@ extern "C" fn new_confirm_action(n_args: usize, args: *const Obj, kwargs: *mut M
             } else {
                 SwipeHoldPage::new(paragraphs, theme::BG)
             };
-            LayoutObj::new(Frame::new(title, page))?
+            LayoutObj::new(Frame::left_aligned(theme::label_title(), title, page))?
         } else {
             let buttons = Button::cancel_confirm_text(verb_cancel, verb);
-            LayoutObj::new(Frame::new(
+            LayoutObj::new(Frame::left_aligned(
+                theme::label_title(),
                 title,
                 SwipePage::new(paragraphs, buttons, theme::BG),
             ))?
@@ -354,10 +403,15 @@ fn confirm_blob(
     .into_paragraphs();
 
     let obj = if hold {
-        LayoutObj::new(Frame::new(title, SwipeHoldPage::new(paragraphs, theme::BG)))?
+        LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
+            title,
+            SwipeHoldPage::new(paragraphs, theme::BG),
+        ))?
     } else if let Some(verb) = verb {
         let buttons = Button::cancel_confirm_text(verb_cancel, verb);
-        LayoutObj::new(Frame::new(
+        LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
             title,
             SwipePage::new(paragraphs, buttons, theme::BG),
         ))?
@@ -408,13 +462,15 @@ extern "C" fn new_confirm_properties(n_args: usize, args: *const Obj, kwargs: *m
             &theme::TEXT_MONO,
         )?;
         let obj = if hold {
-            LayoutObj::new(Frame::new(
+            LayoutObj::new(Frame::left_aligned(
+                theme::label_title(),
                 title,
                 SwipeHoldPage::new(paragraphs.into_paragraphs(), theme::BG),
             ))?
         } else {
             let buttons = Button::cancel_confirm_text(None, "CONFIRM");
-            LayoutObj::new(Frame::new(
+            LayoutObj::new(Frame::left_aligned(
+                theme::label_title(),
                 title,
                 SwipePage::new(paragraphs.into_paragraphs(), buttons, theme::BG),
             ))?
@@ -424,24 +480,72 @@ extern "C" fn new_confirm_properties(n_args: usize, args: *const Obj, kwargs: *m
     unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
 }
 
+extern "C" fn new_confirm_homescreen(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
+    let block = move |_args: &[Obj], kwargs: &Map| {
+        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let data: Obj = kwargs.get(Qstr::MP_QSTR_image)?;
+
+        // Layout needs to hold the Obj to play nice with GC. Obj is resolved to &[u8]
+        // in every paint pass.
+        // SAFETY: We expect no existing mutable reference. Resulting reference is
+        //         discarded before returning to micropython.
+        let buffer_func = move || unsafe { unwrap!(get_buffer(data)) };
+
+        let size = match jpeg_info(buffer_func()) {
+            Some(info) => info.0,
+            _ => return Err(Error::ValueError(cstr!("Invalid image."))),
+        };
+
+        let buttons = Button::cancel_confirm_text(None, "CONFIRM");
+        let obj = LayoutObj::new(
+            Frame::centered(
+                theme::label_title(),
+                title,
+                Dialog::new(painter::jpeg_painter(buffer_func, size, 1), buttons),
+            )
+            .with_border(theme::borders()),
+        )?;
+        Ok(obj.into())
+    };
+
+    unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
+}
+
 extern "C" fn new_confirm_reset_device(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
         let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let prompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
-        let description: StrBuffer = "\nBy continuing you agree to".into();
-        let url: StrBuffer = "https://trezor.io/tos".into();
+        let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
 
-        let paragraphs = Paragraphs::new([
-            Paragraph::new(&theme::TEXT_BOLD, prompt),
-            Paragraph::new(&theme::TEXT_NORMAL, description),
-            Paragraph::new(&theme::TEXT_BOLD, url),
-        ]);
-
-        let buttons = Button::cancel_confirm_text(None, "CONTINUE");
-        let obj = LayoutObj::new(Frame::new(
-            title,
-            SwipePage::new(paragraphs, buttons, theme::BG),
-        ))?;
+        let paragraphs = Paragraphs::new(Paragraph::new(
+            &theme::TEXT_NORMAL,
+            StrBuffer::from("By continuing you agree\nto Trezor Company's\nterms and conditions."),
+        ));
+        let url = FormattedText::new(
+            theme::TEXT_NORMAL,
+            theme::FORMATTED,
+            "More info at {demibold}trezor.io/tos",
+        );
+        let buttons = Button::cancel_confirm(
+            Button::with_icon(Icon::new(theme::ICON_CANCEL)),
+            Button::with_text(button).styled(theme::button_confirm()),
+            3,
+        );
+        let obj = LayoutObj::new(
+            Frame::left_aligned(
+                theme::label_title(),
+                title,
+                Dialog::new(
+                    (
+                        GridPlaced::new(paragraphs)
+                            .with_grid(3, 1)
+                            .with_from_to((0, 0), (1, 0)),
+                        GridPlaced::new(url).with_grid(3, 1).with_row_col(2, 0),
+                    ),
+                    buttons,
+                ),
+            )
+            .with_border(theme::borders()),
+        )?;
         Ok(obj.into())
     };
     unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
@@ -461,7 +565,8 @@ extern "C" fn new_show_qr(n_args: usize, args: *const Obj, kwargs: *mut Map) ->
         );
 
         let obj = LayoutObj::new(
-            Frame::new(
+            Frame::left_aligned(
+                theme::label_title(),
                 title,
                 Dialog::new(
                     painter::qrcode_painter(address, theme::QR_SIDE_MAX, case_sensitive),
@@ -505,7 +610,8 @@ extern "C" fn new_confirm_joint_total(n_args: usize, args: *const Obj, kwargs: *
             Paragraph::new(&theme::TEXT_MONO, total_amount),
         ]);
 
-        let obj = LayoutObj::new(Frame::new(
+        let obj = LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
             "JOINT TRANSACTION",
             SwipeHoldPage::new(paragraphs, theme::BG),
         ))?;
@@ -537,12 +643,13 @@ extern "C" fn new_confirm_modify_output(n_args: usize, args: *const Obj, kwargs:
         ]);
 
         let buttons = Button::cancel_confirm(
-            Button::with_icon(theme::ICON_CANCEL),
+            Button::with_icon(Icon::new(theme::ICON_CANCEL)),
             Button::with_text("NEXT").styled(theme::button_confirm()),
             2,
         );
 
-        let obj = LayoutObj::new(Frame::new(
+        let obj = LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
             "MODIFY AMOUNT",
             SwipePage::new(paragraphs, buttons, theme::BG),
         ))?;
@@ -571,12 +678,13 @@ extern "C" fn new_confirm_modify_fee(n_args: usize, args: *const Obj, kwargs: *m
         ]);
 
         let buttons = Button::cancel_confirm(
-            Button::with_icon(theme::ICON_CANCEL),
+            Button::with_icon(Icon::new(theme::ICON_CANCEL)),
             Button::with_text("NEXT").styled(theme::button_confirm()),
             2,
         );
 
-        let obj = LayoutObj::new(Frame::new(
+        let obj = LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
             "MODIFY FEE",
             SwipePage::new(paragraphs, buttons, theme::BG),
         ))?;
@@ -596,32 +704,14 @@ fn new_show_modal(
     let allow_cancel: bool = kwargs.get_or(Qstr::MP_QSTR_allow_cancel, true)?;
     let time_ms: u32 = kwargs.get_or(Qstr::MP_QSTR_time_ms, 0)?;
 
-    let obj = match (allow_cancel, time_ms) {
-        (true, 0) => LayoutObj::new(
-            IconDialog::new(
-                icon,
-                title,
-                Button::cancel_confirm(
-                    Button::with_icon(theme::ICON_CANCEL).styled(theme::button_cancel()),
-                    Button::with_text(button).styled(button_style),
-                    2,
-                ),
-            )
-            .with_description(description),
-        )?
-        .into(),
-        (false, 0) => LayoutObj::new(
-            IconDialog::new(
-                icon,
-                title,
-                theme::button_bar(Button::with_text(button).styled(button_style).map(|msg| {
-                    (matches!(msg, ButtonMsg::Clicked)).then(|| CancelConfirmMsg::Confirmed)
-                })),
-            )
-            .with_description(description),
-        )?
-        .into(),
-        (_, time_ms) => LayoutObj::new(
+    let no_buttons = button.as_ref().is_empty();
+    let obj = if no_buttons && time_ms == 0 {
+        // No buttons and no timer, used when we only want to draw the dialog once and
+        // then throw away the layout object.
+        LayoutObj::new(IconDialog::new(icon, title, Empty).with_description(description))?.into()
+    } else if no_buttons && time_ms > 0 {
+        // Timeout, no buttons.
+        LayoutObj::new(
             IconDialog::new(
                 icon,
                 title,
@@ -631,7 +721,35 @@ fn new_show_modal(
             )
             .with_description(description),
         )?
-        .into(),
+        .into()
+    } else if allow_cancel {
+        // Two buttons.
+        LayoutObj::new(
+            IconDialog::new(
+                icon,
+                title,
+                Button::cancel_confirm(
+                    Button::with_icon(Icon::new(theme::ICON_CANCEL)).styled(theme::button_cancel()),
+                    Button::with_text(button).styled(button_style),
+                    2,
+                ),
+            )
+            .with_description(description),
+        )?
+        .into()
+    } else {
+        // Single button.
+        LayoutObj::new(
+            IconDialog::new(
+                icon,
+                title,
+                theme::button_bar(Button::with_text(button).styled(button_style).map(|msg| {
+                    (matches!(msg, ButtonMsg::Clicked)).then(|| CancelConfirmMsg::Confirmed)
+                })),
+            )
+            .with_description(description),
+        )?
+        .into()
     };
 
     Ok(obj)
@@ -640,8 +758,8 @@ fn new_show_modal(
 extern "C" fn new_show_error(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
         let icon = BlendedImage::new(
-            theme::IMAGE_BG_CIRCLE,
-            theme::IMAGE_FG_ERROR,
+            Icon::new(theme::IMAGE_BG_CIRCLE),
+            Icon::new(theme::IMAGE_FG_ERROR),
             theme::ERROR_COLOR,
             theme::FG,
             theme::BG,
@@ -669,14 +787,16 @@ extern "C" fn new_confirm_fido(n_args: usize, args: *const Obj, kwargs: *mut Map
         };
 
         let controls = Button::cancel_confirm(
-            Button::with_icon(theme::ICON_CANCEL).styled(theme::button_cancel()),
+            Button::with_icon(Icon::new(theme::ICON_CANCEL)),
             Button::with_text("CONFIRM").styled(theme::button_confirm()),
             2,
         );
 
         let fido_page = FidoConfirm::new(app_name, get_page, page_count, icon, controls);
 
-        let obj = LayoutObj::new(Frame::new(title, fido_page).with_border(theme::borders()))?;
+        let obj = LayoutObj::new(
+            Frame::centered(theme::label_title(), title, fido_page).with_border(theme::borders()),
+        )?;
         Ok(obj.into())
     };
     unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
@@ -685,8 +805,8 @@ extern "C" fn new_confirm_fido(n_args: usize, args: *const Obj, kwargs: *mut Map
 extern "C" fn new_show_warning(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
         let icon = BlendedImage::new(
-            theme::IMAGE_BG_TRIANGLE,
-            theme::IMAGE_FG_WARN,
+            Icon::new(theme::IMAGE_BG_TRIANGLE),
+            Icon::new(theme::IMAGE_FG_WARN),
             theme::WARN_COLOR,
             theme::FG,
             theme::BG,
@@ -699,8 +819,8 @@ extern "C" fn new_show_warning(n_args: usize, args: *const Obj, kwargs: *mut Map
 extern "C" fn new_show_success(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
         let icon = BlendedImage::new(
-            theme::IMAGE_BG_CIRCLE,
-            theme::IMAGE_FG_SUCCESS,
+            Icon::new(theme::IMAGE_BG_CIRCLE),
+            Icon::new(theme::IMAGE_FG_SUCCESS),
             theme::SUCCESS_COLOR,
             theme::FG,
             theme::BG,
@@ -713,8 +833,8 @@ extern "C" fn new_show_success(n_args: usize, args: *const Obj, kwargs: *mut Map
 extern "C" fn new_show_info(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
         let icon = BlendedImage::new(
-            theme::IMAGE_BG_CIRCLE,
-            theme::IMAGE_FG_INFO,
+            Icon::new(theme::IMAGE_BG_CIRCLE),
+            Icon::new(theme::IMAGE_FG_INFO),
             theme::INFO_COLOR,
             theme::FG,
             theme::BG,
@@ -732,7 +852,8 @@ extern "C" fn new_show_simple(n_args: usize, args: *const Obj, kwargs: *mut Map)
         let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
 
         let obj = if let Some(t) = title {
-            LayoutObj::new(Frame::new(
+            LayoutObj::new(Frame::left_aligned(
+                theme::label_title(),
                 t,
                 Dialog::new(
                     Paragraphs::new([Paragraph::new(&theme::TEXT_NORMAL, description)]),
@@ -784,8 +905,12 @@ extern "C" fn new_confirm_with_info(n_args: usize, args: *const Obj, kwargs: *mu
         let buttons = Button::cancel_info_confirm(button, info_button);
 
         let obj = LayoutObj::new(
-            Frame::new(title, Dialog::new(paragraphs.into_paragraphs(), buttons))
-                .with_border(theme::borders()),
+            Frame::left_aligned(
+                theme::label_title(),
+                title,
+                Dialog::new(paragraphs.into_paragraphs(), buttons),
+            )
+            .with_border(theme::borders()),
         )?;
         Ok(obj.into())
     };
@@ -814,7 +939,8 @@ extern "C" fn new_confirm_more(n_args: usize, args: *const Obj, kwargs: *mut Map
                 (matches!(msg, ButtonMsg::Clicked)).then(|| CancelConfirmMsg::Confirmed)
             }));
 
-        let obj = LayoutObj::new(Frame::new(
+        let obj = LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
             title,
             SwipePage::new(paragraphs.into_paragraphs(), button, theme::BG).with_back_button(),
         ))?;
@@ -835,7 +961,8 @@ extern "C" fn new_confirm_coinjoin(n_args: usize, args: *const Obj, kwargs: *mut
             Paragraph::new(&theme::TEXT_BOLD, max_feerate),
         ]);
 
-        let obj = LayoutObj::new(Frame::new(
+        let obj = LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
             "AUTHORIZE COINJOIN",
             SwipeHoldPage::new(paragraphs, theme::BG),
         ))?;
@@ -849,7 +976,12 @@ extern "C" fn new_request_pin(n_args: usize, args: *const Obj, kwargs: *mut Map)
         let prompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
         let subprompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_subprompt)?.try_into()?;
         let allow_cancel: bool = kwargs.get_or(Qstr::MP_QSTR_allow_cancel, true)?;
-        let warning: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_warning)?.try_into_option()?;
+        let warning: bool = kwargs.get_or(Qstr::MP_QSTR_wrong_pin, false)?;
+        let warning = if warning {
+            Some("Wrong PIN".into())
+        } else {
+            None
+        };
         let obj = LayoutObj::new(PinKeyboard::new(prompt, subprompt, warning, allow_cancel))?;
         Ok(obj.into())
     };
@@ -894,7 +1026,8 @@ extern "C" fn new_select_word(n_args: usize, args: *const Obj, kwargs: *mut Map)
         let paragraphs = Paragraphs::new([Paragraph::new(&theme::TEXT_NORMAL, description)]);
         let buttons = Button::select_word(words);
 
-        let obj = LayoutObj::new(Frame::new(
+        let obj = LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
             title,
             SwipePage::new(paragraphs, buttons, theme::BG),
         ))?;
@@ -916,7 +1049,8 @@ extern "C" fn new_show_share_words(n_args: usize, args: *const Obj, kwargs: *mut
             paragraphs.add(Paragraph::new(&theme::TEXT_MONO, text).break_after());
         }
 
-        let obj = LayoutObj::new(Frame::new(
+        let obj = LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
             title,
             SwipeHoldPage::without_cancel(paragraphs.into_paragraphs(), theme::BG),
         ))?;
@@ -932,6 +1066,7 @@ extern "C" fn new_request_number(n_args: usize, args: *const Obj, kwargs: *mut M
         let max_count: u32 = kwargs.get(Qstr::MP_QSTR_max_count)?.try_into()?;
         let count: u32 = kwargs.get(Qstr::MP_QSTR_count)?.try_into()?;
         let description_callback: Obj = kwargs.get(Qstr::MP_QSTR_description)?;
+        assert!(description_callback != Obj::const_none());
 
         let callback = move |i: u32| {
             StrBuffer::try_from(
@@ -943,7 +1078,8 @@ extern "C" fn new_request_number(n_args: usize, args: *const Obj, kwargs: *mut M
         };
 
         let obj = LayoutObj::new(
-            Frame::new(
+            Frame::left_aligned(
+                theme::label_title(),
                 title,
                 NumberInputDialog::new(min_count, max_count, count, callback),
             )
@@ -975,12 +1111,13 @@ extern "C" fn new_show_checklist(n_args: usize, args: *const Obj, kwargs: *mut M
         }
 
         let obj = LayoutObj::new(
-            Frame::new(
+            Frame::left_aligned(
+                theme::label_title(),
                 title,
                 Dialog::new(
                     Checklist::from_paragraphs(
-                        theme::ICON_LIST_CURRENT,
-                        theme::ICON_LIST_CHECK,
+                        Icon::new(theme::ICON_LIST_CURRENT),
+                        Icon::new(theme::ICON_LIST_CHECK),
                         active,
                         paragraphs
                             .into_paragraphs()
@@ -1032,13 +1169,13 @@ extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut
 
         let obj = if info_button {
             LayoutObj::new(NotificationFrame::new(
-                theme::ICON_WARN,
+                Icon::new(theme::ICON_WARN),
                 notification,
                 Dialog::new(paragraphs, Button::<&'static str>::abort_info_enter()),
             ))?
         } else {
             LayoutObj::new(NotificationFrame::new(
-                theme::ICON_WARN,
+                Icon::new(theme::ICON_WARN),
                 notification,
                 Dialog::new(paragraphs, Button::cancel_confirm_text(None, button)),
             ))?
@@ -1066,8 +1203,12 @@ extern "C" fn new_select_word_count(n_args: usize, args: *const Obj, kwargs: *mu
         );
 
         let obj = LayoutObj::new(
-            Frame::new(title, Dialog::new(paragraphs, SelectWordCount::new()))
-                .with_border(theme::borders()),
+            Frame::left_aligned(
+                theme::label_title(),
+                title,
+                Dialog::new(paragraphs, SelectWordCount::new()),
+            )
+            .with_border(theme::borders()),
         )?;
         Ok(obj.into())
     };
@@ -1108,7 +1249,8 @@ extern "C" fn new_show_remaining_shares(n_args: usize, args: *const Obj, kwargs:
                 .add(Paragraph::new(&theme::TEXT_NORMAL, description).break_after());
         }
 
-        let obj = LayoutObj::new(Frame::new(
+        let obj = LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
             "REMAINING SHARES",
             SwipePage::new(
                 paragraphs.into_paragraphs(),
@@ -1123,6 +1265,95 @@ extern "C" fn new_show_remaining_shares(n_args: usize, args: *const Obj, kwargs:
     unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
 }
 
+extern "C" fn new_show_progress(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
+    let block = move |_args: &[Obj], kwargs: &Map| {
+        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let indeterminate: bool = kwargs.get_or(Qstr::MP_QSTR_indeterminate, false)?;
+        let description: StrBuffer =
+            kwargs.get_or(Qstr::MP_QSTR_description, StrBuffer::empty())?;
+
+        // Description updates are received as &str and we need to provide a way to
+        // convert them to StrBuffer.
+        let obj = LayoutObj::new(Progress::new(
+            title,
+            indeterminate,
+            description,
+            StrBuffer::alloc,
+        ))?;
+        Ok(obj.into())
+    };
+    unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
+}
+
+extern "C" fn new_show_homescreen(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
+    let block = move |_args: &[Obj], kwargs: &Map| {
+        let label: StrBuffer = kwargs.get(Qstr::MP_QSTR_label)?.try_into()?;
+        let notification: Option<StrBuffer> =
+            kwargs.get(Qstr::MP_QSTR_notification)?.try_into_option()?;
+        let notification_level: u8 = kwargs.get_or(Qstr::MP_QSTR_notification_level, 0)?;
+        let hold: bool = kwargs.get(Qstr::MP_QSTR_hold)?.try_into()?;
+        let skip_first_paint: bool = kwargs.get(Qstr::MP_QSTR_skip_first_paint)?.try_into()?;
+
+        let notification = notification.map(|w| (w, notification_level));
+        let obj = LayoutObj::new(Homescreen::new(label, notification, hold))?;
+        if skip_first_paint {
+            obj.skip_first_paint();
+        }
+        Ok(obj.into())
+    };
+    unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
+}
+
+extern "C" fn new_show_lockscreen(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
+    let block = move |_args: &[Obj], kwargs: &Map| {
+        let label: StrBuffer = kwargs.get(Qstr::MP_QSTR_label)?.try_into()?;
+        let bootscreen: bool = kwargs.get(Qstr::MP_QSTR_bootscreen)?.try_into()?;
+        let skip_first_paint: bool = kwargs.get(Qstr::MP_QSTR_skip_first_paint)?.try_into()?;
+
+        let obj = LayoutObj::new(Lockscreen::new(label, bootscreen))?;
+        if skip_first_paint {
+            obj.skip_first_paint();
+        }
+        Ok(obj.into())
+    };
+    unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
+}
+
+extern "C" fn new_show_busyscreen(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
+    let block = move |_args: &[Obj], kwargs: &Map| {
+        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let description: StrBuffer = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
+        let time_ms: u32 = kwargs.get(Qstr::MP_QSTR_time_ms)?.try_into()?;
+        let skip_first_paint: bool = kwargs.get(Qstr::MP_QSTR_skip_first_paint)?.try_into()?;
+
+        let obj = LayoutObj::new(Frame::left_aligned(
+            theme::label_title(),
+            title,
+            Dialog::new(
+                Paragraphs::new(Paragraph::new(&theme::TEXT_NORMAL, description).centered()),
+                Timeout::new(time_ms).map(|msg| {
+                    (matches!(msg, TimeoutMsg::TimedOut)).then(|| CancelConfirmMsg::Cancelled)
+                }),
+            ),
+        ))?;
+        if skip_first_paint {
+            obj.skip_first_paint();
+        }
+        Ok(obj.into())
+    };
+    unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
+}
+
+extern "C" fn draw_welcome_screen() -> Obj {
+    // No need of util::try_or_raise, this does not allocate
+    let mut screen = WelcomeScreen::new();
+    screen.place(constant::screen());
+    display::sync();
+    screen.paint();
+    display::set_backlight(150); // BACKLIGHT_NORMAL
+    Obj::const_none()
+}
+
 #[no_mangle]
 pub static mp_module_trezorui2: Module = obj_module! {
     Qstr::MP_QSTR___name__ => Qstr::MP_QSTR_trezorui2.to_obj(),
@@ -1136,6 +1367,18 @@ pub static mp_module_trezorui2: Module = obj_module! {
     /// INFO: object
     Qstr::MP_QSTR_INFO => INFO.as_obj(),
 
+    /// def disable_animation(disable: bool) -> None:
+    ///     """Disable animations, debug builds only."""
+    Qstr::MP_QSTR_disable_animation => obj_fn_1!(upy_disable_animation).as_obj(),
+
+    /// def jpeg_info(data: bytes) -> (width: int, height: int, mcu_height: int):
+    ///     """Get JPEG image dimensions."""
+    Qstr::MP_QSTR_jpeg_info => obj_fn_1!(upy_jpeg_info).as_obj(),
+
+    /// def jpeg_test(data: bytes) -> bool:
+    ///     """Test JPEG image."""
+    Qstr::MP_QSTR_jpeg_test => obj_fn_1!(upy_jpeg_test).as_obj(),
+
     /// def confirm_action(
     ///     *,
     ///     title: str,
@@ -1150,6 +1393,15 @@ pub static mp_module_trezorui2: Module = obj_module! {
     ///     """Confirm action."""
     Qstr::MP_QSTR_confirm_action => obj_fn_kw!(0, new_confirm_action).as_obj(),
 
+
+    /// def confirm_homescreen(
+    ///     *,
+    ///     title: str,
+    ///     image: bytes,
+    /// ) -> object:
+    ///     """Confirm homescreen."""
+    Qstr::MP_QSTR_confirm_homescreen => obj_fn_kw!(0, new_confirm_homescreen).as_obj(),
+
     /// def confirm_blob(
     ///     *,
     ///     title: str,
@@ -1175,7 +1427,7 @@ pub static mp_module_trezorui2: Module = obj_module! {
     /// def confirm_reset_device(
     ///     *,
     ///     title: str,
-    ///     prompt: str,
+    ///     button: str,
     /// ) -> object:
     ///     """Confirm TOS before device setup."""
     Qstr::MP_QSTR_confirm_reset_device => obj_fn_kw!(0, new_confirm_reset_device).as_obj(),
@@ -1249,7 +1501,7 @@ pub static mp_module_trezorui2: Module = obj_module! {
     ///     allow_cancel: bool = False,
     ///     time_ms: int = 0,
     /// ) -> object:
-    ///     """Error modal."""
+    ///     """Error modal. No buttons shown when `button` is empty string."""
     Qstr::MP_QSTR_show_error => obj_fn_kw!(0, new_show_error).as_obj(),
 
     /// def show_warning(
@@ -1260,7 +1512,7 @@ pub static mp_module_trezorui2: Module = obj_module! {
     ///     allow_cancel: bool = False,
     ///     time_ms: int = 0,
     /// ) -> object:
-    ///     """Warning modal."""
+    ///     """Warning modal. No buttons shown when `button` is empty string."""
     Qstr::MP_QSTR_show_warning => obj_fn_kw!(0, new_show_warning).as_obj(),
 
     /// def show_success(
@@ -1271,7 +1523,7 @@ pub static mp_module_trezorui2: Module = obj_module! {
     ///     allow_cancel: bool = False,
     ///     time_ms: int = 0,
     /// ) -> object:
-    ///     """Success modal."""
+    ///     """Success modal. No buttons shown when `button` is empty string."""
     Qstr::MP_QSTR_show_success => obj_fn_kw!(0, new_show_success).as_obj(),
 
     /// def show_info(
@@ -1282,7 +1534,7 @@ pub static mp_module_trezorui2: Module = obj_module! {
     ///     allow_cancel: bool = False,
     ///     time_ms: int = 0,
     /// ) -> object:
-    ///     """Info modal."""
+    ///     """Info modal. No buttons shown when `button` is empty string."""
     Qstr::MP_QSTR_show_info => obj_fn_kw!(0, new_show_info).as_obj(),
 
     /// def show_simple(
@@ -1328,7 +1580,7 @@ pub static mp_module_trezorui2: Module = obj_module! {
     ///     prompt: str,
     ///     subprompt: str,
     ///     allow_cancel: bool = True,
-    ///     warning: str | None = None,
+    ///     wrong_pin: bool = False,
     /// ) -> str | object:
     ///     """Request pin on device."""
     Qstr::MP_QSTR_request_pin => obj_fn_kw!(0, new_request_pin).as_obj(),
@@ -1379,7 +1631,7 @@ pub static mp_module_trezorui2: Module = obj_module! {
     ///     count: int,
     ///     min_count: int,
     ///     max_count: int,
-    ///     description: Callable[[int], str],
+    ///     description: Callable[[int], str] | None = None,
     /// ) -> object:
     ///    """Number input with + and - buttons, description, and info button."""
     Qstr::MP_QSTR_request_number => obj_fn_kw!(0, new_request_number).as_obj(),
@@ -1409,7 +1661,7 @@ pub static mp_module_trezorui2: Module = obj_module! {
     /// def select_word_count(
     ///     *,
     ///     dry_run: bool,
-    /// ) -> int | trezorui2.CANCELLED:
+    /// ) -> int | CANCELLED:
     ///    """Select mnemonic word count from (12, 18, 20, 24, 33)."""
     Qstr::MP_QSTR_select_word_count => obj_fn_kw!(0, new_select_word_count).as_obj(),
 
@@ -1426,6 +1678,51 @@ pub static mp_module_trezorui2: Module = obj_module! {
     /// ) -> int:
     ///    """Shows SLIP39 state after info button is pressed on `confirm_recovery`."""
     Qstr::MP_QSTR_show_remaining_shares => obj_fn_kw!(0, new_show_remaining_shares).as_obj(),
+
+    /// def show_progress(
+    ///     *,
+    ///     title: str,
+    ///     indeterminate: bool = False,
+    ///     description: str | None = None,
+    /// ) -> object:
+    ///    """Show progress loader. Please note that the number of lines reserved on screen for
+    ///    description is determined at construction time. If you want multiline descriptions
+    ///    make sure the initial desciption has at least that amount of lines."""
+    Qstr::MP_QSTR_show_progress => obj_fn_kw!(0, new_show_progress).as_obj(),
+
+    /// def show_homescreen(
+    ///     *,
+    ///     label: str,
+    ///     hold: bool,
+    ///     notification: str | None,
+    ///     notification_level: int = 0,
+    ///     skip_first_paint: bool,
+    /// ) -> CANCELLED:
+    ///     """Idle homescreen."""
+    Qstr::MP_QSTR_show_homescreen => obj_fn_kw!(0, new_show_homescreen).as_obj(),
+
+    /// def show_lockscreen(
+    ///     *,
+    ///     label: str,
+    ///     bootscreen: bool,
+    ///     skip_first_paint: bool,
+    /// ) -> CANCELLED:
+    ///     """Homescreen for locked device."""
+    Qstr::MP_QSTR_show_lockscreen => obj_fn_kw!(0, new_show_lockscreen).as_obj(),
+
+    /// def show_busyscreen(
+    ///     *,
+    ///     title: str,
+    ///     description: str,
+    ///     time_ms: int,
+    ///     skip_first_paint: bool,
+    /// ) -> CANCELLED:
+    ///     """Homescreen used for indicating coinjoin in progress."""
+    Qstr::MP_QSTR_show_busyscreen => obj_fn_kw!(0, new_show_busyscreen).as_obj(),
+
+    /// def draw_welcome_screen() -> None:
+    ///     """Show logo icon with the model name at the bottom and return."""
+    Qstr::MP_QSTR_draw_welcome_screen => obj_fn_0!(draw_welcome_screen).as_obj(),
 };
 
 #[cfg(test)]
diff --git a/core/embed/rust/src/ui/model_tt/res/bg.jpg b/core/embed/rust/src/ui/model_tt/res/bg.jpg
new file mode 100644
index 0000000000..6d86f7c646
Binary files /dev/null and b/core/embed/rust/src/ui/model_tt/res/bg.jpg differ
diff --git a/core/embed/rust/src/ui/model_tt/res/fido/icon_apple.toif b/core/embed/rust/src/ui/model_tt/res/fido/icon_apple.toif
new file mode 100644
index 0000000000..d6c97f897e
Binary files /dev/null and b/core/embed/rust/src/ui/model_tt/res/fido/icon_apple.toif differ
diff --git a/core/embed/rust/src/ui/model_tt/res/lock.toif b/core/embed/rust/src/ui/model_tt/res/lock.toif
new file mode 100644
index 0000000000..7fb2b3a94d
Binary files /dev/null and b/core/embed/rust/src/ui/model_tt/res/lock.toif differ
diff --git a/core/embed/rust/src/ui/model_tt/res/logo.toif b/core/embed/rust/src/ui/model_tt/res/logo.toif
new file mode 100644
index 0000000000..fa80ed9609
Binary files /dev/null and b/core/embed/rust/src/ui/model_tt/res/logo.toif differ
diff --git a/core/embed/rust/src/ui/model_tt/res/magic.toif b/core/embed/rust/src/ui/model_tt/res/magic.toif
new file mode 100644
index 0000000000..a99c78aacd
Binary files /dev/null and b/core/embed/rust/src/ui/model_tt/res/magic.toif differ
diff --git a/core/embed/rust/src/ui/model_tt/theme.rs b/core/embed/rust/src/ui/model_tt/theme.rs
index db1af676f2..d11850587b 100644
--- a/core/embed/rust/src/ui/model_tt/theme.rs
+++ b/core/embed/rust/src/ui/model_tt/theme.rs
@@ -1,16 +1,21 @@
-use crate::ui::{
-    component::{
-        text::{formatted::FormattedFonts, LineBreaking, PageBreaking, TextStyle},
-        FixedHeightBar,
+use crate::{
+    time::Duration,
+    ui::{
+        component::{
+            text::{formatted::FormattedFonts, LineBreaking, PageBreaking, TextStyle},
+            FixedHeightBar,
+        },
+        display::{Color, Font},
+        geometry::Insets,
     },
-    display::{Color, Font},
-    geometry::Insets,
 };
 
 use super::component::{ButtonStyle, ButtonStyleSheet, LoaderStyle, LoaderStyleSheet};
 
 use num_traits::FromPrimitive;
 
+pub const ERASE_HOLD_DURATION: Duration = Duration::from_millis(1500);
+
 // Typical backlight values.
 pub const BACKLIGHT_NORMAL: i32 = 150;
 pub const BACKLIGHT_LOW: i32 = 45;
@@ -35,6 +40,7 @@ pub const OFF_WHITE: Color = Color::rgb(0xDE, 0xDE, 0xDE); // very light grey
 pub const GREY_LIGHT: Color = Color::rgb(0xA8, 0xA8, 0xA8); // greyish
 pub const GREY_MEDIUM: Color = Color::rgb(0x64, 0x64, 0x64);
 pub const GREY_DARK: Color = Color::rgb(0x33, 0x33, 0x33); // greyer
+pub const VIOLET: Color = Color::rgb(0x9E, 0x27, 0xD6);
 
 // Commonly used corner radius (i.e. for buttons).
 pub const RADIUS: u8 = 2;
@@ -53,8 +59,11 @@ pub const ICON_BACK: &[u8] = include_res!("model_tt/res/back.toif");
 pub const ICON_CLICK: &[u8] = include_res!("model_tt/res/click.toif");
 pub const ICON_NEXT: &[u8] = include_res!("model_tt/res/next.toif");
 pub const ICON_WARN: &[u8] = include_res!("model_tt/res/warn-icon.toif");
+pub const ICON_MAGIC: &[u8] = include_res!("model_tt/res/magic.toif");
 pub const ICON_LIST_CURRENT: &[u8] = include_res!("model_tt/res/current.toif");
 pub const ICON_LIST_CHECK: &[u8] = include_res!("model_tt/res/check.toif");
+pub const ICON_LOCK: &[u8] = include_res!("model_tt/res/lock.toif");
+pub const ICON_LOGO: &[u8] = include_res!("model_tt/res/logo.toif");
 
 // Large, three-color icons.
 pub const WARN_COLOR: Color = YELLOW;
@@ -70,6 +79,9 @@ pub const IMAGE_BG_TRIANGLE: &[u8] = include_res!("model_tt/res/triangle.toif");
 pub const IMAGE_BG_BACK_BTN: &[u8] = include_res!("model_tt/res/back_btn.toif");
 pub const IMAGE_BG_BACK_BTN_TALL: &[u8] = include_res!("model_tt/res/back_btn_tall.toif");
 
+// Default homescreen
+pub const IMAGE_HOMESCREEN: &[u8] = include_res!("model_tt/res/bg.jpg");
+
 // Scrollbar/PIN dots.
 pub const DOT_ACTIVE: &[u8] = include_res!("model_tt/res/scroll-active.toif");
 pub const DOT_INACTIVE: &[u8] = include_res!("model_tt/res/scroll-inactive.toif");
@@ -113,6 +125,14 @@ pub const fn label_recovery_description() -> TextStyle {
     TEXT_NORMAL_OFF_WHITE
 }
 
+pub const fn label_progress() -> TextStyle {
+    TEXT_BOLD
+}
+
+pub const fn label_title() -> TextStyle {
+    TextStyle::new(Font::BOLD, GREY_LIGHT, BG, GREY_LIGHT, GREY_LIGHT)
+}
+
 pub fn button_default() -> ButtonStyleSheet {
     ButtonStyleSheet {
         normal: &ButtonStyle {
@@ -431,5 +451,5 @@ pub const fn borders_scroll() -> Insets {
 }
 
 pub const fn borders_notification() -> Insets {
-    Insets::new(6, 10, 14, 10)
+    Insets::new(48, 10, 14, 10)
 }
diff --git a/core/embed/rust/src/ui/util.rs b/core/embed/rust/src/ui/util.rs
index 1300aae164..c31135c1b4 100644
--- a/core/embed/rust/src/ui/util.rs
+++ b/core/embed/rust/src/ui/util.rs
@@ -1,3 +1,10 @@
+use crate::ui::{
+    component::text::TextStyle,
+    display,
+    display::toif::Icon,
+    geometry::{Offset, Point, CENTER},
+};
+
 pub trait ResultExt {
     fn assert_if_debugging_ui(self, message: &str);
 }
@@ -31,6 +38,60 @@ pub fn u32_to_str(num: u32, buffer: &mut [u8]) -> Option<&str> {
     }
 }
 
+#[cfg(feature = "ui_debug")]
+static mut DISABLE_ANIMATION: bool = false;
+
+#[cfg(feature = "ui_debug")]
+pub fn animation_disabled() -> bool {
+    // SAFETY: single-threaded access
+    unsafe { DISABLE_ANIMATION }
+}
+
+#[cfg(feature = "ui_debug")]
+pub fn set_animation_disabled(disabled: bool) {
+    // SAFETY: single-threaded access
+    unsafe {
+        DISABLE_ANIMATION = disabled;
+    }
+}
+
+#[cfg(not(feature = "ui_debug"))]
+pub fn animation_disabled() -> bool {
+    false
+}
+#[cfg(not(feature = "ui_debug"))]
+pub fn set_animation_disabled(_disabled: bool) {}
+
+/// Display an icon and a text centered relative to given `Point`.
+pub fn icon_text_center(
+    baseline: Point,
+    icon: Icon,
+    space: i16,
+    text: &str,
+    style: TextStyle,
+    text_offset: Offset,
+) {
+    let icon_width = icon.toif.width();
+    let text_width = style.text_font.text_width(text);
+    let text_height = style.text_font.text_height();
+    let text_center = baseline + Offset::new((icon_width + space) / 2, text_height / 2);
+    let icon_center = baseline - Offset::x((text_width + space) / 2);
+
+    display::text_center(
+        text_center + text_offset,
+        text,
+        style.text_font,
+        style.text_color,
+        style.background_color,
+    );
+    icon.draw(
+        icon_center,
+        CENTER,
+        style.text_color,
+        style.background_color,
+    );
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/core/embed/rust/trezorhal.h b/core/embed/rust/trezorhal.h
index b097a3d77e..5497f29ffa 100644
--- a/core/embed/rust/trezorhal.h
+++ b/core/embed/rust/trezorhal.h
@@ -9,6 +9,7 @@
 #include "rgb_led.h"
 #include "secbool.h"
 #include "storage.h"
+#include "usb.h"
 
 #include "bip39.h"
 #include "rand.h"
diff --git a/core/embed/trezorhal/board_capabilities.c b/core/embed/trezorhal/board_capabilities.c
index 235f4b1e58..a4095cb318 100644
--- a/core/embed/trezorhal/board_capabilities.c
+++ b/core/embed/trezorhal/board_capabilities.c
@@ -24,11 +24,11 @@
 #define handle_fault(msg) \
   (__fatal_error("Fault detected", msg, __FILE__, __LINE__, __func__))
 
-static uint8_t board_name[MODEL_NAME_MAX_LENGTH + 1] = {0};
+static uint32_t board_name = 0;
 
 static struct BoardloaderVersion boardloader_version;
 
-const uint8_t *get_board_name() { return board_name; }
+const uint32_t get_board_name() { return board_name; }
 
 const struct BoardloaderVersion *get_boardloader_version() {
   return &boardloader_version;
@@ -49,7 +49,6 @@ void parse_boardloader_capabilities() {
   while (pos <= end - 2) {
     enum CapabilityTag tag = pos[0];
     uint8_t length = pos[1];
-    uint8_t used_length;
     pos += 2;
 
     if (pos + length > end) {
@@ -61,9 +60,10 @@ void parse_boardloader_capabilities() {
         // not used yet, just advance pointer
         break;
       case MODEL_NAME:
-        used_length = MIN(MODEL_NAME_MAX_LENGTH, length);
-        memcpy(board_name, pos, used_length);
-        board_name[MODEL_NAME_MAX_LENGTH] = 0;
+        if (length != sizeof(uint32_t)) {
+          break;
+        }
+        memcpy((uint8_t *)&board_name, pos, sizeof(uint32_t));
         break;
       case BOARDLOADER_VERSION:
         if (length != sizeof(boardloader_version)) {
diff --git a/core/embed/trezorhal/board_capabilities.h b/core/embed/trezorhal/board_capabilities.h
index ead351053a..807cd2e1a4 100644
--- a/core/embed/trezorhal/board_capabilities.h
+++ b/core/embed/trezorhal/board_capabilities.h
@@ -38,7 +38,6 @@ Last tag must be terminator or all space used.
 #define BOARD_CAPABILITIES_ADDR 0x0800BF00
 #define BOARD_CAPABILITIES_SIZE 256
 #define CAPABILITIES_HEADER "TRZC"
-#define MODEL_NAME_MAX_LENGTH 16
 
 enum CapabilityTag {
   TERMINATOR = 0x00,
@@ -62,7 +61,7 @@ struct __attribute__((packed)) BoardCapabilities {
   uint8_t header[4];
   uint8_t model_tag;
   uint8_t model_length;
-  uint8_t model_name[MODEL_NAME_MAX_LENGTH];
+  uint32_t model_name;
   uint8_t version_tag;
   uint8_t version_length;
   struct BoardloaderVersion version;
@@ -76,7 +75,7 @@ struct __attribute__((packed)) BoardCapabilities {
  */
 void parse_boardloader_capabilities();
 
-const uint8_t* get_board_name();
+const uint32_t get_board_name();
 const struct BoardloaderVersion* get_boardloader_version();
 
 #endif
diff --git a/core/embed/trezorhal/common.c b/core/embed/trezorhal/common.c
index 31ba58a672..d8864b0333 100644
--- a/core/embed/trezorhal/common.c
+++ b/core/embed/trezorhal/common.c
@@ -192,6 +192,7 @@ void collect_hw_entropy(void) {
 void ensure_compatible_settings(void) {
 #ifdef TREZOR_MODEL_T
   display_set_big_endian();
+  display_orientation(0);
   set_core_clock(CLOCK_168_MHZ);
   display_set_slow_pwm();
 #endif
diff --git a/core/embed/trezorhal/displays/st7789v.c b/core/embed/trezorhal/displays/st7789v.c
index 43b255aab0..f84321c873 100644
--- a/core/embed/trezorhal/displays/st7789v.c
+++ b/core/embed/trezorhal/displays/st7789v.c
@@ -151,11 +151,20 @@ int display_orientation(int degrees) {
     if (degrees == 0 || degrees == 90 || degrees == 180 || degrees == 270) {
       DISPLAY_ORIENTATION = degrees;
 
+      display_set_window(0, 0, MAX_DISPLAY_RESX - 1, MAX_DISPLAY_RESY - 1);
+      for (uint32_t i = 0; i < MAX_DISPLAY_RESX * MAX_DISPLAY_RESY; i++) {
+        // 2 bytes per pixel because we're using RGB 5-6-5 format
+        PIXELDATA(0x0000);
+      }
+
+      uint16_t shift = 0;
       char BX = 0, BY = 0;
       uint32_t id = display_identify();
       if ((id == DISPLAY_ID_ILI9341V) || (id == DISPLAY_ID_GC9307) ||
           (id == DISPLAY_ID_ST7789V)) {
 #define RGB (1 << 3)
+#define ML (1 << 4)  // vertical refresh order
+#define MH (1 << 2)  // horizontal refresh order
 #define MV (1 << 5)
 #define MX (1 << 6)
 #define MY (1 << 7)
@@ -170,12 +179,14 @@ int display_orientation(int degrees) {
             BY = (id == DISPLAY_ID_GC9307);
             break;
           case 90:
-            display_command_parameter = MV | MX;
-            BX = (id == DISPLAY_ID_GC9307);
+            display_command_parameter = MV | MX | MH | ML;
+            BX = (id != DISPLAY_ID_GC9307);
+            shift = 1;
             break;
           case 180:
-            display_command_parameter = MX | MY;
-            BY = (id != DISPLAY_ID_GC9307);
+            display_command_parameter = MX | MY | MH | ML;
+            BY = (id == DISPLAY_ID_GC9307);
+            shift = 1;
             break;
           case 270:
             display_command_parameter = MV | MY;
@@ -187,6 +198,23 @@ int display_orientation(int degrees) {
         }
         CMD(0x36);
         DATA(display_command_parameter);
+
+        if (shift) {
+          // GATECTRL: Gate Control; NL = 240 gate lines, first scan line is
+          // gate 80.; gate scan direction 319 -> 0
+          CMD(0xE4);
+          DATA(0x1D);
+          DATA(0x00);
+          DATA(0x11);
+        } else {
+          // GATECTRL: Gate Control; NL = 240 gate lines, first scan line is
+          // gate 80.; gate scan direction 319 -> 0
+          CMD(0xE4);
+          DATA(0x1D);
+          DATA(0x0A);
+          DATA(0x11);
+        }
+
         // reset the column and page extents
         display_set_window(0, 0, DISPLAY_RESX - 1, DISPLAY_RESY - 1);
       }
@@ -489,6 +517,44 @@ void display_init_seq(void) {
   display_unsleep();
 }
 
+void display_setup_fmc(void) {
+  // Reference UM1725 "Description of STM32F4 HAL and LL drivers",
+  // section 64.2.1 "How to use this driver"
+  SRAM_HandleTypeDef external_display_data_sram;
+  external_display_data_sram.Instance = FMC_NORSRAM_DEVICE;
+  external_display_data_sram.Init.NSBank = FMC_NORSRAM_BANK1;
+  external_display_data_sram.Init.DataAddressMux = FMC_DATA_ADDRESS_MUX_DISABLE;
+  external_display_data_sram.Init.MemoryType = FMC_MEMORY_TYPE_SRAM;
+  external_display_data_sram.Init.MemoryDataWidth = FMC_NORSRAM_MEM_BUS_WIDTH_8;
+  external_display_data_sram.Init.BurstAccessMode =
+      FMC_BURST_ACCESS_MODE_DISABLE;
+  external_display_data_sram.Init.WaitSignalPolarity =
+      FMC_WAIT_SIGNAL_POLARITY_LOW;
+  external_display_data_sram.Init.WrapMode = FMC_WRAP_MODE_DISABLE;
+  external_display_data_sram.Init.WaitSignalActive = FMC_WAIT_TIMING_BEFORE_WS;
+  external_display_data_sram.Init.WriteOperation = FMC_WRITE_OPERATION_ENABLE;
+  external_display_data_sram.Init.WaitSignal = FMC_WAIT_SIGNAL_DISABLE;
+  external_display_data_sram.Init.ExtendedMode = FMC_EXTENDED_MODE_DISABLE;
+  external_display_data_sram.Init.AsynchronousWait =
+      FMC_ASYNCHRONOUS_WAIT_DISABLE;
+  external_display_data_sram.Init.WriteBurst = FMC_WRITE_BURST_DISABLE;
+  external_display_data_sram.Init.ContinuousClock =
+      FMC_CONTINUOUS_CLOCK_SYNC_ONLY;
+  external_display_data_sram.Init.PageSize = FMC_PAGE_SIZE_NONE;
+
+  // reference RM0090 section 37.5 Table 259, 37.5.4, Mode 1 SRAM, and 37.5.6
+  FMC_NORSRAM_TimingTypeDef normal_mode_timing;
+  normal_mode_timing.AddressSetupTime = 5;
+  normal_mode_timing.AddressHoldTime = 1;  // don't care
+  normal_mode_timing.DataSetupTime = 6;
+  normal_mode_timing.BusTurnAroundDuration = 0;  // don't care
+  normal_mode_timing.CLKDivision = 2;            // don't care
+  normal_mode_timing.DataLatency = 2;            // don't care
+  normal_mode_timing.AccessMode = FMC_ACCESS_MODE_A;
+
+  HAL_SRAM_Init(&external_display_data_sram, &normal_mode_timing, NULL);
+}
+
 void display_init(void) {
   // init peripherals
   __HAL_RCC_GPIOE_CLK_ENABLE();
@@ -565,41 +631,7 @@ void display_init(void) {
   GPIO_InitStructure.Pin = GPIO_PIN_7 | GPIO_PIN_8 | GPIO_PIN_9 | GPIO_PIN_10;
   HAL_GPIO_Init(GPIOE, &GPIO_InitStructure);
 
-  // Reference UM1725 "Description of STM32F4 HAL and LL drivers",
-  // section 64.2.1 "How to use this driver"
-  SRAM_HandleTypeDef external_display_data_sram;
-  external_display_data_sram.Instance = FMC_NORSRAM_DEVICE;
-  external_display_data_sram.Init.NSBank = FMC_NORSRAM_BANK1;
-  external_display_data_sram.Init.DataAddressMux = FMC_DATA_ADDRESS_MUX_DISABLE;
-  external_display_data_sram.Init.MemoryType = FMC_MEMORY_TYPE_SRAM;
-  external_display_data_sram.Init.MemoryDataWidth = FMC_NORSRAM_MEM_BUS_WIDTH_8;
-  external_display_data_sram.Init.BurstAccessMode =
-      FMC_BURST_ACCESS_MODE_DISABLE;
-  external_display_data_sram.Init.WaitSignalPolarity =
-      FMC_WAIT_SIGNAL_POLARITY_LOW;
-  external_display_data_sram.Init.WrapMode = FMC_WRAP_MODE_DISABLE;
-  external_display_data_sram.Init.WaitSignalActive = FMC_WAIT_TIMING_BEFORE_WS;
-  external_display_data_sram.Init.WriteOperation = FMC_WRITE_OPERATION_ENABLE;
-  external_display_data_sram.Init.WaitSignal = FMC_WAIT_SIGNAL_DISABLE;
-  external_display_data_sram.Init.ExtendedMode = FMC_EXTENDED_MODE_DISABLE;
-  external_display_data_sram.Init.AsynchronousWait =
-      FMC_ASYNCHRONOUS_WAIT_DISABLE;
-  external_display_data_sram.Init.WriteBurst = FMC_WRITE_BURST_DISABLE;
-  external_display_data_sram.Init.ContinuousClock =
-      FMC_CONTINUOUS_CLOCK_SYNC_ONLY;
-  external_display_data_sram.Init.PageSize = FMC_PAGE_SIZE_NONE;
-
-  // reference RM0090 section 37.5 Table 259, 37.5.4, Mode 1 SRAM, and 37.5.6
-  FMC_NORSRAM_TimingTypeDef normal_mode_timing;
-  normal_mode_timing.AddressSetupTime = 4;
-  normal_mode_timing.AddressHoldTime = 1;
-  normal_mode_timing.DataSetupTime = 4;
-  normal_mode_timing.BusTurnAroundDuration = 0;
-  normal_mode_timing.CLKDivision = 2;
-  normal_mode_timing.DataLatency = 2;
-  normal_mode_timing.AccessMode = FMC_ACCESS_MODE_A;
-
-  HAL_SRAM_Init(&external_display_data_sram, &normal_mode_timing, NULL);
+  display_setup_fmc();
 
   display_init_seq();
 
@@ -607,6 +639,10 @@ void display_init(void) {
 }
 
 void display_reinit(void) {
+  // reinitialize FMC to set correct timing, have to do this in reinit because
+  // boardloader is fixed.
+  display_setup_fmc();
+
   // important for model T as this is not set in boardloader
   display_set_little_endian();
 
@@ -626,18 +662,20 @@ void display_reinit(void) {
   display_backlight(DISPLAY_BACKLIGHT);
 }
 
-void display_refresh(void) {
+void display_sync(void) {
   uint32_t id = display_identify();
   if (id && (id != DISPLAY_ID_GC9307)) {
     // synchronize with the panel synchronization signal
     // in order to avoid visual tearing effects
-    while (GPIO_PIN_RESET == HAL_GPIO_ReadPin(GPIOD, GPIO_PIN_12)) {
-    }
     while (GPIO_PIN_SET == HAL_GPIO_ReadPin(GPIOD, GPIO_PIN_12)) {
     }
+    while (GPIO_PIN_RESET == HAL_GPIO_ReadPin(GPIOD, GPIO_PIN_12)) {
+    }
   }
 }
 
+void display_refresh(void) {}
+
 void display_set_slow_pwm(void) {
   // enable PWM timer
   TIM_HandleTypeDef TIM1_Handle;
diff --git a/core/embed/trezorhal/displays/ug-2828tswig01.c b/core/embed/trezorhal/displays/ug-2828tswig01.c
index 835b1ff354..4c3c7991b1 100644
--- a/core/embed/trezorhal/displays/ug-2828tswig01.c
+++ b/core/embed/trezorhal/displays/ug-2828tswig01.c
@@ -347,6 +347,8 @@ void display_init(void) {
   display_init_seq();
 }
 
+void display_sync(void) {}
+
 void display_refresh(void) {
   for (int y = 0; y < (DISPLAY_RESY / 8); y++) {
     display_set_page_and_col(y, 0);
diff --git a/core/embed/trezorhal/displays/vg-2864ksweg01.c b/core/embed/trezorhal/displays/vg-2864ksweg01.c
index 15c74bbdb3..15c0b82e67 100644
--- a/core/embed/trezorhal/displays/vg-2864ksweg01.c
+++ b/core/embed/trezorhal/displays/vg-2864ksweg01.c
@@ -247,6 +247,8 @@ static void rotate_oled_buffer(void) {
   }
 }
 
+void display_sync(void) {}
+
 void display_refresh(void) {
   static const uint8_t s[3] = {OLED_SETLOWCOLUMN | 0x00,
                                OLED_SETHIGHCOLUMN | 0x00,
diff --git a/core/embed/trezorhal/image.c b/core/embed/trezorhal/image.c
index 97039891dc..44d536d46a 100644
--- a/core/embed/trezorhal/image.c
+++ b/core/embed/trezorhal/image.c
@@ -50,57 +50,84 @@ static secbool compute_pubkey(uint8_t sig_m, uint8_t sig_n,
   return sectrue * (0 == ed25519_cosi_combine_publickeys(res, keys, sig_m));
 }
 
-secbool load_image_header(const uint8_t *const data, const uint32_t magic,
-                          const uint32_t maxsize, uint8_t key_m, uint8_t key_n,
-                          const uint8_t *const *keys, image_header *const hdr) {
-  memcpy(&hdr->magic, data, 4);
-  if (hdr->magic != magic) return secfalse;
+const image_header *read_image_header(const uint8_t *const data,
+                                      const uint32_t magic,
+                                      const uint32_t maxsize) {
+  const image_header *hdr = (const image_header *)data;
 
-  memcpy(&hdr->hdrlen, data + 4, 4);
-  if (hdr->hdrlen != IMAGE_HEADER_SIZE) return secfalse;
+  if (hdr->magic != magic) {
+    return NULL;
+  }
+  if (hdr->hdrlen != IMAGE_HEADER_SIZE) {
+    return NULL;
+  }
 
-  memcpy(&hdr->expiry, data + 8, 4);
   // TODO: expiry mechanism needs to be ironed out before production or those
   // devices won't accept expiring bootloaders (due to boardloader write
   // protection).
-  if (hdr->expiry != 0) return secfalse;
+  // lowest bit is used for breaking compatibility between old TT bootloaders
+  // and non TT images
+  //  which is evaluated in check_image_model function
+  if ((hdr->expiry & 0xFFFFFFFE) != 0) return secfalse;
 
-  memcpy(&hdr->codelen, data + 12, 4);
   if (hdr->codelen > (maxsize - hdr->hdrlen)) return secfalse;
   if ((hdr->hdrlen + hdr->codelen) < 4 * 1024) return secfalse;
   if ((hdr->hdrlen + hdr->codelen) % 512 != 0) return secfalse;
 
-  memcpy(&hdr->version, data + 16, 4);
-  memcpy(&hdr->fix_version, data + 20, 4);
+  return hdr;
+}
 
-  memcpy(hdr->hashes, data + 32, 512);
+secbool check_image_model(const image_header *const hdr) {
+  // abusing expiry field to break compatibility of non-TT images with existing
+  // bootloaders/boardloaders
+#ifdef TREZOR_MODEL_T
+  if (hdr->expiry == 0 && hdr->hw_model == 0 && hdr->hw_revision == 0) {
+    // images for model TT older than this check
+    return sectrue;
+  }
+#else
+  if ((hdr->expiry & 0x01) == 0) {
+    // for models other than TT, expiry == 0 is unacceptable, as the image will
+    // run on bootloaders older that this check
+    return secfalse;
+  }
+#endif
 
-  memcpy(&hdr->sigmask, data + IMAGE_HEADER_SIZE - IMAGE_SIG_SIZE, 1);
+  if (hdr->hw_model != HW_MODEL) {
+    return secfalse;
+  }
+  if (hdr->hw_revision != HW_REVISION) {
+    return secfalse;
+  }
 
-  memcpy(hdr->sig, data + IMAGE_HEADER_SIZE - IMAGE_SIG_SIZE + 1,
-         IMAGE_SIG_SIZE - 1);
+  return sectrue;
+}
 
+secbool check_image_header_sig(const image_header *const hdr, uint8_t key_m,
+                               uint8_t key_n, const uint8_t *const *keys) {
   // check header signature
-
   BLAKE2S_CTX ctx;
+  uint8_t fingerprint[32];
+
   blake2s_Init(&ctx, BLAKE2S_DIGEST_LENGTH);
-  blake2s_Update(&ctx, data, IMAGE_HEADER_SIZE - IMAGE_SIG_SIZE);
+  blake2s_Update(&ctx, hdr, IMAGE_HEADER_SIZE - IMAGE_SIG_SIZE);
   for (int i = 0; i < IMAGE_SIG_SIZE; i++) {
     blake2s_Update(&ctx, (const uint8_t *)"\x00", 1);
   }
-  blake2s_Final(&ctx, hdr->fingerprint, BLAKE2S_DIGEST_LENGTH);
+
+  blake2s_Final(&ctx, fingerprint, BLAKE2S_DIGEST_LENGTH);
 
   ed25519_public_key pub;
   if (sectrue != compute_pubkey(key_m, key_n, keys, hdr->sigmask, pub))
     return secfalse;
 
   return sectrue *
-         (0 == ed25519_sign_open(hdr->fingerprint, BLAKE2S_DIGEST_LENGTH, pub,
+         (0 == ed25519_sign_open(fingerprint, BLAKE2S_DIGEST_LENGTH, pub,
                                  *(const ed25519_signature *)hdr->sig));
 }
 
-secbool read_vendor_header(const uint8_t *const data,
-                           vendor_header *const vhdr) {
+secbool __wur read_vendor_header(const uint8_t *const data,
+                                 vendor_header *const vhdr) {
   memcpy(&vhdr->magic, data, 4);
   if (vhdr->magic != 0x565A5254) return secfalse;  // TRZV
 
@@ -110,6 +137,8 @@ secbool read_vendor_header(const uint8_t *const data,
   memcpy(&vhdr->expiry, data + 8, 4);
   if (vhdr->expiry != 0) return secfalse;
 
+  vhdr->origin = data;
+
   memcpy(&vhdr->version, data + 12, 2);
 
   memcpy(&vhdr->vsig_m, data + 14, 1);
@@ -143,10 +172,9 @@ secbool read_vendor_header(const uint8_t *const data,
   return sectrue;
 }
 
-secbool load_vendor_header(const uint8_t *const data, uint8_t key_m,
-                           uint8_t key_n, const uint8_t *const *keys,
-                           vendor_header *const vhdr) {
-  if (sectrue != read_vendor_header(data, vhdr)) {
+secbool check_vendor_header_sig(const vendor_header *const vhdr, uint8_t key_m,
+                                uint8_t key_n, const uint8_t *const *keys) {
+  if (vhdr == NULL) {
     return secfalse;
   }
 
@@ -155,7 +183,7 @@ secbool load_vendor_header(const uint8_t *const data, uint8_t key_m,
   uint8_t hash[BLAKE2S_DIGEST_LENGTH];
   BLAKE2S_CTX ctx;
   blake2s_Init(&ctx, BLAKE2S_DIGEST_LENGTH);
-  blake2s_Update(&ctx, data, vhdr->hdrlen - IMAGE_SIG_SIZE);
+  blake2s_Update(&ctx, vhdr->origin, vhdr->hdrlen - IMAGE_SIG_SIZE);
   for (int i = 0; i < IMAGE_SIG_SIZE; i++) {
     blake2s_Update(&ctx, (const uint8_t *)"\x00", 1);
   }
diff --git a/core/embed/trezorhal/image.h b/core/embed/trezorhal/image.h
index 56d233efa8..21c1aa64b0 100644
--- a/core/embed/trezorhal/image.h
+++ b/core/embed/trezorhal/image.h
@@ -45,12 +45,14 @@ typedef struct {
   uint32_t codelen;
   uint32_t version;
   uint32_t fix_version;
-  // uint8_t reserved[8];
+  uint32_t hw_model;
+  uint8_t hw_revision;
+  uint8_t monotonic;
+  uint8_t reserved_0[2];
   uint8_t hashes[512];
-  // uint8_t reserved[415];
+  uint8_t reserved_1[415];
   uint8_t sigmask;
   uint8_t sig[64];
-  uint8_t fingerprint[32];
 } image_header;
 
 #define MAX_VENDOR_PUBLIC_KEYS 8
@@ -76,20 +78,26 @@ typedef struct {
   const uint8_t *vimg;
   uint8_t sigmask;
   uint8_t sig[64];
+  const uint8_t *origin;  // pointer to the underlying data
 } vendor_header;
 
-secbool __wur load_image_header(const uint8_t *const data, const uint32_t magic,
-                                const uint32_t maxsize, uint8_t key_m,
-                                uint8_t key_n, const uint8_t *const *keys,
-                                image_header *const hdr);
+const image_header *read_image_header(const uint8_t *const data,
+                                      const uint32_t magic,
+                                      const uint32_t maxsize);
 
-secbool __wur load_vendor_header(const uint8_t *const data, uint8_t key_m,
-                                 uint8_t key_n, const uint8_t *const *keys,
-                                 vendor_header *const vhdr);
+secbool __wur check_image_model(const image_header *const hdr);
+
+secbool __wur check_image_header_sig(const image_header *const hdr,
+                                     uint8_t key_m, uint8_t key_n,
+                                     const uint8_t *const *keys);
 
 secbool __wur read_vendor_header(const uint8_t *const data,
                                  vendor_header *const vhdr);
 
+secbool __wur check_vendor_header_sig(const vendor_header *const vhdr,
+                                      uint8_t key_m, uint8_t key_n,
+                                      const uint8_t *const *keys);
+
 void vendor_header_hash(const vendor_header *const vhdr, uint8_t *hash);
 
 secbool __wur check_single_hash(const uint8_t *const hash,
diff --git a/core/embed/unix/display-unix.c b/core/embed/unix/display-unix.c
index c6669a205f..ed6fcb87de 100644
--- a/core/embed/unix/display-unix.c
+++ b/core/embed/unix/display-unix.c
@@ -234,6 +234,8 @@ void display_set_window(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1) {
   PIXELWINDOW.pos.y = y0;
 }
 
+void display_sync(void) {}
+
 void display_refresh(void) {
   if (!RENDERER) {
     display_init();
diff --git a/core/mocks/generated/trezorcrypto/bip39.pyi b/core/mocks/generated/trezorcrypto/bip39.pyi
index bc211c034d..2bc41eaca9 100644
--- a/core/mocks/generated/trezorcrypto/bip39.pyi
+++ b/core/mocks/generated/trezorcrypto/bip39.pyi
@@ -1,22 +1,6 @@
 from typing import *
 
 
-# extmod/modtrezorcrypto/modtrezorcrypto-bip39.h
-def complete_word(prefix: str) -> str | None:
-    """
-    Return the first word from the wordlist starting with prefix.
-    """
-
-
-# extmod/modtrezorcrypto/modtrezorcrypto-bip39.h
-def word_completion_mask(prefix: str) -> int:
-    """
-    Return possible 1-letter suffixes for given word prefix.
-    Result is a bitmask, with 'a' on the lowest bit, 'b' on the second
-    lowest, etc.
-    """
-
-
 # extmod/modtrezorcrypto/modtrezorcrypto-bip39.h
 def generate(strength: int) -> str:
     """
diff --git a/core/mocks/generated/trezorcrypto/slip39.pyi b/core/mocks/generated/trezorcrypto/slip39.pyi
index 564617fe25..4dedc34282 100644
--- a/core/mocks/generated/trezorcrypto/slip39.pyi
+++ b/core/mocks/generated/trezorcrypto/slip39.pyi
@@ -1,25 +1,6 @@
 from typing import *
 
 
-# extmod/modtrezorcrypto/modtrezorcrypto-slip39.h
-def word_completion_mask(prefix: int) -> int:
-    """
-    Calculates which buttons still can be pressed after some already were.
-    Returns a 9-bit bitmask, where each bit specifies which buttons
-    can be further pressed (there are still words in this combination).
-    LSB denotes first button.
-    Example: 110000110 - second, third, eighth and ninth button still can be
-    pressed.
-    """
-
-
-# extmod/modtrezorcrypto/modtrezorcrypto-slip39.h
-def button_sequence_to_word(prefix: int) -> str:
-    """
-    Finds the first word that fits the given button prefix.
-    """
-
-
 # extmod/modtrezorcrypto/modtrezorcrypto-slip39.h
 def word_index(word: str) -> int:
     """
diff --git a/core/mocks/generated/trezorui2.pyi b/core/mocks/generated/trezorui2.pyi
index 1ae771432e..fd121964ed 100644
--- a/core/mocks/generated/trezorui2.pyi
+++ b/core/mocks/generated/trezorui2.pyi
@@ -3,30 +3,9 @@ CONFIRMED: object
 CANCELLED: object
 
 
-# rust/src/ui/model_t1/layout.rs
-def confirm_action(
-    *,
-    title: str,
-    action: str | None = None,
-    description: str | None = None,
-    verb: str | None = None,
-    verb_cancel: str | None = None,
-    hold: bool | None = None,
-    reverse: bool = False,
-) -> object:
-    """Confirm action."""
-
-
-# rust/src/ui/model_t1/layout.rs
-def confirm_text(
-    *,
-    title: str,
-    data: str,
-    description: str | None,
-) -> object:
-    """Confirm text."""
-CONFIRMED: object
-CANCELLED: object
+# rust/src/ui/model_tr/layout.rs
+def disable_animation(disable: bool) -> None:
+    """Disable animations, debug builds only."""
 
 
 # rust/src/ui/model_tr/layout.rs
@@ -37,7 +16,8 @@ def confirm_action(
     description: str | None = None,
     verb: str | None = None,
     verb_cancel: str | None = None,
-    hold: bool | None = None,
+    hold: bool = False,
+    hold_danger: bool = False,  # unused on TR
     reverse: bool = False,
 ) -> object:
     """Confirm action."""
@@ -56,6 +36,21 @@ CANCELLED: object
 INFO: object
 
 
+# rust/src/ui/model_tt/layout.rs
+def disable_animation(disable: bool) -> None:
+    """Disable animations, debug builds only."""
+
+
+# rust/src/ui/model_tt/layout.rs
+def jpeg_info(data: bytes) -> (width: int, height: int, mcu_height: int):
+    """Get JPEG image dimensions."""
+
+
+# rust/src/ui/model_tt/layout.rs
+def jpeg_test(data: bytes) -> bool:
+    """Test JPEG image."""
+
+
 # rust/src/ui/model_tt/layout.rs
 def confirm_action(
     *,
@@ -71,6 +66,15 @@ def confirm_action(
     """Confirm action."""
 
 
+# rust/src/ui/model_tt/layout.rs
+def confirm_homescreen(
+    *,
+    title: str,
+    image: bytes,
+) -> object:
+    """Confirm homescreen."""
+
+
 # rust/src/ui/model_tt/layout.rs
 def confirm_blob(
     *,
@@ -99,7 +103,7 @@ def confirm_properties(
 def confirm_reset_device(
     *,
     title: str,
-    prompt: str,
+    button: str,
 ) -> object:
     """Confirm TOS before device setup."""
 
@@ -179,7 +183,7 @@ def show_error(
     allow_cancel: bool = False,
     time_ms: int = 0,
 ) -> object:
-    """Error modal."""
+    """Error modal. No buttons shown when `button` is empty string."""
 
 
 # rust/src/ui/model_tt/layout.rs
@@ -191,7 +195,7 @@ def show_warning(
     allow_cancel: bool = False,
     time_ms: int = 0,
 ) -> object:
-    """Warning modal."""
+    """Warning modal. No buttons shown when `button` is empty string."""
 
 
 # rust/src/ui/model_tt/layout.rs
@@ -203,7 +207,7 @@ def show_success(
     allow_cancel: bool = False,
     time_ms: int = 0,
 ) -> object:
-    """Success modal."""
+    """Success modal. No buttons shown when `button` is empty string."""
 
 
 # rust/src/ui/model_tt/layout.rs
@@ -215,7 +219,7 @@ def show_info(
     allow_cancel: bool = False,
     time_ms: int = 0,
 ) -> object:
-    """Info modal."""
+    """Info modal. No buttons shown when `button` is empty string."""
 
 
 # rust/src/ui/model_tt/layout.rs
@@ -266,7 +270,7 @@ def request_pin(
     prompt: str,
     subprompt: str,
     allow_cancel: bool = True,
-    warning: str | None = None,
+    wrong_pin: bool = False,
 ) -> str | object:
     """Request pin on device."""
 
@@ -323,7 +327,7 @@ def request_number(
     count: int,
     min_count: int,
     max_count: int,
-    description: Callable[[int], str],
+    description: Callable[[int], str] | None = None,
 ) -> object:
    """Number input with + and - buttons, description, and info button."""
 
@@ -356,7 +360,7 @@ def confirm_recovery(
 def select_word_count(
     *,
     dry_run: bool,
-) -> int | trezorui2.CANCELLED:
+) -> int | CANCELLED:
    """Select mnemonic word count from (12, 18, 20, 24, 33)."""
 
 
@@ -374,3 +378,53 @@ def show_remaining_shares(
     pages: Iterable[tuple[str, str]],
 ) -> int:
    """Shows SLIP39 state after info button is pressed on `confirm_recovery`."""
+
+
+# rust/src/ui/model_tt/layout.rs
+def show_progress(
+    *,
+    title: str,
+    indeterminate: bool = False,
+    description: str | None = None,
+) -> object:
+   """Show progress loader. Please note that the number of lines reserved on screen for
+   description is determined at construction time. If you want multiline descriptions
+   make sure the initial desciption has at least that amount of lines."""
+
+
+# rust/src/ui/model_tt/layout.rs
+def show_homescreen(
+    *,
+    label: str,
+    hold: bool,
+    notification: str | None,
+    notification_level: int = 0,
+    skip_first_paint: bool,
+) -> CANCELLED:
+    """Idle homescreen."""
+
+
+# rust/src/ui/model_tt/layout.rs
+def show_lockscreen(
+    *,
+    label: str,
+    bootscreen: bool,
+    skip_first_paint: bool,
+) -> CANCELLED:
+    """Homescreen for locked device."""
+
+
+# rust/src/ui/model_tt/layout.rs
+def show_busyscreen(
+    *,
+    title: str,
+    description: str,
+    time_ms: int,
+    skip_first_paint: bool,
+) -> CANCELLED:
+    """Homescreen used for indicating coinjoin in progress."""
+
+
+# rust/src/ui/model_tt/layout.rs
+def draw_welcome_screen() -> None:
+    """Show logo icon with the model name at the bottom and return."""
diff --git a/core/site_scons/tools.py b/core/site_scons/tools.py
index 96dc5d2e52..fc57884635 100644
--- a/core/site_scons/tools.py
+++ b/core/site_scons/tools.py
@@ -1,3 +1,8 @@
+import os.path
+
+import subprocess
+
+
 def add_font(font_name, font, defines, sources):
     if font is not None:
         defines += [
@@ -9,16 +14,26 @@ def add_font(font_name, font, defines, sources):
             sources.append(sourcefile)
 
 
+def get_hw_model_as_number(hw_model):
+    return int.from_bytes(hw_model.encode(), 'little')
+
+
 def configure_board(model, env, defines, sources):
     model_r_version = 4
 
     if model in ('1',):
         board = 'trezor_1.h'
         display = 'vg-2864ksweg01.c'
+        hw_model = get_hw_model_as_number('T1B1')
+        hw_revision = 0
     elif model in ('T',):
         board = 'trezor_t.h'
         display = 'st7789v.c'
+        hw_model = get_hw_model_as_number('T2T1')
+        hw_revision = 0
     elif model in ('R',):
+        hw_model = get_hw_model_as_number('T2B1')
+        hw_revision = model_r_version
         if model_r_version == 3:
             board = 'trezor_r_v3.h'
             display = "ug-2828tswig01.c"
@@ -29,5 +44,59 @@ def configure_board(model, env, defines, sources):
         raise Exception("Unknown model")
 
     defines += [f'TREZOR_BOARD=\\"boards/{board}\\"', ]
+    defines += [f'HW_MODEL={hw_model}', ]
+    defines += [f'HW_REVISION={hw_revision}', ]
     sources += [f'embed/trezorhal/displays/{display}', ]
     env.get('ENV')['TREZOR_BOARD'] = board
+
+
+def get_model_identifier(model):
+    if model == '1':
+        return "T1B1"
+    elif model == 'T':
+        return "T2T1"
+    elif model == 'R':
+        return "T2B1"
+    else:
+        raise Exception("Unknown model")
+
+
+def get_version(file):
+    major = 0
+    minor = 0
+    patch = 0
+
+    if not os.path.exists(file):
+        file = os.path.join("..", "..", file)
+
+    with open(file, 'r') as f:
+        for line in f:
+            if line.startswith('#define VERSION_MAJOR '):
+                major = line.split('VERSION_MAJOR')[1].strip()
+            if line.startswith('#define VERSION_MINOR '):
+                minor = line.split('VERSION_MINOR')[1].strip()
+            if line.startswith('#define VERSION_PATCH '):
+                patch = line.split('VERSION_PATCH')[1].strip()
+        return f'{major}.{minor}.{patch}'
+
+
+def get_git_revision_hash() -> str:
+    return subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip()
+
+
+def get_git_revision_short_hash() -> str:
+    return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip()
+
+
+def get_git_modified() -> bool:
+    return subprocess.check_output(['git', 'diff', '--name-status']).decode('ascii').strip() != ''
+
+
+def get_defs_for_cmake(defs):
+    result = []
+    for d in defs:
+        if type(d) is tuple:
+            result.append(d[0] + "=" + d[1])
+        else:
+            result.append(d)
+    return result
diff --git a/core/src/_vulture_ignore.txt b/core/src/_vulture_ignore.txt
new file mode 100644
index 0000000000..916f1bfa3b
--- /dev/null
+++ b/core/src/_vulture_ignore.txt
@@ -0,0 +1,76 @@
+_.sd_card_present  # unused attribute (src/apps/base.py:111)
+_.initialized  # unused attribute (src/apps/base.py:112)
+_.recovery_mode  # unused attribute (src/apps/base.py:122)
+_.sd_protection  # unused attribute (src/apps/base.py:124)
+_.wipe_code_protection  # unused attribute (src/apps/base.py:125)
+SIGHASH_ALL_FORKID  # unused variable (src/apps/bitcoin/common.py:43)
+_.extra_data_offset  # unused attribute (src/apps/bitcoin/sign_tx/helpers.py:292)
+_.request_index  # unused attribute (src/apps/bitcoin/sign_tx/helpers.py:309)
+_.request_index  # unused attribute (src/apps/bitcoin/sign_tx/helpers.py:320)
+_.request_index  # unused attribute (src/apps/bitcoin/sign_tx/helpers.py:336)
+_.request_index  # unused attribute (src/apps/bitcoin/sign_tx/helpers.py:347)
+_.request_index  # unused attribute (src/apps/bitcoin/sign_tx/helpers.py:360)
+_.request_index  # unused attribute (src/apps/bitcoin/sign_tx/helpers.py:380)
+_.extra_data_offset  # unused attribute (src/apps/bitcoin/sign_tx/helpers.py:383)
+is_other_warning  # unused variable (src/apps/cardano/helpers/credential.py:34)
+_.is_other_warning  # unused attribute (src/apps/cardano/helpers/credential.py:84)
+_.is_other_warning  # unused attribute (src/apps/cardano/helpers/credential.py:118)
+_.is_other_warning  # unused attribute (src/apps/cardano/helpers/credential.py:136)
+_.is_other_warning  # unused attribute (src/apps/cardano/helpers/credential.py:147)
+exc_tb  # unused variable (src/apps/cardano/helpers/hash_builder_collection.py:73)
+exc_val  # unused variable (src/apps/cardano/helpers/hash_builder_collection.py:73)
+exc_val  # unused variable (src/apps/common/keychain.py:174)
+tb  # unused variable (src/apps/common/keychain.py:174)
+_.reset_entropy  # unused attribute (src/apps/debug/__init__.py:167)
+_.layout_lines  # unused attribute (src/apps/debug/__init__.py:176)
+_.reset_word_pos  # unused attribute (src/apps/debug/__init__.py:179)
+_.reset_word  # unused attribute (src/apps/debug/__init__.py:181)
+_.signature_v  # unused attribute (src/apps/ethereum/sign_tx.py:176)
+_.signature_v  # unused attribute (src/apps/ethereum/sign_tx.py:178)
+_.signature_v  # unused attribute (src/apps/ethereum/sign_tx.py:180)
+_.signature_r  # unused attribute (src/apps/ethereum/sign_tx.py:182)
+_.signature_s  # unused attribute (src/apps/ethereum/sign_tx.py:183)
+_.signature_v  # unused attribute (src/apps/ethereum/sign_tx_eip1559.py:168)
+_.signature_r  # unused attribute (src/apps/ethereum/sign_tx_eip1559.py:169)
+_.signature_s  # unused attribute (src/apps/ethereum/sign_tx_eip1559.py:170)
+_.tx_derivations  # unused attribute (src/apps/monero/get_tx_keys.py:84)
+_.tx_keys  # unused attribute (src/apps/monero/get_tx_keys.py:87)
+_.key_offsets  # unused attribute (src/apps/monero/signing/step_02_set_input.py:82)
+nV  # unused variable (src/apps/monero/xmr/bulletproof.py:1737)
+nV  # unused variable (src/apps/monero/xmr/bulletproof.py:1746)
+__data  # unused variable (src/apps/monero/xmr/serialize/base_types.py:19)
+__buffer  # unused variable (src/apps/monero/xmr/serialize/base_types.py:23)
+__reader  # unused variable (src/apps/monero/xmr/serialize/base_types.py:27)
+__value  # unused variable (src/apps/monero/xmr/serialize/base_types.py:30)
+__writer  # unused variable (src/apps/monero/xmr/serialize/base_types.py:30)
+XmrStructuredType  # unused class (src/apps/monero/xmr/serialize/base_types.py:33)
+_.ndata  # unused attribute (src/apps/monero/xmr/serialize/readwriter.py:16)
+_.ndata  # unused attribute (src/apps/monero/xmr/serialize/readwriter.py:48)
+_.ndata  # unused attribute (src/apps/monero/xmr/serialize/readwriter.py:94)
+_.versionInterface  # unused attribute (src/apps/webauthn/fido2.py:1190)
+_.versionMajor  # unused attribute (src/apps/webauthn/fido2.py:1191)
+_.versionMinor  # unused attribute (src/apps/webauthn/fido2.py:1192)
+_.versionBuild  # unused attribute (src/apps/webauthn/fido2.py:1193)
+_.capFlags  # unused attribute (src/apps/webauthn/fido2.py:1194)
+_.registerId  # unused attribute (src/apps/webauthn/fido2.py:1287)
+_.keyHandleLen  # unused attribute (src/apps/webauthn/fido2.py:1289)
+_.txid_digest  # unused method (src/apps/zcash/hasher.py:65)
+exc_val  # unused variable (src/trezor/sdcard.py:63)
+tb  # unused variable (src/trezor/sdcard.py:63)
+format_ordinal  # unused function (src/trezor/strings.py:26)
+_.repaint  # unused attribute (src/trezor/ui/__init__.py:126)
+_.repaint  # unused attribute (src/trezor/ui/__init__.py:140)
+_.repaint  # unused attribute (src/trezor/ui/__init__.py:161)
+button_number  # unused variable (src/trezor/ui/__init__.py:163)
+button_number  # unused variable (src/trezor/ui/__init__.py:166)
+mem_dump  # unused function (src/trezor/utils.py:106)
+__buf  # unused variable (src/trezor/utils.py:142)
+__data  # unused variable (src/trezor/utils.py:150)
+__b  # unused variable (src/trezor/utils.py:155)
+__buf  # unused variable (src/trezor/utils.py:158)
+DebugHashContextWrapper  # unused class (src/trezor/utils.py:164)
+argv  # unused variable (src/trezor/wire/__init__.py:121)
+argv  # unused variable (src/trezor/wire/__init__.py:124)
+argv  # unused variable (src/trezor/wire/__init__.py:127)
+kill_default  # unused function (src/trezor/workflow.py:102)
+__getattr__  # unused function (src/typing.py:20)
diff --git a/core/src/all_modules.py b/core/src/all_modules.py
index c40e665b27..2ed8a27f86 100644
--- a/core/src/all_modules.py
+++ b/core/src/all_modules.py
@@ -103,6 +103,8 @@ trezor.enums.DecredStakingSpendType
 import trezor.enums.DecredStakingSpendType
 trezor.enums.FailureType
 import trezor.enums.FailureType
+trezor.enums.HomescreenFormat
+import trezor.enums.HomescreenFormat
 trezor.enums.InputScriptType
 import trezor.enums.InputScriptType
 trezor.enums.MessageType
@@ -135,24 +137,20 @@ trezor.pin
 import trezor.pin
 trezor.protobuf
 import trezor.protobuf
-trezor.res
-import trezor.res
-trezor.res.resources
-import trezor.res.resources
 trezor.sdcard
 import trezor.sdcard
 trezor.strings
 import trezor.strings
 trezor.ui
 import trezor.ui
-trezor.ui.components.common.confirm
-import trezor.ui.components.common.confirm
 trezor.ui.layouts
 import trezor.ui.layouts
 trezor.ui.layouts.common
 import trezor.ui.layouts.common
 trezor.ui.layouts.fido
 import trezor.ui.layouts.fido
+trezor.ui.layouts.homescreen
+import trezor.ui.layouts.homescreen
 trezor.ui.layouts.recovery
 import trezor.ui.layouts.recovery
 trezor.ui.layouts.reset
@@ -163,14 +161,12 @@ trezor.ui.layouts.tt_v2
 import trezor.ui.layouts.tt_v2
 trezor.ui.layouts.tt_v2.fido
 import trezor.ui.layouts.tt_v2.fido
+trezor.ui.layouts.tt_v2.homescreen
+import trezor.ui.layouts.tt_v2.homescreen
 trezor.ui.layouts.tt_v2.recovery
 import trezor.ui.layouts.tt_v2.recovery
 trezor.ui.layouts.tt_v2.reset
 import trezor.ui.layouts.tt_v2.reset
-trezor.ui.loader
-import trezor.ui.loader
-trezor.ui.popup
-import trezor.ui.popup
 trezor.ui.style
 import trezor.ui.style
 trezor.utils
@@ -293,12 +289,6 @@ apps.debug.load_device
 import apps.debug.load_device
 apps.homescreen
 import apps.homescreen
-apps.homescreen.busyscreen
-import apps.homescreen.busyscreen
-apps.homescreen.homescreen
-import apps.homescreen.homescreen
-apps.homescreen.lockscreen
-import apps.homescreen.lockscreen
 apps.management.apply_flags
 import apps.management.apply_flags
 apps.management.apply_settings
@@ -341,6 +331,8 @@ apps.misc
 import apps.misc
 apps.misc.cipher_key_value
 import apps.misc.cipher_key_value
+apps.misc.cosi_commit
+import apps.misc.cosi_commit
 apps.misc.get_ecdh_session_key
 import apps.misc.get_ecdh_session_key
 apps.misc.get_entropy
diff --git a/core/src/apps/base.py b/core/src/apps/base.py
index e46b063518..8bd26fe604 100644
--- a/core/src/apps/base.py
+++ b/core/src/apps/base.py
@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 import storage.cache as storage_cache
 import storage.device as storage_device
 from trezor import config, utils, wire, workflow
-from trezor.enums import MessageType
+from trezor.enums import HomescreenFormat, MessageType
 from trezor.messages import Success, UnlockPath
 
 from . import workflow_handlers
@@ -75,6 +75,7 @@ def get_features() -> Features:
         pin_protection=config.has_pin(),
         unlocked=config.is_unlocked(),
         busy=busy_expiry_ms() > 0,
+        homescreen_format=HomescreenFormat.Jpeg240x240,
     )
 
     if utils.BITCOIN_ONLY:
@@ -127,6 +128,7 @@ def get_features() -> Features:
         f.auto_lock_delay_ms = storage_device.get_autolock_delay_ms()
         f.display_rotation = storage_device.get_rotation()
         f.experimental_features = storage_device.get_experimental_features()
+        f.hide_passphrase_from_host = storage_device.get_hide_passphrase_from_host()
 
     return f
 
@@ -261,8 +263,8 @@ async def handle_UnlockPath(ctx: wire.Context, msg: UnlockPath) -> protobuf.Mess
         await confirm_action(
             ctx,
             "confirm_coinjoin_access",
-            title="CoinJoin account",
-            description="Do you want to allow access to your CoinJoin account?",
+            title="Coinjoin account",
+            description="Do you want to allow access to your coinjoin account?",
         )
 
     wire_types = (MessageType.GetAddress, MessageType.GetPublicKey, MessageType.SignTx)
@@ -291,12 +293,12 @@ def set_homescreen() -> None:
     set_default = workflow.set_default  # local_cache_attribute
 
     if storage_cache.is_set(storage_cache.APP_COMMON_BUSY_DEADLINE_MS):
-        from apps.homescreen.busyscreen import busyscreen
+        from apps.homescreen import busyscreen
 
         set_default(busyscreen)
 
     elif not config.is_unlocked():
-        from apps.homescreen.lockscreen import lockscreen
+        from apps.homescreen import lockscreen
 
         set_default(lockscreen)
 
@@ -306,7 +308,7 @@ def set_homescreen() -> None:
         set_default(recovery_homescreen)
 
     else:
-        from apps.homescreen.homescreen import homescreen
+        from apps.homescreen import homescreen
 
         set_default(homescreen)
 
diff --git a/core/src/apps/binance/layout.py b/core/src/apps/binance/layout.py
index 8a5f0f9a48..77824f93ca 100644
--- a/core/src/apps/binance/layout.py
+++ b/core/src/apps/binance/layout.py
@@ -35,20 +35,23 @@ async def require_confirm_transfer(ctx: Context, msg: BinanceTransferMsg) -> Non
     for txoutput in msg.outputs:
         make_input_output_pages(txoutput, "Confirm output")
 
-    await confirm_transfer(ctx, items)
+    await _confirm_transfer(ctx, items)
 
 
-async def confirm_transfer(
+async def _confirm_transfer(
     ctx: Context, inputs_outputs: Sequence[tuple[str, str, str]]
 ) -> None:
     from trezor.ui.layouts import confirm_output
 
-    for title, amount, address in inputs_outputs:
+    for index, (title, amount, address) in enumerate(inputs_outputs):
+        # Having hold=True on the last item
+        hold = index == len(inputs_outputs) - 1
         await confirm_output(
             ctx,
             address,
             amount,
             title,
+            hold=hold,
         )
 
 
diff --git a/core/src/apps/bitcoin/authorization.py b/core/src/apps/bitcoin/authorization.py
index 79e015de5d..802992da11 100644
--- a/core/src/apps/bitcoin/authorization.py
+++ b/core/src/apps/bitcoin/authorization.py
@@ -9,11 +9,10 @@ if TYPE_CHECKING:
         GetOwnershipProof,
         SignTx,
         TxInput,
+        TxOutput,
     )
     from trezor.protobuf import MessageType
 
-    from apps.common.coininfo import CoinInfo
-
 FEE_RATE_DECIMALS = const(6)
 
 
@@ -38,15 +37,25 @@ class CoinJoinAuthorization:
             and msg.commitment_data.startswith(bytes(coordinator))
         )
 
-    def check_sign_tx_input(self, txi: TxInput, coin: CoinInfo) -> bool:
-        # Check whether the current input matches the parameters of the request.
+    def check_internal_input(self, txi: TxInput) -> bool:
+        # Check whether the input matches the parameters of the request.
         return (
             len(txi.address_n) >= BIP32_WALLET_DEPTH
             and txi.address_n[:-BIP32_WALLET_DEPTH] == self.params.address_n
-            and coin.coin_name == self.params.coin_name
             and txi.script_type == self.params.script_type
         )
 
+    def check_internal_output(self, txo: TxOutput) -> bool:
+        from .common import CHANGE_OUTPUT_TO_INPUT_SCRIPT_TYPES
+
+        # Check whether the output matches the parameters of the request.
+        return (
+            len(txo.address_n) >= BIP32_WALLET_DEPTH
+            and txo.address_n[:-BIP32_WALLET_DEPTH] == self.params.address_n
+            and CHANGE_OUTPUT_TO_INPUT_SCRIPT_TYPES[txo.script_type]
+            == self.params.script_type
+        )
+
     def approve_sign_tx(self, msg: SignTx) -> bool:
         from apps.common import authorization
 
@@ -56,7 +65,11 @@ class CoinJoinAuthorization:
             return False
 
         params.max_rounds -= 1
-        authorization.set(params)
+        if params.max_rounds >= 1:
+            authorization.set(params)
+        else:
+            authorization.clear()
+
         return True
 
 
diff --git a/core/src/apps/bitcoin/authorize_coinjoin.py b/core/src/apps/bitcoin/authorize_coinjoin.py
index b3666dd9e1..80aaf30c41 100644
--- a/core/src/apps/bitcoin/authorize_coinjoin.py
+++ b/core/src/apps/bitcoin/authorize_coinjoin.py
@@ -39,6 +39,9 @@ async def authorize_coinjoin(
     ):
         raise DataError("Invalid coordinator name.")
 
+    if msg.max_rounds < 1:
+        raise DataError("Invalid number of rounds.")
+
     if msg.max_rounds > _MAX_ROUNDS and safety_checks_is_strict:
         raise DataError("The number of rounds is unexpectedly large.")
 
@@ -86,4 +89,4 @@ async def authorize_coinjoin(
 
     authorization.set(msg)
 
-    return Success(message="CoinJoin authorized")
+    return Success(message="Coinjoin authorized")
diff --git a/core/src/apps/bitcoin/get_public_key.py b/core/src/apps/bitcoin/get_public_key.py
index 000e7fc78d..46b47b6658 100644
--- a/core/src/apps/bitcoin/get_public_key.py
+++ b/core/src/apps/bitcoin/get_public_key.py
@@ -82,7 +82,7 @@ async def get_public_key(
     if msg.show_display:
         from trezor.ui.layouts import show_xpub
 
-        await show_xpub(ctx, node_xpub, "XPUB", "Cancel")
+        await show_xpub(ctx, node_xpub, "XPUB")
 
     return PublicKey(
         node=node_type,
diff --git a/core/src/apps/bitcoin/keychain.py b/core/src/apps/bitcoin/keychain.py
index e00bcd1407..af43b1cf7e 100644
--- a/core/src/apps/bitcoin/keychain.py
+++ b/core/src/apps/bitcoin/keychain.py
@@ -1,9 +1,9 @@
 from micropython import const
 from typing import TYPE_CHECKING
 
-from trezor.messages import AuthorizeCoinJoin
+from trezor.messages import AuthorizeCoinJoin, SignMessage
 
-from apps.common.paths import PATTERN_BIP44, PathSchema
+from apps.common.paths import PATTERN_BIP44, PATTERN_CASA, PathSchema
 
 from . import authorization
 from .common import BITCOIN_NAMES
@@ -20,7 +20,6 @@ if TYPE_CHECKING:
         GetAddress,
         GetOwnershipId,
         GetPublicKey,
-        SignMessage,
         VerifyMessage,
         GetOwnershipProof,
         SignTx,
@@ -64,7 +63,7 @@ PATTERN_BIP49 = "m/49'/coin_type'/account'/change/address_index"
 PATTERN_BIP84 = "m/84'/coin_type'/account'/change/address_index"
 # BIP-86 for taproot: https://github.com/bitcoin/bips/blob/master/bip-0086.mediawiki
 PATTERN_BIP86 = "m/86'/coin_type'/account'/change/address_index"
-# SLIP-25 for CoinJoin: https://github.com/satoshilabs/slips/blob/master/slip-0025.md
+# SLIP-25 for coinjoin: https://github.com/satoshilabs/slips/blob/master/slip-0025.md
 # Only account=0 and script_type=1 are supported for now.
 PATTERN_SLIP25_TAPROOT = "m/10025'/coin_type'/0'/1'/change/address_index"
 PATTERN_SLIP25_TAPROOT_EXTERNAL = "m/10025'/coin_type'/0'/1'/0/address_index"
@@ -75,7 +74,7 @@ PATTERN_GREENADDRESS_B = "m/3'/[1-100]'/[1,4]/address_index"
 PATTERN_GREENADDRESS_SIGN_A = "m/1195487518"
 PATTERN_GREENADDRESS_SIGN_B = "m/1195487518/6/address_index"
 
-PATTERN_CASA = "m/49/coin_type/account/change/address_index"
+PATTERN_CASA_UNHARDENED = "m/49/coin_type/account/change/address_index"
 
 PATTERN_UNCHAINED_HARDENED = (
     "m/45'/coin_type'/account'/[0-1000000]/change/address_index"
@@ -85,11 +84,15 @@ PATTERN_UNCHAINED_UNHARDENED = (
 )
 PATTERN_UNCHAINED_DEPRECATED = "m/45'/coin_type'/account'/[0-1000000]/address_index"
 
+# Model 1 firmware signing.
+# 826421588 is ASCII string "T1B1" as a little-endian 32-bit integer.
+PATTERN_SLIP26_T1_FW = "m/10026'/826421588'/2'/0'"
+
 # SLIP-44 coin type for Bitcoin
-_SLIP44_BITCOIN = const(0)
+SLIP44_BITCOIN = const(0)
 
 # SLIP-44 coin type for all Testnet coins
-_SLIP44_TESTNET = const(1)
+SLIP44_TESTNET = const(1)
 
 
 def validate_path_against_script_type(
@@ -116,20 +119,22 @@ def validate_path_against_script_type(
 
     if script_type == InputScriptType.SPENDADDRESS and not multisig:
         append(PATTERN_BIP44)
-        if slip44 == _SLIP44_BITCOIN:
+        if slip44 == SLIP44_BITCOIN:
             append(PATTERN_GREENADDRESS_A)
             append(PATTERN_GREENADDRESS_B)
 
+        if SignMessage.is_type_of(msg):
+            append(PATTERN_SLIP26_T1_FW)
     elif (
         script_type in (InputScriptType.SPENDADDRESS, InputScriptType.SPENDMULTISIG)
         and multisig
     ):
         append(PATTERN_BIP48_RAW)
-        if slip44 == _SLIP44_BITCOIN or (
-            coin.fork_id is not None and slip44 != _SLIP44_TESTNET
+        if slip44 == SLIP44_BITCOIN or (
+            coin.fork_id is not None and slip44 != SLIP44_TESTNET
         ):
             append(PATTERN_BIP45)
-        if slip44 == _SLIP44_BITCOIN:
+        if slip44 == SLIP44_BITCOIN:
             append(PATTERN_GREENADDRESS_A)
             append(PATTERN_GREENADDRESS_B)
         if coin.coin_name in BITCOIN_NAMES:
@@ -139,19 +144,20 @@ def validate_path_against_script_type(
 
     elif coin.segwit and script_type == InputScriptType.SPENDP2SHWITNESS:
         append(PATTERN_BIP49)
+        append(PATTERN_CASA)
         if multisig:
             append(PATTERN_BIP48_P2SHSEGWIT)
-        if slip44 == _SLIP44_BITCOIN:
+        if slip44 == SLIP44_BITCOIN:
             append(PATTERN_GREENADDRESS_A)
             append(PATTERN_GREENADDRESS_B)
         if coin.coin_name in BITCOIN_NAMES:
-            append(PATTERN_CASA)
+            append(PATTERN_CASA_UNHARDENED)
 
     elif coin.segwit and script_type == InputScriptType.SPENDWITNESS:
         append(PATTERN_BIP84)
         if multisig:
             append(PATTERN_BIP48_SEGWIT)
-        if slip44 == _SLIP44_BITCOIN:
+        if slip44 == SLIP44_BITCOIN:
             append(PATTERN_GREENADDRESS_A)
             append(PATTERN_GREENADDRESS_B)
 
@@ -173,21 +179,23 @@ def _get_schemas_for_coin(
     patterns = [
         PATTERN_BIP44,
         PATTERN_BIP48_RAW,
+        PATTERN_CASA,
     ]
 
     # patterns without coin_type field must be treated as if coin_type == 0
-    if coin.slip44 == _SLIP44_BITCOIN or (
-        coin.fork_id is not None and coin.slip44 != _SLIP44_TESTNET
+    if coin.slip44 == SLIP44_BITCOIN or (
+        coin.fork_id is not None and coin.slip44 != SLIP44_TESTNET
     ):
         patterns.append(PATTERN_BIP45)
 
-    if coin.slip44 == _SLIP44_BITCOIN:
+    if coin.slip44 == SLIP44_BITCOIN:
         patterns.extend(
             (
                 PATTERN_GREENADDRESS_A,
                 PATTERN_GREENADDRESS_B,
                 PATTERN_GREENADDRESS_SIGN_A,
                 PATTERN_GREENADDRESS_SIGN_B,
+                PATTERN_SLIP26_T1_FW,
             )
         )
 
@@ -195,7 +203,7 @@ def _get_schemas_for_coin(
     if coin.coin_name in BITCOIN_NAMES:
         patterns.extend(
             (
-                PATTERN_CASA,
+                PATTERN_CASA_UNHARDENED,
                 PATTERN_UNCHAINED_HARDENED,
                 PATTERN_UNCHAINED_UNHARDENED,
                 PATTERN_UNCHAINED_DEPRECATED,
@@ -235,9 +243,9 @@ def get_schemas_from_patterns(
     # cannot allow spending any testnet coins from Bitcoin paths, because
     # otherwise an attacker could trick the user into spending BCH on a Bitcoin
     # path by signing a seemingly harmless BCH Testnet transaction.
-    if coin.fork_id is not None and coin.slip44 != _SLIP44_TESTNET:
+    if coin.fork_id is not None and coin.slip44 != SLIP44_TESTNET:
         schemas.extend(
-            PathSchema.parse(pattern, _SLIP44_BITCOIN) for pattern in patterns
+            PathSchema.parse(pattern, SLIP44_BITCOIN) for pattern in patterns
         )
 
     return schemas
@@ -290,7 +298,7 @@ def _get_unlock_schemas(
         patterns = []
         if SignTx.is_type_of(msg) or GetOwnershipProof.is_type_of(msg):
             # SignTx and GetOwnershipProof need access to all SLIP-25 addresses
-            # to create CoinJoin outputs.
+            # to create coinjoin outputs.
             patterns.append(PATTERN_SLIP25_TAPROOT)
         else:
             # In case of other messages like GetAddress or SignMessage there is
diff --git a/core/src/apps/bitcoin/sign_tx/approvers.py b/core/src/apps/bitcoin/sign_tx/approvers.py
index 866f9f0d73..f51a3c324b 100644
--- a/core/src/apps/bitcoin/sign_tx/approvers.py
+++ b/core/src/apps/bitcoin/sign_tx/approvers.py
@@ -10,7 +10,7 @@ from apps.common import safety_checks
 
 from .. import writers
 from ..common import input_is_external_unverified
-from ..keychain import validate_path_against_script_type
+from ..keychain import SLIP44_TESTNET, validate_path_against_script_type
 from . import helpers, tx_weight
 from .sig_hasher import BitcoinSigHasher
 from .tx_info import OriginalTxInfo
@@ -83,7 +83,7 @@ class Approver:
             if txi.orig_hash:
                 self.orig_external_in += txi.amount
 
-    def _add_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
+    async def _add_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
         self.weight.add_output(script_pubkey)
         self.total_out += txo.amount
 
@@ -101,8 +101,8 @@ class Approver:
         self.payment_req_verifier = None
         self.show_payment_req_details = False
 
-    def add_change_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
-        self._add_output(txo, script_pubkey)
+    async def add_change_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
+        await self._add_output(txo, script_pubkey)
         self.change_out += txo.amount
         if self.payment_req_verifier:
             self.payment_req_verifier.add_change_output(txo)
@@ -117,7 +117,7 @@ class Approver:
         script_pubkey: bytes,
         orig_txo: TxOutput | None = None,
     ) -> None:
-        self._add_output(txo, script_pubkey)
+        await self._add_output(txo, script_pubkey)
         if self.payment_req_verifier:
             self.payment_req_verifier.add_external_output(txo)
 
@@ -160,8 +160,21 @@ class BasicApprover(Approver):
         ):
             raise ProcessError("Transaction has changed during signing")
 
-    def add_change_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
-        super().add_change_output(txo, script_pubkey)
+    async def _add_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
+        from ..common import CHANGE_OUTPUT_TO_INPUT_SCRIPT_TYPES
+
+        if txo.address_n and not validate_path_against_script_type(
+            self.coin,
+            address_n=txo.address_n,
+            script_type=CHANGE_OUTPUT_TO_INPUT_SCRIPT_TYPES[txo.script_type],
+            multisig=bool(txo.multisig),
+        ):
+            await helpers.confirm_foreign_address(txo.address_n)
+
+        await super()._add_output(txo, script_pubkey)
+
+    async def add_change_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
+        await super().add_change_output(txo, script_pubkey)
         self.change_count += 1
 
     async def add_external_output(
@@ -212,14 +225,13 @@ class BasicApprover(Approver):
     async def add_payment_request(
         self, msg: TxAckPaymentRequest, keychain: Keychain
     ) -> None:
-        from trezor.ui.components.common.confirm import INFO
-
         await super().add_payment_request(msg, keychain)
         if msg.amount is None:
             raise DataError("Missing payment request amount.")
 
         result = await helpers.confirm_payment_request(msg, self.coin, self.amount_unit)
-        self.show_payment_req_details = result is INFO
+        # When user wants to see more info, the result will be False.
+        self.show_payment_req_details = result is False
 
     async def approve_orig_txids(
         self, tx_info: TxInfo, orig_txs: list[OriginalTxInfo]
@@ -336,8 +348,8 @@ class BasicApprover(Approver):
 
 
 class CoinJoinApprover(Approver):
-    # Minimum registrable output amount accepted by the CoinJoin coordinator.
-    # The CoinJoin request may specify an even lower amount.
+    # Minimum registrable output amount accepted by the coinjoin coordinator.
+    # The coinjoin request may specify an even lower amount.
     MIN_REGISTRABLE_OUTPUT_AMOUNT = const(5000)
 
     # Largest possible weight of an output supported by Trezor (P2TR or P2WSH).
@@ -347,10 +359,12 @@ class CoinJoinApprover(Approver):
     COINJOIN_FLAGS_SIGNABLE = const(0x01)
     COINJOIN_FLAGS_NO_FEE = const(0x02)
 
+    # The public key used for verifying coinjoin requests in production on mainnet.
     COINJOIN_REQ_PUBKEY = b"\x02W\x03\xbb\xe1[\xb0\x8e\x98!\xfed\xaf\xf6\xb2\xef\x1a1`\xe3y\x9d\xd8\xf0\xce\xbf,y\xe8g\xdd\x12]"
-    if __debug__:
-        # secp256k1 public key of m/0h for "all all ... all" seed.
-        COINJOIN_REQ_PUBKEY_DEBUG = b"\x03\x0f\xdf^(\x9bZ\xefSb\x90\x95:\xe8\x1c\xe6\x0e\x84\x1f\xf9V\xf3f\xac\x12?\xa6\x9d\xb3\xc7\x9f!\xb0"
+
+    # The public key used for verifying coinjoin requests on testnet and in debug mode.
+    # secp256k1 public key of m/0h for "all all ... all" seed.
+    COINJOIN_REQ_PUBKEY_TEST = b"\x03\x0f\xdf^(\x9bZ\xefSb\x90\x95:\xe8\x1c\xe6\x0e\x84\x1f\xf9V\xf3f\xac\x12?\xa6\x9d\xb3\xc7\x9f!\xb0"
 
     def __init__(
         self,
@@ -361,14 +375,14 @@ class CoinJoinApprover(Approver):
         super().__init__(tx, coin)
 
         if not tx.coinjoin_request:
-            raise DataError("Missing CoinJoin request.")
+            raise DataError("Missing coinjoin request.")
 
         self.request = tx.coinjoin_request
         self.authorization = authorization
         self.coordination_fee_base = 0
 
-        # Begin hashing the CoinJoin request.
-        self.h_request = HashWriter(sha256(b"CJR1"))  # "CJR1" = CoinJoin Request v1.
+        # Begin hashing the coinjoin request.
+        self.h_request = HashWriter(sha256(b"CJR1"))  # "CJR1" = Coinjoin Request v1.
         writers.write_bytes_prefixed(
             self.h_request, authorization.params.coordinator.encode()
         )
@@ -388,7 +402,7 @@ class CoinJoinApprover(Approver):
 
     async def add_internal_input(self, txi: TxInput, node: bip32.HDNode) -> None:
         self.our_weight.add_input(txi)
-        if not self.authorization.check_sign_tx_input(txi, self.coin):
+        if not self.authorization.check_internal_input(txi):
             raise ProcessError("Unauthorized path")
 
         # Compute the masking bit for the signable bit in coinjoin flags.
@@ -420,20 +434,20 @@ class CoinJoinApprover(Approver):
         # The main reason for this is that we are not comfortable with using the same private key
         # in multiple signatures schemes (ECDSA and Schnorr) and we want to be sure that the user
         # went through a warning screen before we sign the input.
-        if not self.authorization.check_sign_tx_input(txi, self.coin):
+        if not self.authorization.check_internal_input(txi):
             raise ProcessError("Unauthorized path")
 
     def add_external_input(self, txi: TxInput) -> None:
         super().add_external_input(txi)
 
-        # External inputs should always be verifiable in CoinJoin. This check
+        # External inputs should always be verifiable in coinjoin. This check
         # is not critical for security, we are just being cautious, because
-        # CoinJoin is automated and this is not a very legitimate use-case.
+        # coinjoin is automated and this is not a very legitimate use-case.
         if input_is_external_unverified(txi):
             raise ProcessError("Unverifiable external input.")
 
-    def add_change_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
-        super().add_change_output(txo, script_pubkey)
+    async def add_change_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
+        await super().add_change_output(txo, script_pubkey)
         self.our_weight.add_output(script_pubkey)
 
     async def approve_orig_txids(
@@ -445,7 +459,7 @@ class CoinJoinApprover(Approver):
         if not isinstance(tx_info.sig_hasher, BitcoinSigHasher):
             raise ProcessError("Unexpected signature hasher.")
 
-        # Finish hashing the CoinJoin request.
+        # Finish hashing the coinjoin request.
         writers.write_bytes_fixed(
             self.h_request, tx_info.sig_hasher.h_prevouts.get_digest(), 32
         )
@@ -453,10 +467,10 @@ class CoinJoinApprover(Approver):
             self.h_request, tx_info.sig_hasher.h_outputs.get_digest(), 32
         )
 
-        # Verify the CoinJoin request signature.
-        if __debug__:
+        # Verify the coinjoin request signature.
+        if __debug__ or self.coin.slip44 == SLIP44_TESTNET:
             if secp256k1.verify(
-                self.COINJOIN_REQ_PUBKEY_DEBUG,
+                self.COINJOIN_REQ_PUBKEY_TEST,
                 self.request.signature,
                 self.h_request.get_digest(),
             ):
@@ -474,7 +488,7 @@ class CoinJoinApprover(Approver):
         await super().approve_tx(tx_info, orig_txs)
 
         if not self._verify_coinjoin_request(tx_info):
-            raise DataError("Invalid signature in CoinJoin request.")
+            raise DataError("Invalid signature in coinjoin request.")
 
         # The mining fee of the transaction as a whole.
         mining_fee = self.total_in - self.total_out
@@ -506,7 +520,7 @@ class CoinJoinApprover(Approver):
             self.weight.get_weight() - self.weight.get_base_weight()
         )
 
-        # Calculate the minimum registrable output amount in a CoinJoin plus the mining fee that it
+        # Calculate the minimum registrable output amount in a coinjoin plus the mining fee that it
         # would cost to register. Amounts below this value are left to the coordinator or miners
         # and effectively constitute an extra fee for the user.
         min_allowed_output_amount_plus_fee = (
@@ -522,10 +536,13 @@ class CoinJoinApprover(Approver):
             raise ProcessError("Total fee over threshold.")
 
         if not self.authorization.approve_sign_tx(tx_info.tx):
-            raise ProcessError("Exceeded number of CoinJoin rounds.")
+            raise ProcessError("Exceeded number of coinjoin rounds.")
 
-    def _add_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
-        super()._add_output(txo, script_pubkey)
+    async def _add_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
+        await super()._add_output(txo, script_pubkey)
+
+        if txo.address_n and not self.authorization.check_internal_output(txo):
+            raise ProcessError("Unauthorized path")
 
         if txo.payment_req_index:
             raise DataError("Unexpected payment request.")
diff --git a/core/src/apps/bitcoin/sign_tx/bitcoin.py b/core/src/apps/bitcoin/sign_tx/bitcoin.py
index 36b4e862de..e4f80c5af4 100644
--- a/core/src/apps/bitcoin/sign_tx/bitcoin.py
+++ b/core/src/apps/bitcoin/sign_tx/bitcoin.py
@@ -515,7 +515,7 @@ class Bitcoin:
 
         if self.tx_info.output_is_change(txo):
             # Output is change and does not need approval.
-            approver.add_change_output(txo, script_pubkey)
+            await approver.add_change_output(txo, script_pubkey)
         else:
             await approver.add_external_output(txo, script_pubkey, orig_txo)
 
diff --git a/core/src/apps/bitcoin/sign_tx/decred.py b/core/src/apps/bitcoin/sign_tx/decred.py
index 8054d6ce83..fd39159038 100644
--- a/core/src/apps/bitcoin/sign_tx/decred.py
+++ b/core/src/apps/bitcoin/sign_tx/decred.py
@@ -368,7 +368,7 @@ class Decred(Bitcoin):
         if txo.amount != approver.total_in:
             raise DataError("Wrong sstxcommitment amount.")
         script_pubkey = self.process_sstx_commitment_owned(txo)
-        approver.add_change_output(txo, script_pubkey)
+        await approver.add_change_output(txo, script_pubkey)
         tx_info.add_output(txo, script_pubkey)
         if self.serialize:
             self.write_tx_output(self.serialized_tx, txo, script_pubkey)
@@ -386,7 +386,8 @@ class Decred(Bitcoin):
             raise DataError("Only value of 0 allowed for sstx change.")
         if script_pubkey != OUTPUT_SCRIPT_NULL_SSTXCHANGE:
             raise DataError("Only zeroed addresses accepted for sstx change.")
-        approver.add_change_output(txo, script_pubkey)
+        # nothing to approve, just add to tx_weight
+        await approver._add_output(txo, script_pubkey)
         tx_info.add_output(txo, script_pubkey)
         if self.serialize:
             self.write_tx_output(self.serialized_tx, txo, script_pubkey)
diff --git a/core/src/apps/bitcoin/sign_tx/layout.py b/core/src/apps/bitcoin/sign_tx/layout.py
index 39ae255aa8..67d19d0eb1 100644
--- a/core/src/apps/bitcoin/sign_tx/layout.py
+++ b/core/src/apps/bitcoin/sign_tx/layout.py
@@ -261,15 +261,15 @@ async def confirm_nondefault_locktime(
 
     if lock_time_disabled:
         title = "Warning"
-        text = "Locktime is set but will\nhave no effect.\n"
+        text = "Locktime is set but will have no effect."
         param: str | None = None
     elif lock_time < _LOCKTIME_TIMESTAMP_MIN_VALUE:
         title = "Confirm locktime"
-        text = "Locktime for this\ntransaction is set to\nblockheight:\n{}"
+        text = "Locktime for this transaction is set to blockheight:\n{}"
         param = str(lock_time)
     else:
         title = "Confirm locktime"
-        text = "Locktime for this\ntransaction is set to:\n{}"
+        text = "Locktime for this transaction is set to:\n{}"
         param = format_timestamp(lock_time)
 
     await confirm_metadata(
diff --git a/core/src/apps/bitcoin/sign_tx/matchcheck.py b/core/src/apps/bitcoin/sign_tx/matchcheck.py
index d0b6ebf60c..8e97dc553e 100644
--- a/core/src/apps/bitcoin/sign_tx/matchcheck.py
+++ b/core/src/apps/bitcoin/sign_tx/matchcheck.py
@@ -43,8 +43,7 @@ class MatchChecker(Generic[T]):
 
     def attribute_from_tx(self, txio: TxInput | TxOutput) -> T:
         # Return the attribute from the txio, which is to be used for matching.
-        # If the txio is invalid for matching, then return an object which
-        # evaluates as a boolean False.
+        # If the txio is invalid for matching, then return None.
         raise NotImplementedError
 
     def add_input(self, txi: TxInput) -> None:
@@ -56,7 +55,7 @@ class MatchChecker(Generic[T]):
             return  # There was a mismatch in previous inputs.
 
         added_attribute = self.attribute_from_tx(txi)
-        if not added_attribute:
+        if added_attribute is None:
             self.attribute = self.MISMATCH  # The added input is invalid for matching.
         elif self.attribute is self.UNDEFINED:
             self.attribute = added_attribute  # This is the first input.
@@ -87,7 +86,7 @@ class WalletPathChecker(MatchChecker):
     def attribute_from_tx(self, txio: TxInput | TxOutput) -> Any:
         from ..common import BIP32_WALLET_DEPTH
 
-        if len(txio.address_n) < BIP32_WALLET_DEPTH:
+        if len(txio.address_n) <= BIP32_WALLET_DEPTH:
             return None
         return txio.address_n[:-BIP32_WALLET_DEPTH]
 
@@ -99,3 +98,24 @@ class MultisigFingerprintChecker(MatchChecker):
         if not txio.multisig:
             return None
         return multisig.multisig_fingerprint(txio.multisig)
+
+
+class ScriptTypeChecker(MatchChecker):
+    def attribute_from_tx(self, txio: TxInput | TxOutput) -> Any:
+        from trezor.enums import InputScriptType
+        from trezor.messages import TxOutput
+        from ..common import CHANGE_OUTPUT_TO_INPUT_SCRIPT_TYPES
+
+        if TxOutput.is_type_of(txio):
+            script_type = CHANGE_OUTPUT_TO_INPUT_SCRIPT_TYPES[txio.script_type]
+        else:
+            script_type = txio.script_type
+
+        # SPENDMULTISIG is used only for non-SegWit and is effectively the same as SPENDADDRESS.
+        # For SegWit inputs and outputs multisig is indicated by the presence of the multisig
+        # structure. For both SegWit and non-SegWit we can rely on MultisigFingerprintChecker to
+        # check the multisig structure.
+        if script_type == InputScriptType.SPENDMULTISIG:
+            script_type = InputScriptType.SPENDADDRESS
+
+        return script_type
diff --git a/core/src/apps/bitcoin/sign_tx/progress.py b/core/src/apps/bitcoin/sign_tx/progress.py
index 31c14b5dc8..b641df8505 100644
--- a/core/src/apps/bitcoin/sign_tx/progress.py
+++ b/core/src/apps/bitcoin/sign_tx/progress.py
@@ -1,7 +1,5 @@
 from typing import TYPE_CHECKING
 
-from trezor import ui
-
 if TYPE_CHECKING:
     from trezor.messages import SignTx
     from apps.common.coininfo import CoinInfo
@@ -111,13 +109,13 @@ class Progress:
 
     def report_init(self) -> None:
         from trezor import workflow
+        from trezor.ui.layouts import bitcoin_progress
 
         workflow.close_others()
-        ui.display.clear()
         if self.signing:
-            ui.header("Signing transaction")
+            self.progress_layout = bitcoin_progress("Signing transaction")
         else:
-            ui.header("Loading transaction")
+            self.progress_layout = bitcoin_progress("Loading transaction")
 
     def report(self) -> None:
         from trezor import utils
@@ -125,7 +123,7 @@ class Progress:
         if utils.DISABLE_ANIMATION:
             return
         p = int(1000 * self.progress / self.steps)
-        ui.display.loader(p, False, 18, ui.WHITE, ui.BG)
+        self.progress_layout.report(p)
 
     if __debug__:
 
diff --git a/core/src/apps/bitcoin/sign_tx/tx_info.py b/core/src/apps/bitcoin/sign_tx/tx_info.py
index 65cf2cd3e2..7176654c20 100644
--- a/core/src/apps/bitcoin/sign_tx/tx_info.py
+++ b/core/src/apps/bitcoin/sign_tx/tx_info.py
@@ -58,7 +58,11 @@ class TxInfoBase:
     def __init__(self, signer: Signer, tx: SignTx | PrevTx) -> None:
         from trezor.crypto.hashlib import sha256
         from trezor.utils import HashWriter
-        from .matchcheck import MultisigFingerprintChecker, WalletPathChecker
+        from .matchcheck import (
+            MultisigFingerprintChecker,
+            WalletPathChecker,
+            ScriptTypeChecker,
+        )
 
         # Checksum of multisig inputs, used to validate change-output.
         self.multisig_fingerprint = MultisigFingerprintChecker()
@@ -66,6 +70,9 @@ class TxInfoBase:
         # Common prefix of input paths, used to validate change-output.
         self.wallet_path = WalletPathChecker()
 
+        # Common script type, used to validate change-output.
+        self.script_type = ScriptTypeChecker()
+
         # h_tx_check is used to make sure that the inputs and outputs streamed in
         # different steps are the same every time, e.g. the ones streamed for approval
         # in Steps 1 and 2 and the ones streamed for signing legacy inputs in Step 4.
@@ -90,6 +97,7 @@ class TxInfoBase:
 
         if not common.input_is_external(txi):
             self.wallet_path.add_input(txi)
+            self.script_type.add_input(txi)
             self.multisig_fingerprint.add_input(txi)
 
     def add_output(self, txo: TxOutput, script_pubkey: bytes) -> None:
@@ -98,15 +106,25 @@ class TxInfoBase:
 
     def check_input(self, txi: TxInput) -> None:
         self.wallet_path.check_input(txi)
+        self.script_type.check_input(txi)
         self.multisig_fingerprint.check_input(txi)
 
     def output_is_change(self, txo: TxOutput) -> bool:
         if txo.script_type not in common.CHANGE_OUTPUT_SCRIPT_TYPES:
             return False
+
+        # Check the multisig fingerprint only for multisig outputs. This means
+        # that a transfer from a multisig account to a singlesig account is
+        # treated as a change-output as long as all other change-output
+        # conditions are satisfied. This goes a bit against the concept of a
+        # multisig account but the other cosigners will notice that they are
+        # relinquishing control of the funds, so there is no security risk.
         if txo.multisig and not self.multisig_fingerprint.output_matches(txo):
             return False
+
         return (
             self.wallet_path.output_matches(txo)
+            and self.script_type.output_matches(txo)
             and len(txo.address_n) >= common.BIP32_WALLET_DEPTH
             and txo.address_n[-2] <= _BIP32_CHANGE_CHAIN
             and txo.address_n[-1] <= _BIP32_MAX_LAST_ELEMENT
diff --git a/core/src/apps/cardano/auxiliary_data.py b/core/src/apps/cardano/auxiliary_data.py
index 1d71cfcba3..ea63eae7ae 100644
--- a/core/src/apps/cardano/auxiliary_data.py
+++ b/core/src/apps/cardano/auxiliary_data.py
@@ -14,10 +14,6 @@ if TYPE_CHECKING:
     Delegations = list[tuple[bytes, int]]
     GovernanceRegistrationPayload = dict[int, Delegations | bytes | int]
     SignedGovernanceRegistrationPayload = tuple[GovernanceRegistrationPayload, bytes]
-    GovernanceRegistrationSignature = dict[int, bytes]
-    GovernanceRegistration = dict[
-        int, GovernanceRegistrationPayload | GovernanceRegistrationSignature
-    ]
 
     from trezor import messages
     from trezor.wire import Context
diff --git a/core/src/apps/cardano/helpers/credential.py b/core/src/apps/cardano/helpers/credential.py
index 358dbde61e..991cbc958c 100644
--- a/core/src/apps/cardano/helpers/credential.py
+++ b/core/src/apps/cardano/helpers/credential.py
@@ -31,7 +31,7 @@ class Credential:
     is_no_staking: bool = False
     is_mismatch: bool = False
     is_unusual_path: bool = False
-    is_other_warning: bool = False
+    is_other_warning: bool = False  # TODO: this seems to be unused
 
     def __init__(
         self,
diff --git a/core/src/apps/cardano/helpers/paths.py b/core/src/apps/cardano/helpers/paths.py
index a895c690fe..8185e88a35 100644
--- a/core/src/apps/cardano/helpers/paths.py
+++ b/core/src/apps/cardano/helpers/paths.py
@@ -1,6 +1,6 @@
 from micropython import const
 
-from apps.common.paths import HARDENED, PathSchema
+from apps.common.paths import HARDENED, PathSchema, unharden  # noqa: F401
 
 _SLIP44_ID = const(1815)
 
@@ -28,7 +28,3 @@ CHANGE_OUTPUT_STAKING_PATH_NAME = "Change output staking path"
 CERTIFICATE_PATH_NAME = "Certificate path"
 POOL_OWNER_STAKING_PATH_NAME = "Pool owner staking path"
 WITNESS_PATH_NAME = "Witness path"
-
-
-def unharden(item: int) -> int:
-    return item ^ (item & HARDENED)
diff --git a/core/src/apps/cardano/layout.py b/core/src/apps/cardano/layout.py
index 8fe131679a..5ad4a8541c 100644
--- a/core/src/apps/cardano/layout.py
+++ b/core/src/apps/cardano/layout.py
@@ -232,7 +232,7 @@ async def confirm_sending(
         to,
         format_coin_amount(ada_amount, network_id),
         title,
-        ButtonRequestType.Other,
+        br_code=ButtonRequestType.Other,
     )
 
 
@@ -412,9 +412,9 @@ async def warn_tx_output_contains_tokens(
     ctx: Context, is_collateral_return: bool = False
 ) -> None:
     content = (
-        "The collateral return\noutput contains tokens."
+        "The collateral return output contains tokens."
         if is_collateral_return
-        else "The following\ntransaction output\ncontains tokens."
+        else "The following transaction output contains tokens."
     )
     await confirm_metadata(
         ctx,
diff --git a/core/src/apps/common/mnemonic.py b/core/src/apps/common/mnemonic.py
index 7fcb439a2f..056da8e19d 100644
--- a/core/src/apps/common/mnemonic.py
+++ b/core/src/apps/common/mnemonic.py
@@ -5,6 +5,7 @@ from trezor import utils
 
 if TYPE_CHECKING:
     from trezor.enums import BackupType
+    from trezor.ui.layouts.common import ProgressLayout
 
 
 def get() -> tuple[bytes | None, BackupType]:
@@ -84,24 +85,34 @@ if not utils.BITCOIN_ONLY:
 
         from trezor.crypto import cardano
 
-        return cardano.derive_icarus(
+        seed = cardano.derive_icarus(
             mnemonic_secret.decode(), passphrase, trezor_derivation, render_func
         )
+        _finish_progress()
+        return seed
+
+
+_progress_obj: ProgressLayout | None = None
 
 
 def _start_progress() -> None:
     from trezor import workflow
-    from trezor.ui.layouts import draw_simple_text
+    from trezor.ui.layouts import progress
+
+    global _progress_obj
 
     # Because we are drawing to the screen manually, without a layout, we
     # should make sure that no other layout is running.
     workflow.close_others()
-    draw_simple_text("Please wait")
+    _progress_obj = progress()
 
 
 def _render_progress(progress: int, total: int) -> None:
-    from trezor import ui
+    global _progress_obj
+    if _progress_obj is not None:
+        _progress_obj.report(1000 * progress // total)
 
-    p = 1000 * progress // total
-    ui.display.loader(p, False, 18, ui.WHITE, ui.BG)
-    ui.refresh()
+
+def _finish_progress() -> None:
+    global _progress_obj
+    _progress_obj = None
diff --git a/core/src/apps/common/passphrase.py b/core/src/apps/common/passphrase.py
index 44f53fe457..f78618f8b7 100644
--- a/core/src/apps/common/passphrase.py
+++ b/core/src/apps/common/passphrase.py
@@ -35,12 +35,9 @@ async def get(ctx: Context) -> str:
 
 async def _request_on_host(ctx: Context) -> str:
     from trezor.messages import PassphraseAck, PassphraseRequest
-    from trezor.ui.layouts import draw_simple_text
+    from trezor.ui.layouts import request_passphrase_on_host
 
-    # _entry_dialog
-    draw_simple_text(
-        "Passphrase entry", "Please type your\npassphrase on the\nconnected host."
-    )
+    request_passphrase_on_host()
 
     request = PassphraseRequest()
     ack = await ctx.call(request, PassphraseAck)
@@ -62,19 +59,29 @@ async def _request_on_host(ctx: Context) -> str:
     if passphrase:
         from trezor.ui.layouts import confirm_action, confirm_blob
 
-        await confirm_action(
-            ctx,
-            "passphrase_host1",
-            "Hidden wallet",
-            description="Access hidden wallet?\n\nNext screen will show\nthe passphrase!",
-        )
+        # We want to hide the passphrase, or show it, according to settings.
+        if storage_device.get_hide_passphrase_from_host():
+            explanation = "Passphrase provided by host will be used but will not be displayed due to the device settings."
+            await confirm_action(
+                ctx,
+                "passphrase_host1_hidden",
+                "Hidden wallet",
+                description=f"Access hidden wallet?\n\n{explanation}",
+            )
+        else:
+            await confirm_action(
+                ctx,
+                "passphrase_host1",
+                "Hidden wallet",
+                description="Access hidden wallet?\n\nNext screen will show the passphrase!",
+            )
 
-        await confirm_blob(
-            ctx,
-            "passphrase_host2",
-            "Hidden wallet",
-            passphrase,
-            "Use this passphrase?\n",
-        )
+            await confirm_blob(
+                ctx,
+                "passphrase_host2",
+                "Hidden wallet",
+                passphrase,
+                "Use this passphrase?\n",
+            )
 
     return passphrase
diff --git a/core/src/apps/common/paths.py b/core/src/apps/common/paths.py
index 9ba0644929..151e97cad3 100644
--- a/core/src/apps/common/paths.py
+++ b/core/src/apps/common/paths.py
@@ -290,9 +290,6 @@ class PathSchema:
             components = ["m"]
             append = components.append  # local_cache_attribute
 
-            def unharden(item: int) -> int:
-                return item ^ (item & HARDENED)
-
             for component in self.schema:
                 if isinstance(component, Interval):
                     a, b = component.min, component.max
@@ -341,6 +338,8 @@ PATTERN_SEP5 = "m/44'/coin_type'/account'"
 # https://github.com/trezor/trezor-firmware/issues/1749
 PATTERN_SEP5_LEDGER_LIVE_LEGACY = "m/44'/coin_type'/0'/account"
 
+PATTERN_CASA = "m/45'/coin_type/account/change/address_index"
+
 
 async def validate_path(
     ctx: wire.Context,
@@ -378,3 +377,7 @@ def address_n_to_str(address_n: Iterable[int]) -> str:
         return "m"
 
     return "m/" + "/".join(_path_item(i) for i in address_n)
+
+
+def unharden(item: int) -> int:
+    return item ^ (item & HARDENED)
diff --git a/core/src/apps/common/request_pin.py b/core/src/apps/common/request_pin.py
index 9de70477c5..fb9c428aaf 100644
--- a/core/src/apps/common/request_pin.py
+++ b/core/src/apps/common/request_pin.py
@@ -20,7 +20,7 @@ def can_lock_device() -> bool:
 
 async def request_pin(
     ctx: GenericContext,
-    prompt: str = "Enter your PIN",
+    prompt: str,
     attempts_remaining: int | None = None,
     allow_cancel: bool = True,
 ) -> str:
@@ -43,12 +43,12 @@ async def _pin_mismatch() -> None:
 
     await show_popup(
         "PIN mismatch",
-        "The PINs you entered\ndo not match.\n\nPlease try again.",
+        "The PINs you entered do not match.\n\nPlease try again.",
     )
 
 
 async def request_pin_and_sd_salt(
-    ctx: Context, prompt: str = "Enter your PIN", allow_cancel: bool = True
+    ctx: Context, prompt: str, allow_cancel: bool = True
 ) -> tuple[str, bytearray | None]:
     if config.has_pin():
         pin = await request_pin(ctx, prompt, config.get_pin_rem(), allow_cancel)
@@ -68,7 +68,7 @@ def _set_last_unlock_time() -> None:
 
 async def verify_user_pin(
     ctx: GenericContext = wire.DUMMY_CONTEXT,
-    prompt: str = "Enter your PIN",
+    prompt: str = "Enter PIN",
     allow_cancel: bool = True,
     retry: bool = True,
     cache_time_ms: int = 0,
@@ -110,7 +110,7 @@ async def verify_user_pin(
 
     while retry:
         pin = await request_pin_on_device(  # type: ignore ["request_pin_on_device" is possibly unbound]
-            ctx, "Wrong PIN, enter again", config.get_pin_rem(), allow_cancel
+            ctx, "Enter PIN", config.get_pin_rem(), allow_cancel, wrong_pin=True
         )
         if config.unlock(pin, salt):
             _set_last_unlock_time()
@@ -138,7 +138,7 @@ async def error_pin_matches_wipe_code(ctx: Context) -> NoReturn:
     await show_error_and_raise(
         ctx,
         "warning_invalid_new_pin",
-        "The new PIN must be different from your\nwipe code.",
+        "The new PIN must be different from your wipe code.",
         "Invalid PIN",  # header
         exc=wire.PinInvalid,
     )
diff --git a/core/src/apps/common/sdcard.py b/core/src/apps/common/sdcard.py
index 1f0a214d76..d9fd412526 100644
--- a/core/src/apps/common/sdcard.py
+++ b/core/src/apps/common/sdcard.py
@@ -23,7 +23,7 @@ async def _confirm_retry_wrong_card(ctx: wire.GenericContext) -> None:
         await show_error_and_raise(
             ctx,
             "warning_wrong_sd",
-            "Please unplug the\ndevice and insert the correct SD card.",
+            "Please unplug the device and insert the correct SD card.",
             "Wrong SD card.",
             exc=SdCardUnavailable("Wrong SD card."),
         )
@@ -45,7 +45,7 @@ async def _confirm_retry_insert_card(ctx: wire.GenericContext) -> None:
         await show_error_and_raise(
             ctx,
             "warning_no_sd",
-            "Please unplug the\ndevice and insert your SD card.",
+            "Please unplug the device and insert your SD card.",
             "SD card required.",
             exc=SdCardUnavailable("SD card required."),
         )
diff --git a/core/src/apps/debug/load_device.py b/core/src/apps/debug/load_device.py
index d21440994b..79471a0273 100644
--- a/core/src/apps/debug/load_device.py
+++ b/core/src/apps/debug/load_device.py
@@ -41,8 +41,8 @@ async def load_device(ctx: Context, msg: LoadDevice) -> Success:
         ctx,
         "warn_loading_seed",
         "Loading seed",
-        "Loading private seed\nis not recommended.",
-        "Continue only if you\nknow what you are doing!",
+        "Loading private seed is not recommended.",
+        "Continue only if you know what you are doing!",
     )
     # END _warn
 
diff --git a/core/src/apps/eos/actions/__init__.py b/core/src/apps/eos/actions/__init__.py
index 24afff5c2e..d64c20ecd2 100644
--- a/core/src/apps/eos/actions/__init__.py
+++ b/core/src/apps/eos/actions/__init__.py
@@ -7,7 +7,7 @@ if TYPE_CHECKING:
 
 
 async def process_action(
-    ctx: wire.Context, sha: HashWriter, action: EosTxActionAck
+    ctx: wire.Context, sha: HashWriter, action: EosTxActionAck, is_last: bool
 ) -> None:
     from .. import helpers, writers
     from . import layout
@@ -18,6 +18,10 @@ async def process_action(
     if not _check_action(action, name, account):
         raise ValueError("Invalid action")
 
+    # Little cheat, not having to create "is_last" argument for every action layout
+    # (not worth spending so many bytes in flash on this)
+    layout.is_last = is_last
+
     w = bytearray()
     if account == "eosio":
         if name == "buyram":
diff --git a/core/src/apps/eos/actions/layout.py b/core/src/apps/eos/actions/layout.py
index 65f8cd407a..740ddc3e19 100644
--- a/core/src/apps/eos/actions/layout.py
+++ b/core/src/apps/eos/actions/layout.py
@@ -28,6 +28,10 @@ if TYPE_CHECKING:
     from trezor.ui.layouts import PropertyType
 
 
+# Whether action is last - and should be HoldToConfirm
+is_last = False
+
+
 # Because icon and br_code are almost always the same
 # (and also calling with positional arguments takes less space)
 async def _confirm_properties(
@@ -41,6 +45,7 @@ async def _confirm_properties(
         br_type,
         title,
         props,
+        hold=is_last,
         br_code=ButtonRequestType.ConfirmOutput,
     )
 
@@ -265,6 +270,7 @@ async def confirm_action_unknown(
             ("Action Name:", eos_name_to_string(action.name)),
             ("Checksum:", checksum),
         ),
+        hold=is_last,
         br_code=ButtonRequestType.ConfirmOutput,
     )
 
diff --git a/core/src/apps/eos/sign_tx.py b/core/src/apps/eos/sign_tx.py
index c8ec557d54..3718a5b8d3 100644
--- a/core/src/apps/eos/sign_tx.py
+++ b/core/src/apps/eos/sign_tx.py
@@ -39,9 +39,10 @@ async def sign_tx(ctx: Context, msg: EosSignTx, keychain: Keychain) -> EosSigned
     await require_sign_tx(ctx, num_actions)
 
     # actions
-    for _ in range(num_actions):
+    for index in range(num_actions):
         action = await ctx.call(EosTxActionRequest(), EosTxActionAck)
-        await process_action(ctx, sha, action)
+        is_last = index == num_actions - 1
+        await process_action(ctx, sha, action, is_last)
 
     write_uvarint(sha, 0)
     write_bytes_fixed(sha, bytearray(32), 32)
diff --git a/core/src/apps/ethereum/keychain.py b/core/src/apps/ethereum/keychain.py
index 8243b2942d..ae0892c2d7 100644
--- a/core/src/apps/ethereum/keychain.py
+++ b/core/src/apps/ethereum/keychain.py
@@ -44,16 +44,19 @@ PATTERNS_ADDRESS = (
     paths.PATTERN_BIP44,
     paths.PATTERN_SEP5,
     paths.PATTERN_SEP5_LEDGER_LIVE_LEGACY,
+    paths.PATTERN_CASA,
 )
 
 
 def _schemas_from_address_n(
     patterns: Iterable[str], address_n: paths.Bip32Path
 ) -> Iterable[paths.PathSchema]:
-    if len(address_n) < 2:
-        return ()
+    # Casa paths (purpose of 45) do not have hardened coin types
+    if address_n[0] == 45 | paths.HARDENED and not address_n[1] & paths.HARDENED:
+        slip44_hardened = address_n[1] | paths.HARDENED
+    else:
+        slip44_hardened = address_n[1]
 
-    slip44_hardened = address_n[1]
     if slip44_hardened not in networks.all_slip44_ids_hardened():
         return ()
 
diff --git a/core/src/apps/ethereum/layout.py b/core/src/apps/ethereum/layout.py
index 72513517f9..615d2dd906 100644
--- a/core/src/apps/ethereum/layout.py
+++ b/core/src/apps/ethereum/layout.py
@@ -114,6 +114,19 @@ def require_confirm_unknown_token(
     )
 
 
+def require_confirm_address(ctx: Context, address_bytes: bytes) -> Awaitable[None]:
+    from ubinascii import hexlify
+    from trezor.ui.layouts import confirm_address
+
+    address_hex = "0x" + hexlify(address_bytes).decode()
+    return confirm_address(
+        ctx,
+        "Signing address",
+        address_hex,
+        br_code=ButtonRequestType.SignTx,
+    )
+
+
 def require_confirm_data(ctx: Context, data: bytes, data_total: int) -> Awaitable[None]:
     return confirm_blob(
         ctx,
diff --git a/core/src/apps/ethereum/networks.py b/core/src/apps/ethereum/networks.py
index 26730b04b5..81c3e76f66 100644
--- a/core/src/apps/ethereum/networks.py
+++ b/core/src/apps/ethereum/networks.py
@@ -93,22 +93,22 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
     yield (
         3,  # chain_id
         1,  # slip44
-        "tROP",  # shortcut
+        "tETH",  # shortcut
         "Ropsten",  # name
         False,  # rskip60
     )
     yield (
         4,  # chain_id
         1,  # slip44
-        "tRIN",  # shortcut
+        "tETH",  # shortcut
         "Rinkeby",  # name
         False,  # rskip60
     )
     yield (
         5,  # chain_id
         1,  # slip44
-        "tGOR",  # shortcut
-        "Görli",  # name
+        "tETH",  # shortcut
+        "Goerli",  # name
         False,  # rskip60
     )
     yield (
@@ -212,8 +212,8 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
     yield (
         24,  # chain_id
         60,  # slip44
-        "DTH",  # shortcut
-        "Dithereum",  # name
+        "KAI",  # shortcut
+        "KardiaChain",  # name
         False,  # rskip60
     )
     yield (
@@ -272,6 +272,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Dxchain",  # name
         False,  # rskip60
     )
+    yield (
+        37,  # chain_id
+        60,  # slip44
+        "SEED",  # shortcut
+        "SeedCoin-Network",  # name
+        False,  # rskip60
+    )
     yield (
         38,  # chain_id
         538,  # slip44
@@ -289,7 +296,7 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
     yield (
         42,  # chain_id
         1,  # slip44
-        "tKOV",  # shortcut
+        "tETH",  # shortcut
         "Kovan",  # name
         False,  # rskip60
     )
@@ -307,18 +314,25 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Darwinia Network",  # name
         False,  # rskip60
     )
+    yield (
+        48,  # chain_id
+        60,  # slip44
+        "ETMP",  # shortcut
+        "Ennothem",  # name
+        False,  # rskip60
+    )
     yield (
         50,  # chain_id
         60,  # slip44
         "XDC",  # shortcut
-        "XinFin Network",  # name
+        "XinFin XDC Network",  # name
         False,  # rskip60
     )
     yield (
         51,  # chain_id
-        1,  # slip44
+        60,  # slip44
         "TXDC",  # shortcut
-        "XinFin Apothem Testnet",  # name
+        "XDC Apothem Network",  # name
         False,  # rskip60
     )
     yield (
@@ -405,13 +419,6 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "SoterOne",  # name
         False,  # rskip60
     )
-    yield (
-        69,  # chain_id
-        1,  # slip44
-        "tKOR",  # shortcut
-        "Optimism Kovan",  # name
-        False,  # rskip60
-    )
     yield (
         70,  # chain_id
         1170,  # slip44
@@ -419,6 +426,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Hoo Smart Chain",  # name
         False,  # rskip60
     )
+    yield (
+        73,  # chain_id
+        60,  # slip44
+        "FNCY",  # shortcut
+        "FNCY",  # name
+        False,  # rskip60
+    )
     yield (
         74,  # chain_id
         60,  # slip44
@@ -426,6 +440,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "IDChain",  # name
         False,  # rskip60
     )
+    yield (
+        75,  # chain_id
+        60,  # slip44
+        "DEL",  # shortcut
+        "Decimal Smart Chain",  # name
+        False,  # rskip60
+    )
     yield (
         76,  # chain_id
         76,  # slip44
@@ -468,13 +489,6 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Meter",  # name
         False,  # rskip60
     )
-    yield (
-        86,  # chain_id
-        60,  # slip44
-        "GT",  # shortcut
-        "GateChain",  # name
-        False,  # rskip60
-    )
     yield (
         87,  # chain_id
         60,  # slip44
@@ -499,8 +513,8 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
     yield (
         96,  # chain_id
         60,  # slip44
-        "NEXT",  # shortcut
-        "NEXT Smart Chain",  # name
+        "KUB",  # shortcut
+        "Bitkub Chain",  # name
         False,  # rskip60
     )
     yield (
@@ -521,7 +535,7 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         100,  # chain_id
         700,  # slip44
         "xDAI",  # shortcut
-        "Gnosis Chain",  # name
+        "Gnosis",  # name
         False,  # rskip60
     )
     yield (
@@ -559,6 +573,27 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "EtherLite Chain",  # name
         False,  # rskip60
     )
+    yield (
+        113,  # chain_id
+        714,  # slip44
+        "Deh",  # shortcut
+        "Dehvo",  # name
+        False,  # rskip60
+    )
+    yield (
+        119,  # chain_id
+        60,  # slip44
+        "NULS",  # shortcut
+        "ENULS",  # name
+        False,  # rskip60
+    )
+    yield (
+        121,  # chain_id
+        714,  # slip44
+        "REAL",  # shortcut
+        "Realchain",  # name
+        False,  # rskip60
+    )
     yield (
         122,  # chain_id
         60,  # slip44
@@ -615,6 +650,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "DAX CHAIN",  # name
         False,  # rskip60
     )
+    yield (
+        160,  # chain_id
+        60,  # slip44
+        "AMAX",  # shortcut
+        "Armonia Eva Chain",  # name
+        False,  # rskip60
+    )
     yield (
         162,  # chain_id
         1,  # slip44
@@ -678,6 +720,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Freight Trust Network",  # name
         False,  # rskip60
     )
+    yield (
+        212,  # chain_id
+        1,  # slip44
+        "tMAP",  # shortcut
+        "MAP Makalu",  # name
+        False,  # rskip60
+    )
     yield (
         222,  # chain_id
         2221,  # slip44
@@ -734,16 +783,37 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "High Performance Blockchain",  # name
         False,  # rskip60
     )
+    yield (
+        295,  # chain_id
+        3030,  # slip44
+        "HBAR",  # shortcut
+        "Hedera",  # name
+        False,  # rskip60
+    )
     yield (
         300,  # chain_id
         60,  # slip44
         "xDAI",  # shortcut
-        "Optimism on Gnosis Chain",  # name
+        "Optimism on Gnosis",  # name
+        False,  # rskip60
+    )
+    yield (
+        311,  # chain_id
+        60,  # slip44
+        "OMAX",  # shortcut
+        "Omax",  # name
+        False,  # rskip60
+    )
+    yield (
+        314,  # chain_id
+        461,  # slip44
+        "FIL",  # shortcut
+        "Filecoin -",  # name
         False,  # rskip60
     )
     yield (
         321,  # chain_id
-        60,  # slip44
+        641,  # slip44
         "KCS",  # shortcut
         "KCC",  # name
         False,  # rskip60
@@ -783,6 +853,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "SX Network",  # name
         False,  # rskip60
     )
+    yield (
+        427,  # chain_id
+        60,  # slip44
+        "ZTH",  # shortcut
+        "Zeeth Chain",  # name
+        False,  # rskip60
+    )
     yield (
         499,  # chain_id
         499,  # slip44
@@ -790,6 +867,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Rupaya",  # name
         False,  # rskip60
     )
+    yield (
+        500,  # chain_id
+        60,  # slip44
+        "CAM",  # shortcut
+        "Camino C-Chain",  # name
+        False,  # rskip60
+    )
     yield (
         512,  # chain_id
         1512,  # slip44
@@ -797,6 +881,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Double-A Chain",  # name
         False,  # rskip60
     )
+    yield (
+        516,  # chain_id
+        516,  # slip44
+        "GZN",  # shortcut
+        "Gear Zero Network",  # name
+        False,  # rskip60
+    )
     yield (
         520,  # chain_id
         60,  # slip44
@@ -804,6 +895,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "XT Smart Chain",  # name
         False,  # rskip60
     )
+    yield (
+        529,  # chain_id
+        60,  # slip44
+        "FIRE",  # shortcut
+        "Firechain",  # name
+        False,  # rskip60
+    )
     yield (
         530,  # chain_id
         60,  # slip44
@@ -846,6 +944,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Acala Mandala Testnet",  # name
         False,  # rskip60
     )
+    yield (
+        614,  # chain_id
+        60,  # slip44
+        "GLQ",  # shortcut
+        "Graphlinq Blockchain",  # name
+        False,  # rskip60
+    )
+    yield (
+        648,  # chain_id
+        60,  # slip44
+        "ACE",  # shortcut
+        "Endurance Smart Chain",  # name
+        False,  # rskip60
+    )
     yield (
         686,  # chain_id
         686,  # slip44
@@ -860,6 +972,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "BlockChain Station",  # name
         False,  # rskip60
     )
+    yield (
+        721,  # chain_id
+        60,  # slip44
+        "LYC",  # shortcut
+        "Lycan Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        766,  # chain_id
+        60,  # slip44
+        "QOM",  # shortcut
+        "QL1",  # name
+        False,  # rskip60
+    )
     yield (
         777,  # chain_id
         60,  # slip44
@@ -874,6 +1000,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Acala Network",  # name
         False,  # rskip60
     )
+    yield (
+        800,  # chain_id
+        60,  # slip44
+        "LUCID",  # shortcut
+        "Lucid Blockchain",  # name
+        False,  # rskip60
+    )
     yield (
         803,  # chain_id
         60,  # slip44
@@ -881,6 +1014,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Haic",  # name
         False,  # rskip60
     )
+    yield (
+        813,  # chain_id
+        813,  # slip44
+        "MEER",  # shortcut
+        "Qitmeer",  # name
+        False,  # rskip60
+    )
     yield (
         820,  # chain_id
         820,  # slip44
@@ -892,7 +1032,21 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         821,  # chain_id
         1,  # slip44
         "TCLO",  # shortcut
-        "Callisto Testnet",  # name
+        "Callisto Testnet Deprecated",  # name
+        False,  # rskip60
+    )
+    yield (
+        868,  # chain_id
+        60,  # slip44
+        "FST",  # shortcut
+        "Fantasia Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        877,  # chain_id
+        60,  # slip44
+        "DXT",  # shortcut
+        "Dexit Network",  # name
         False,  # rskip60
     )
     yield (
@@ -916,6 +1070,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Portal Fantasy Chain",  # name
         False,  # rskip60
     )
+    yield (
+        972,  # chain_id
+        60,  # slip44
+        "CCNA",  # shortcut
+        "Oort Ascraeus",  # name
+        False,  # rskip60
+    )
     yield (
         977,  # chain_id
         60,  # slip44
@@ -923,6 +1084,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Nepal Blockchain Network",  # name
         False,  # rskip60
     )
+    yield (
+        985,  # chain_id
+        60,  # slip44
+        "CMEMO",  # shortcut
+        "Memo Smart Chain",  # name
+        False,  # rskip60
+    )
     yield (
         998,  # chain_id
         60,  # slip44
@@ -944,6 +1112,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Klaytn Testnet Baobab",  # name
         False,  # rskip60
     )
+    yield (
+        1004,  # chain_id
+        1,  # slip44
+        "T-EKTA",  # shortcut
+        "T-EKTA",  # name
+        False,  # rskip60
+    )
     yield (
         1007,  # chain_id
         1,  # slip44
@@ -1000,6 +1175,41 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Metis Andromeda",  # name
         False,  # rskip60
     )
+    yield (
+        1099,  # chain_id
+        314,  # slip44
+        "mc",  # shortcut
+        "MOAC",  # name
+        False,  # rskip60
+    )
+    yield (
+        1111,  # chain_id
+        60,  # slip44
+        "WEMIX",  # shortcut
+        "WEMIX3.0",  # name
+        False,  # rskip60
+    )
+    yield (
+        1116,  # chain_id
+        60,  # slip44
+        "CORE",  # shortcut
+        "Core Blockchain",  # name
+        False,  # rskip60
+    )
+    yield (
+        1117,  # chain_id
+        60,  # slip44
+        "DOGS",  # shortcut
+        "Dogcoin",  # name
+        False,  # rskip60
+    )
+    yield (
+        1130,  # chain_id
+        1130,  # slip44
+        "DFI",  # shortcut
+        "DeFiChain EVM Network",  # name
+        False,  # rskip60
+    )
     yield (
         1139,  # chain_id
         60,  # slip44
@@ -1042,6 +1252,27 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "EnterChain",  # name
         False,  # rskip60
     )
+    yield (
+        1229,  # chain_id
+        60,  # slip44
+        "XZO",  # shortcut
+        "Exzo Network",  # name
+        False,  # rskip60
+    )
+    yield (
+        1231,  # chain_id
+        60,  # slip44
+        "ULX",  # shortcut
+        "Ultron",  # name
+        False,  # rskip60
+    )
+    yield (
+        1234,  # chain_id
+        60,  # slip44
+        "FITFI",  # shortcut
+        "Step Network",  # name
+        False,  # rskip60
+    )
     yield (
         1246,  # chain_id
         60,  # slip44
@@ -1085,10 +1316,17 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         False,  # rskip60
     )
     yield (
-        1297,  # chain_id
+        1311,  # chain_id
         60,  # slip44
-        "BOBA",  # shortcut
-        "Boba Network Bobabase",  # name
+        "DOS",  # shortcut
+        "Dos Fuji Subnet",  # name
+        False,  # rskip60
+    )
+    yield (
+        1314,  # chain_id
+        60,  # slip44
+        "ALYX",  # shortcut
+        "Alyx",  # name
         False,  # rskip60
     )
     yield (
@@ -1098,6 +1336,34 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Aitd",  # name
         False,  # rskip60
     )
+    yield (
+        1339,  # chain_id
+        60,  # slip44
+        "LAVA",  # shortcut
+        "Elysium",  # name
+        False,  # rskip60
+    )
+    yield (
+        1353,  # chain_id
+        60,  # slip44
+        "CIC",  # shortcut
+        "CIC Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        1388,  # chain_id
+        60,  # slip44
+        "SINSO",  # shortcut
+        "AmStar",  # name
+        False,  # rskip60
+    )
+    yield (
+        1455,  # chain_id
+        60,  # slip44
+        "CTEX",  # shortcut
+        "Ctex Scan Blockchain",  # name
+        False,  # rskip60
+    )
     yield (
         1506,  # chain_id
         60,  # slip44
@@ -1105,6 +1371,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Sherpax",  # name
         False,  # rskip60
     )
+    yield (
+        1515,  # chain_id
+        60,  # slip44
+        "BG",  # shortcut
+        "Beagle Messaging Chain",  # name
+        False,  # rskip60
+    )
     yield (
         1618,  # chain_id
         60,  # slip44
@@ -1126,6 +1399,27 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "LUDAN",  # name
         False,  # rskip60
     )
+    yield (
+        1701,  # chain_id
+        60,  # slip44
+        "ANY",  # shortcut
+        "Anytype EVM Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        1707,  # chain_id
+        60,  # slip44
+        "JINDA",  # shortcut
+        "TBSI",  # name
+        False,  # rskip60
+    )
+    yield (
+        1804,  # chain_id
+        1,  # slip44
+        "tCRC",  # shortcut
+        "Kerleano",  # name
+        False,  # rskip60
+    )
     yield (
         1818,  # chain_id
         1818,  # slip44
@@ -1147,6 +1441,34 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "BON Network",  # name
         False,  # rskip60
     )
+    yield (
+        1907,  # chain_id
+        60,  # slip44
+        "BITCI",  # shortcut
+        "Bitcichain",  # name
+        False,  # rskip60
+    )
+    yield (
+        1951,  # chain_id
+        60,  # slip44
+        "DOINX",  # shortcut
+        "D-Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        1971,  # chain_id
+        60,  # slip44
+        "ATLR",  # shortcut
+        "Atelier",  # name
+        False,  # rskip60
+    )
+    yield (
+        1975,  # chain_id
+        60,  # slip44
+        "ONUS",  # shortcut
+        "ONUS Chain",  # name
+        False,  # rskip60
+    )
     yield (
         1987,  # chain_id
         1987,  # slip44
@@ -1154,6 +1476,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "EtherGem",  # name
         False,  # rskip60
     )
+    yield (
+        1994,  # chain_id
+        60,  # slip44
+        "EKTA",  # shortcut
+        "Ekta",  # name
+        False,  # rskip60
+    )
     yield (
         2001,  # chain_id
         60,  # slip44
@@ -1161,6 +1490,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Milkomeda C1",  # name
         False,  # rskip60
     )
+    yield (
+        2002,  # chain_id
+        60,  # slip44
+        "mALGO",  # shortcut
+        "Milkomeda A1",  # name
+        False,  # rskip60
+    )
     yield (
         2009,  # chain_id
         60,  # slip44
@@ -1169,10 +1505,10 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         False,  # rskip60
     )
     yield (
-        2020,  # chain_id
+        2016,  # chain_id
         60,  # slip44
-        "420",  # shortcut
-        "420coin",  # name
+        "NetZ",  # shortcut
+        "MainnetZ",  # name
         False,  # rskip60
     )
     yield (
@@ -1189,6 +1525,27 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Rangers Protocol",  # name
         False,  # rskip60
     )
+    yield (
+        2043,  # chain_id
+        60,  # slip44
+        "OTP",  # shortcut
+        "OriginTrail Parachain",  # name
+        False,  # rskip60
+    )
+    yield (
+        2048,  # chain_id
+        60,  # slip44
+        "STOS",  # shortcut
+        "Stratos",  # name
+        False,  # rskip60
+    )
+    yield (
+        2077,  # chain_id
+        60,  # slip44
+        "QKA",  # shortcut
+        "Quokkacoin",  # name
+        False,  # rskip60
+    )
     yield (
         2100,  # chain_id
         60,  # slip44
@@ -1197,10 +1554,31 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         False,  # rskip60
     )
     yield (
-        2152,  # chain_id
+        2109,  # chain_id
+        2109,  # slip44
+        "SAMA",  # shortcut
+        "Exosama Network",  # name
+        False,  # rskip60
+    )
+    yield (
+        2122,  # chain_id
         60,  # slip44
-        "FRA",  # shortcut
-        "Findora",  # name
+        "METAD",  # shortcut
+        "Metaplayerone",  # name
+        False,  # rskip60
+    )
+    yield (
+        2151,  # chain_id
+        60,  # slip44
+        "BOA",  # shortcut
+        "BOSagora",  # name
+        False,  # rskip60
+    )
+    yield (
+        2203,  # chain_id
+        60,  # slip44
+        "eBTC",  # shortcut
+        "Bitcoin EVM",  # name
         False,  # rskip60
     )
     yield (
@@ -1224,6 +1602,34 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "VChain",  # name
         False,  # rskip60
     )
+    yield (
+        2300,  # chain_id
+        60,  # slip44
+        "BOMB",  # shortcut
+        "BOMB Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        2309,  # chain_id
+        60,  # slip44
+        "ARÉV",  # shortcut
+        "Arevia",  # name
+        False,  # rskip60
+    )
+    yield (
+        2330,  # chain_id
+        60,  # slip44
+        "ALT",  # shortcut
+        "Altcoinchain",  # name
+        False,  # rskip60
+    )
+    yield (
+        2415,  # chain_id
+        60,  # slip44
+        "XODEX",  # shortcut
+        "XODEX",  # name
+        False,  # rskip60
+    )
     yield (
         2559,  # chain_id
         60,  # slip44
@@ -1238,6 +1644,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "TechPay",  # name
         False,  # rskip60
     )
+    yield (
+        2606,  # chain_id
+        60,  # slip44
+        "CRC",  # shortcut
+        "PoCRNet",  # name
+        False,  # rskip60
+    )
+    yield (
+        2611,  # chain_id
+        60,  # slip44
+        "REDLC",  # shortcut
+        "Redlight Chain",  # name
+        False,  # rskip60
+    )
     yield (
         2612,  # chain_id
         60,  # slip44
@@ -1245,6 +1665,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "EZChain C-Chain",  # name
         False,  # rskip60
     )
+    yield (
+        2999,  # chain_id
+        60,  # slip44
+        "BTY",  # shortcut
+        "BitYuan",  # name
+        False,  # rskip60
+    )
     yield (
         3000,  # chain_id
         60,  # slip44
@@ -1259,6 +1686,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "CENNZnet Nikau",  # name
         False,  # rskip60
     )
+    yield (
+        3031,  # chain_id
+        60,  # slip44
+        "ORL",  # shortcut
+        "Orlando Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        3068,  # chain_id
+        60,  # slip44
+        "BFC",  # shortcut
+        "Bifrost",  # name
+        False,  # rskip60
+    )
     yield (
         3400,  # chain_id
         60,  # slip44
@@ -1273,6 +1714,27 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "JFIN Chain",  # name
         False,  # rskip60
     )
+    yield (
+        3601,  # chain_id
+        60,  # slip44
+        "PTX",  # shortcut
+        "PandoProject",  # name
+        False,  # rskip60
+    )
+    yield (
+        3666,  # chain_id
+        60,  # slip44
+        "J",  # shortcut
+        "Metacodechain",  # name
+        False,  # rskip60
+    )
+    yield (
+        3693,  # chain_id
+        60,  # slip44
+        "EMPIRE",  # shortcut
+        "Empire Network",  # name
+        False,  # rskip60
+    )
     yield (
         3737,  # chain_id
         60,  # slip44
@@ -1280,6 +1742,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Crossbell",  # name
         False,  # rskip60
     )
+    yield (
+        3912,  # chain_id
+        60,  # slip44
+        "DRAC",  # shortcut
+        "DRAC Network",  # name
+        False,  # rskip60
+    )
     yield (
         3966,  # chain_id
         60,  # slip44
@@ -1295,10 +1764,17 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         False,  # rskip60
     )
     yield (
-        4181,  # chain_id
+        4099,  # chain_id
         60,  # slip44
-        "Φ",  # shortcut
-        "PHI Network",  # name
+        "$BNI",  # shortcut
+        "Bitindi",  # name
+        False,  # rskip60
+    )
+    yield (
+        4444,  # chain_id
+        60,  # slip44
+        "HTML",  # shortcut
+        "Htmlcoin",  # name
         False,  # rskip60
     )
     yield (
@@ -1315,6 +1791,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Venidium",  # name
         False,  # rskip60
     )
+    yield (
+        4999,  # chain_id
+        60,  # slip44
+        "BXN",  # shortcut
+        "BlackFort Exchange Network",  # name
+        False,  # rskip60
+    )
+    yield (
+        5000,  # chain_id
+        60,  # slip44
+        "BIT",  # shortcut
+        "Mantle",  # name
+        False,  # rskip60
+    )
     yield (
         5177,  # chain_id
         60,  # slip44
@@ -1329,6 +1819,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "EraSwap",  # name
         False,  # rskip60
     )
+    yield (
+        5234,  # chain_id
+        60,  # slip44
+        "HMND",  # shortcut
+        "Humanode",  # name
+        False,  # rskip60
+    )
     yield (
         5315,  # chain_id
         60,  # slip44
@@ -1336,13 +1833,6 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Uzmi Network",  # name
         False,  # rskip60
     )
-    yield (
-        5777,  # chain_id
-        60,  # slip44
-        "DGCC",  # shortcut
-        "Digest Swarm Chain",  # name
-        False,  # rskip60
-    )
     yield (
         5869,  # chain_id
         60,  # slip44
@@ -1357,6 +1847,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Pixie Chain",  # name
         False,  # rskip60
     )
+    yield (
+        6789,  # chain_id
+        60,  # slip44
+        "STAND",  # shortcut
+        "Gold Smart Chain",  # name
+        False,  # rskip60
+    )
     yield (
         6969,  # chain_id
         60,  # slip44
@@ -1364,6 +1861,34 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Tomb Chain",  # name
         False,  # rskip60
     )
+    yield (
+        6999,  # chain_id
+        60,  # slip44
+        "PSC",  # shortcut
+        "PolySmartChain",  # name
+        False,  # rskip60
+    )
+    yield (
+        7000,  # chain_id
+        60,  # slip44
+        "ZETA",  # shortcut
+        "ZetaChain",  # name
+        False,  # rskip60
+    )
+    yield (
+        7070,  # chain_id
+        60,  # slip44
+        "PLQ",  # shortcut
+        "Planq",  # name
+        False,  # rskip60
+    )
+    yield (
+        7700,  # chain_id
+        60,  # slip44
+        "CANTO",  # shortcut
+        "Canto",  # name
+        False,  # rskip60
+    )
     yield (
         8000,  # chain_id
         60,  # slip44
@@ -1371,6 +1896,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Teleport",  # name
         False,  # rskip60
     )
+    yield (
+        8098,  # chain_id
+        60,  # slip44
+        "SmuX",  # shortcut
+        "StreamuX Blockchain",  # name
+        False,  # rskip60
+    )
     yield (
         8217,  # chain_id
         8217,  # slip44
@@ -1378,6 +1910,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Klaytn",  # name
         False,  # rskip60
     )
+    yield (
+        8272,  # chain_id
+        60,  # slip44
+        "BTON",  # shortcut
+        "Blockton Blockchain",  # name
+        False,  # rskip60
+    )
     yield (
         8723,  # chain_id
         479,  # slip44
@@ -1385,6 +1924,48 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "TOOL Global",  # name
         False,  # rskip60
     )
+    yield (
+        8738,  # chain_id
+        60,  # slip44
+        "ALPH",  # shortcut
+        "Alph Network",  # name
+        False,  # rskip60
+    )
+    yield (
+        8768,  # chain_id
+        60,  # slip44
+        "TMY",  # shortcut
+        "TMY Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        8848,  # chain_id
+        60,  # slip44
+        "MARO",  # shortcut
+        "MARO Blockchain",  # name
+        False,  # rskip60
+    )
+    yield (
+        8880,  # chain_id
+        60,  # slip44
+        "UNQ",  # shortcut
+        "Unique",  # name
+        False,  # rskip60
+    )
+    yield (
+        8888,  # chain_id
+        60,  # slip44
+        "XETA",  # shortcut
+        "XANAChain",  # name
+        False,  # rskip60
+    )
+    yield (
+        8889,  # chain_id
+        60,  # slip44
+        "VSC",  # shortcut
+        "Vyvo Smart Chain",  # name
+        False,  # rskip60
+    )
     yield (
         8898,  # chain_id
         60,  # slip44
@@ -1392,6 +1973,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Mammoth",  # name
         False,  # rskip60
     )
+    yield (
+        8899,  # chain_id
+        60,  # slip44
+        "JBC",  # shortcut
+        "JIBCHAIN L1",  # name
+        False,  # rskip60
+    )
+    yield (
+        8989,  # chain_id
+        60,  # slip44
+        "GMMT",  # shortcut
+        "Giant Mammoth",  # name
+        False,  # rskip60
+    )
     yield (
         8995,  # chain_id
         60,  # slip44
@@ -1427,6 +2022,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Blockchain Genesis",  # name
         False,  # rskip60
     )
+    yield (
+        10248,  # chain_id
+        60,  # slip44
+        "0XT",  # shortcut
+        "0XTade",  # name
+        False,  # rskip60
+    )
+    yield (
+        10507,  # chain_id
+        60,  # slip44
+        "NUM",  # shortcut
+        "Numbers",  # name
+        False,  # rskip60
+    )
     yield (
         10823,  # chain_id
         60,  # slip44
@@ -1441,6 +2050,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Quadrans Blockchain",  # name
         False,  # rskip60
     )
+    yield (
+        11110,  # chain_id
+        60,  # slip44
+        "ASA",  # shortcut
+        "Astra",  # name
+        False,  # rskip60
+    )
     yield (
         11111,  # chain_id
         60,  # slip44
@@ -1448,6 +2064,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "WAGMI",  # name
         False,  # rskip60
     )
+    yield (
+        11235,  # chain_id
+        60,  # slip44
+        "ISLM",  # shortcut
+        "Haqq Network",  # name
+        False,  # rskip60
+    )
+    yield (
+        11888,  # chain_id
+        60,  # slip44
+        "nSAN",  # shortcut
+        "SanR Chain",  # name
+        False,  # rskip60
+    )
     yield (
         12052,  # chain_id
         621,  # slip44
@@ -1455,6 +2085,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Singularity ZERO",  # name
         False,  # rskip60
     )
+    yield (
+        13000,  # chain_id
+        60,  # slip44
+        "ECG",  # shortcut
+        "SPS",  # name
+        False,  # rskip60
+    )
+    yield (
+        13308,  # chain_id
+        60,  # slip44
+        "CREDIT",  # shortcut
+        "Credit Smartchain",  # name
+        False,  # rskip60
+    )
     yield (
         13381,  # chain_id
         60,  # slip44
@@ -1462,6 +2106,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Phoenix",  # name
         False,  # rskip60
     )
+    yield (
+        13812,  # chain_id
+        60,  # slip44
+        "OPN",  # shortcut
+        "Susono",  # name
+        False,  # rskip60
+    )
     yield (
         16000,  # chain_id
         60,  # slip44
@@ -1469,6 +2120,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "MetaDot",  # name
         False,  # rskip60
     )
+    yield (
+        16718,  # chain_id
+        60,  # slip44
+        "AMB",  # shortcut
+        "AirDAO",  # name
+        False,  # rskip60
+    )
+    yield (
+        18159,  # chain_id
+        60,  # slip44
+        "POM",  # shortcut
+        "Proof Of Memes",  # name
+        False,  # rskip60
+    )
     yield (
         19845,  # chain_id
         60,  # slip44
@@ -1476,6 +2141,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "BTCIX Network",  # name
         False,  # rskip60
     )
+    yield (
+        20736,  # chain_id
+        60,  # slip44
+        "hP2",  # shortcut
+        "P12 Chain",  # name
+        False,  # rskip60
+    )
     yield (
         21337,  # chain_id
         60,  # slip44
@@ -1497,6 +2169,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Taycan",  # name
         False,  # rskip60
     )
+    yield (
+        22776,  # chain_id
+        60,  # slip44
+        "MAP",  # shortcut
+        "MAP",  # name
+        False,  # rskip60
+    )
     yield (
         24484,  # chain_id
         227,  # slip44
@@ -1511,6 +2190,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "MintMe.com Coin",  # name
         False,  # rskip60
     )
+    yield (
+        25888,  # chain_id
+        60,  # slip44
+        "GOLDT",  # shortcut
+        "Hammer Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        26600,  # chain_id
+        60,  # slip44
+        "HTZ",  # shortcut
+        "Hertz Network",  # name
+        False,  # rskip60
+    )
     yield (
         26863,  # chain_id
         60,  # slip44
@@ -1525,6 +2218,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Ethersocial Network",  # name
         False,  # rskip60
     )
+    yield (
+        31223,  # chain_id
+        60,  # slip44
+        "CLD",  # shortcut
+        "CloudTx",  # name
+        False,  # rskip60
+    )
     yield (
         32520,  # chain_id
         60,  # slip44
@@ -1534,11 +2234,25 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
     )
     yield (
         32659,  # chain_id
-        60,  # slip44
+        288,  # slip44
         "FSN",  # shortcut
         "Fusion",  # name
         False,  # rskip60
     )
+    yield (
+        33333,  # chain_id
+        60,  # slip44
+        "AVS",  # shortcut
+        "Aves",  # name
+        False,  # rskip60
+    )
+    yield (
+        35011,  # chain_id
+        60,  # slip44
+        "taro",  # shortcut
+        "J2O Taro",  # name
+        False,  # rskip60
+    )
     yield (
         39797,  # chain_id
         39797,  # slip44
@@ -1546,6 +2260,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Energi",  # name
         False,  # rskip60
     )
+    yield (
+        39815,  # chain_id
+        60,  # slip44
+        "OHO",  # shortcut
+        "OHO",  # name
+        False,  # rskip60
+    )
+    yield (
+        41500,  # chain_id
+        60,  # slip44
+        "OXYN",  # shortcut
+        "Opulent-X BETA",  # name
+        False,  # rskip60
+    )
     yield (
         42069,  # chain_id
         60,  # slip44
@@ -1560,13 +2288,6 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Celo",  # name
         False,  # rskip60
     )
-    yield (
-        42262,  # chain_id
-        60,  # slip44
-        "ROSE",  # shortcut
-        "Emerald Paratime",  # name
-        False,  # rskip60
-    )
     yield (
         43113,  # chain_id
         1,  # slip44
@@ -1581,6 +2302,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Avalanche C-Chain",  # name
         False,  # rskip60
     )
+    yield (
+        44444,  # chain_id
+        60,  # slip44
+        "FREN",  # shortcut
+        "Frenchain",  # name
+        False,  # rskip60
+    )
     yield (
         44787,  # chain_id
         1,  # slip44
@@ -1602,6 +2330,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "REI Network",  # name
         False,  # rskip60
     )
+    yield (
+        49049,  # chain_id
+        1,  # slip44
+        "tWIRE",  # shortcut
+        "Floripa",  # name
+        False,  # rskip60
+    )
     yield (
         49797,  # chain_id
         1,  # slip44
@@ -1609,6 +2344,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Energi Testnet",  # name
         False,  # rskip60
     )
+    yield (
+        51712,  # chain_id
+        60,  # slip44
+        "SRDX",  # shortcut
+        "Sardis",  # name
+        False,  # rskip60
+    )
     yield (
         53935,  # chain_id
         60,  # slip44
@@ -1616,6 +2358,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "DFK Chain",  # name
         False,  # rskip60
     )
+    yield (
+        61803,  # chain_id
+        60,  # slip44
+        "EGAZ",  # shortcut
+        "Etica",  # name
+        False,  # rskip60
+    )
+    yield (
+        61916,  # chain_id
+        60,  # slip44
+        "DKN",  # shortcut
+        "DoKEN Super Chain",  # name
+        False,  # rskip60
+    )
     yield (
         62320,  # chain_id
         1,  # slip44
@@ -1651,6 +2407,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Energy Web Volta Testnet",  # name
         False,  # rskip60
     )
+    yield (
+        75000,  # chain_id
+        60,  # slip44
+        "RESIN",  # shortcut
+        "ResinCoin",  # name
+        False,  # rskip60
+    )
+    yield (
+        77612,  # chain_id
+        60,  # slip44
+        "VNT",  # shortcut
+        "Vention Smart Chain",  # name
+        False,  # rskip60
+    )
     yield (
         78110,  # chain_id
         60,  # slip44
@@ -1672,6 +2442,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "IVAR Chain",  # name
         False,  # rskip60
     )
+    yield (
+        90210,  # chain_id
+        1,  # slip44
+        "tBVE",  # shortcut
+        "Beverly Hills",  # name
+        False,  # rskip60
+    )
     yield (
         99999,  # chain_id
         60,  # slip44
@@ -1742,6 +2519,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "QuarkChain",  # name
         False,  # rskip60
     )
+    yield (
+        100009,  # chain_id
+        60,  # slip44
+        "VET",  # shortcut
+        "VeChain",  # name
+        False,  # rskip60
+    )
     yield (
         103090,  # chain_id
         60,  # slip44
@@ -1749,13 +2533,6 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Crystaleum",  # name
         False,  # rskip60
     )
-    yield (
-        108801,  # chain_id
-        60,  # slip44
-        "BRO",  # shortcut
-        "BROChain",  # name
-        False,  # rskip60
-    )
     yield (
         131419,  # chain_id
         60,  # slip44
@@ -1763,6 +2540,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "ETND Chain",  # name
         False,  # rskip60
     )
+    yield (
+        188881,  # chain_id
+        60,  # slip44
+        "CONDOR",  # shortcut
+        "Condor Test Network",  # name
+        False,  # rskip60
+    )
     yield (
         200625,  # chain_id
         200625,  # slip44
@@ -1777,6 +2561,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Alaya",  # name
         False,  # rskip60
     )
+    yield (
+        201804,  # chain_id
+        60,  # slip44
+        "MYTH",  # shortcut
+        "Mythical Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        202624,  # chain_id
+        1,  # slip44
+        "TWL",  # shortcut
+        "Jellie",  # name
+        False,  # rskip60
+    )
     yield (
         210425,  # chain_id
         60,  # slip44
@@ -1784,6 +2582,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "PlatON",  # name
         False,  # rskip60
     )
+    yield (
+        220315,  # chain_id
+        60,  # slip44
+        "MAS",  # shortcut
+        "Mas",  # name
+        False,  # rskip60
+    )
     yield (
         246529,  # chain_id
         246529,  # slip44
@@ -1798,6 +2603,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "ARTIS Testnet tau1",  # name
         False,  # rskip60
     )
+    yield (
+        256256,  # chain_id
+        60,  # slip44
+        "CMP",  # shortcut
+        "CMP-Mainnet",  # name
+        False,  # rskip60
+    )
     yield (
         281121,  # chain_id
         60,  # slip44
@@ -1812,6 +2624,27 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Polis",  # name
         False,  # rskip60
     )
+    yield (
+        420420,  # chain_id
+        60,  # slip44
+        "KEK",  # shortcut
+        "Kekchain",  # name
+        False,  # rskip60
+    )
+    yield (
+        420666,  # chain_id
+        60,  # slip44
+        "tKEK",  # shortcut
+        "Kekchain (kektest)",  # name
+        False,  # rskip60
+    )
+    yield (
+        432204,  # chain_id
+        60,  # slip44
+        "ALOT",  # shortcut
+        "Dexalot Subnet",  # name
+        False,  # rskip60
+    )
     yield (
         474142,  # chain_id
         60,  # slip44
@@ -1819,6 +2652,27 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "OpenChain",  # name
         False,  # rskip60
     )
+    yield (
+        513100,  # chain_id
+        60,  # slip44
+        "ETHF",  # shortcut
+        "ethereum Fair",  # name
+        False,  # rskip60
+    )
+    yield (
+        641230,  # chain_id
+        60,  # slip44
+        "BRNKC",  # shortcut
+        "Bear Network Chain",  # name
+        False,  # rskip60
+    )
+    yield (
+        800001,  # chain_id
+        60,  # slip44
+        "OCTA",  # shortcut
+        "OctaSpace",  # name
+        False,  # rskip60
+    )
     yield (
         846000,  # chain_id
         60,  # slip44
@@ -1854,6 +2708,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Xerom",  # name
         False,  # rskip60
     )
+    yield (
+        5555555,  # chain_id
+        60,  # slip44
+        "IMV",  # shortcut
+        "Imversed",  # name
+        False,  # rskip60
+    )
+    yield (
+        7355310,  # chain_id
+        60,  # slip44
+        "VETH",  # shortcut
+        "OpenVessel",  # name
+        False,  # rskip60
+    )
     yield (
         7762959,  # chain_id
         184,  # slip44
@@ -1861,10 +2729,17 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Musicoin",  # name
         False,  # rskip60
     )
+    yield (
+        10101010,  # chain_id
+        60,  # slip44
+        "SVRN",  # shortcut
+        "Soverun",  # name
+        False,  # rskip60
+    )
     yield (
         11155111,  # chain_id
         1,  # slip44
-        "tSEP",  # shortcut
+        "tETH",  # shortcut
         "Sepolia",  # name
         False,  # rskip60
     )
@@ -1875,6 +2750,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "PepChain Churchill",  # name
         False,  # rskip60
     )
+    yield (
+        14288640,  # chain_id
+        60,  # slip44
+        "DEB",  # shortcut
+        "Anduschain",  # name
+        False,  # rskip60
+    )
     yield (
         18289463,  # chain_id
         60,  # slip44
@@ -1896,6 +2778,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "quarkblockchain",  # name
         False,  # rskip60
     )
+    yield (
+        22052002,  # chain_id
+        60,  # slip44
+        "xlon",  # shortcut
+        "Excelon",  # name
+        False,  # rskip60
+    )
+    yield (
+        27082022,  # chain_id
+        60,  # slip44
+        "EXL",  # shortcut
+        "Excoincial Chain",  # name
+        False,  # rskip60
+    )
     yield (
         28945486,  # chain_id
         344,  # slip44
@@ -1903,6 +2799,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Auxilium Network",  # name
         False,  # rskip60
     )
+    yield (
+        29032022,  # chain_id
+        60,  # slip44
+        "FLA",  # shortcut
+        "Flachain",  # name
+        False,  # rskip60
+    )
     yield (
         35855456,  # chain_id
         60,  # slip44
@@ -1910,6 +2813,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Joys Digital",  # name
         False,  # rskip60
     )
+    yield (
+        43214913,  # chain_id
+        60,  # slip44
+        "MAI",  # shortcut
+        "maistestsubnet",  # name
+        False,  # rskip60
+    )
     yield (
         61717561,  # chain_id
         61717561,  # slip44
@@ -2001,6 +2911,20 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
         "Ntity",  # name
         False,  # rskip60
     )
+    yield (
+        383414847825,  # chain_id
+        60,  # slip44
+        "ZENIQ",  # shortcut
+        "Zeniq",  # name
+        False,  # rskip60
+    )
+    yield (
+        666301171999,  # chain_id
+        60,  # slip44
+        "PDC",  # shortcut
+        "PDC",  # name
+        False,  # rskip60
+    )
     yield (
         6022140761023,  # chain_id
         60,  # slip44
diff --git a/core/src/apps/ethereum/sign_typed_data.py b/core/src/apps/ethereum/sign_typed_data.py
index d0426b6130..c1605ad616 100644
--- a/core/src/apps/ethereum/sign_typed_data.py
+++ b/core/src/apps/ethereum/sign_typed_data.py
@@ -1,4 +1,3 @@
-from micropython import const
 from typing import TYPE_CHECKING
 
 from trezor.enums import EthereumDataType
@@ -21,10 +20,6 @@ if TYPE_CHECKING:
     )
 
 
-# Maximum data size we support
-_MAX_VALUE_BYTE_SIZE = const(1024)
-
-
 @with_keychain_from_path(*PATTERNS_ADDRESS)
 async def sign_typed_data(
     ctx: Context, msg: EthereumSignTypedData, keychain: Keychain
@@ -32,21 +27,27 @@ async def sign_typed_data(
     from trezor.crypto.curve import secp256k1
     from apps.common import paths
     from .helpers import address_from_bytes
+    from .layout import require_confirm_address
     from trezor.messages import EthereumTypedDataSignature
 
     await paths.validate_path(ctx, keychain, msg.address_n)
 
+    node = keychain.derive(msg.address_n)
+    address_bytes: bytes = node.ethereum_pubkeyhash()
+
+    # Display address so user can validate it
+    await require_confirm_address(ctx, address_bytes)
+
     data_hash = await _generate_typed_data_hash(
         ctx, msg.primary_type, msg.metamask_v4_compat
     )
 
-    node = keychain.derive(msg.address_n)
     signature = secp256k1.sign(
         node.private_key(), data_hash, False, secp256k1.CANONICAL_SIG_ETHEREUM
     )
 
     return EthereumTypedDataSignature(
-        address=address_from_bytes(node.ethereum_pubkeyhash()),
+        address=address_from_bytes(address_bytes),
         signature=signature[1:] + signature[0:1],
     )
 
@@ -426,14 +427,12 @@ def _validate_value(field: EthereumFieldType, value: bytes) -> None:
 
     Raise DataError if encountering a problem, so clients are notified.
     """
-    # Checking if the size corresponds to what is defined in types,
-    # and also setting our maximum supported size in bytes
-    if field.size is not None:
-        if len(value) != field.size:
-            raise DataError("Invalid length")
-    else:
-        if len(value) > _MAX_VALUE_BYTE_SIZE:
-            raise DataError(f"Invalid length, bigger than {_MAX_VALUE_BYTE_SIZE}")
+    # Checking if the size corresponds to what is defined in types.
+    # Not having any maximum field size - it is a responsibility of the client
+    # (and message creator) to make sure the data is not too large to cause problems
+    # on the Trezor side.
+    if field.size is not None and len(value) != field.size:
+        raise DataError("Invalid length")
 
     # Specific tests for some data types
     if field.data_type == EthereumDataType.BOOL:
diff --git a/core/src/apps/ethereum/tokens.py b/core/src/apps/ethereum/tokens.py
index b0f66afb43..963292332d 100644
--- a/core/src/apps/ethereum/tokens.py
+++ b/core/src/apps/ethereum/tokens.py
@@ -185,21 +185,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "ADT",
             9,
         )
-        yield (  # address, symbol, decimals
-            b"\xad\xe0\x0c\x28\x24\x4d\x5c\xe1\x7d\x72\xe4\x03\x30\xb1\xc3\x18\xcd\x12\xb7\xc3",
-            "ADX",
-            18,
-        )
         yield (  # address, symbol, decimals
             b"\xd9\xa4\xcb\x9d\xc9\x29\x6e\x11\x1c\x66\xdf\xac\xab\x8b\xe0\x34\xee\x2e\x1c\x2c",
             "ADX-LOYALTY",
             18,
         )
-        yield (  # address, symbol, decimals
-            b"\x44\x70\xbb\x87\xd7\x7b\x96\x3a\x01\x3d\xb9\x39\xbe\x33\x2f\x92\x7f\x2b\x99\x2e",
-            "ADXL",
-            4,
-        )
         yield (  # address, symbol, decimals
             b"\x5c\xa9\xa7\x1b\x1d\x01\x84\x9c\x0a\x95\x49\x0c\xc0\x05\x59\x71\x7f\xcf\x0d\x1d",
             "AE",
@@ -1735,6 +1725,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "DAT",
             18,
         )
+        yield (  # address, symbol, decimals
+            b"\x8f\x69\x3c\xa8\xd2\x1b\x15\x71\x07\x18\x4d\x29\xd3\x98\xa8\xd0\x82\xb3\x8b\x76",
+            "DATA",
+            18,
+        )
         yield (  # address, symbol, decimals
             b"\x1b\x5f\x21\xee\x98\xee\xd4\x8d\x29\x2e\x8e\x2d\x3e\xd8\x2b\x40\xa9\x72\x8a\x22",
             "DATABroker",
@@ -3040,6 +3035,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "GIRL",
             18,
         )
+        yield (  # address, symbol, decimals
+            b"\x90\x0d\xb9\x99\x07\x4d\x92\x77\xc5\xda\x2a\x43\xf2\x52\xd7\x43\x66\x23\x0d\xa0",
+            "GIV",
+            18,
+        )
         yield (  # address, symbol, decimals
             b"\xa5\xb3\x99\xa7\x6b\xba\xbe\xf9\x3d\x70\x25\x55\x25\xc1\xd2\xbc\xc3\x70\x1d\x0b",
             "GL",
@@ -3145,6 +3145,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "GTC",
             18,
         )
+        yield (  # address, symbol, decimals
+            b"\x30\xe1\x93\xbd\x3f\x52\x71\x3d\x55\x62\xcf\x31\x6f\x35\x11\x50\x34\x52\x5f\x44",
+            "GTEC",
+            18,
+        )
         yield (  # address, symbol, decimals
             b"\xeb\x98\x6d\xa9\x94\xe4\xa1\x18\xd5\x95\x6b\x02\xd8\xb7\xc3\xc7\xce\x37\x36\x74",
             "GTH",
@@ -3440,6 +3445,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "iBAT",
             18,
         )
+        yield (  # address, symbol, decimals
+            b"\x69\x1c\x25\xc4\x61\xda\xfc\x47\x79\x2b\x6e\x4d\x67\x4f\xbb\x63\x7b\xca\x1c\x6f",
+            "iBBT",
+            18,
+        )
         yield (  # address, symbol, decimals
             b"\x09\x40\x0e\xc6\x83\xf7\x01\x74\xe1\x21\x7d\x6d\xcd\xbf\x42\x44\x8e\x8d\xe5\xd6",
             "iBNB",
@@ -4067,7 +4077,7 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
         )
         yield (  # address, symbol, decimals
             b"\xa4\xe8\xc3\xec\x45\x61\x07\xea\x67\xd3\x07\x5b\xf9\xe3\xdf\x3a\x75\x82\x3d\xb0",
-            "LOOMOLD",
+            "[deprecated] LOOM",
             18,
         )
         yield (  # address, symbol, decimals
@@ -4240,11 +4250,6 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "MEST",
             18,
         )
-        yield (  # address, symbol, decimals
-            b"\xa3\xd5\x8c\x4e\x56\xfe\xdc\xae\x3a\x7c\x43\xa7\x25\xae\xe9\xa7\x1f\x0e\xce\x4e",
-            "MET",
-            18,
-        )
         yield (  # address, symbol, decimals
             b"\xfe\xf3\x88\x4b\x60\x3c\x33\xef\x8e\xd4\x18\x33\x46\xe0\x93\xa1\x73\xc9\x4d\xa6",
             "METM",
@@ -4980,11 +4985,6 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "PATR",
             18,
         )
-        yield (  # address, symbol, decimals
-            b"\x8e\x87\x0d\x67\xf6\x60\xd9\x5d\x5b\xe5\x30\x38\x0d\x0e\xc0\xbd\x38\x82\x89\xe1",
-            "PAX",
-            18,
-        )
         yield (  # address, symbol, decimals
             b"\x45\x80\x48\x80\xde\x22\x91\x3d\xaf\xe0\x9f\x49\x80\x84\x8e\xce\x6e\xcb\xaf\x78",
             "PAXG",
@@ -5945,6 +5945,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "SKE",
             8,
         )
+        yield (  # address, symbol, decimals
+            b"\x06\xa0\x1a\x4d\x57\x94\x79\xdd\x5d\x88\x4e\xbf\x61\xa3\x17\x27\xa3\xd8\xd4\x42",
+            "Skey",
+            8,
+        )
         yield (  # address, symbol, decimals
             b"\x2b\xdc\x0d\x42\x99\x60\x17\xfc\xe2\x14\xb2\x16\x07\xa5\x15\xda\x41\xa9\xe0\xc5",
             "SKIN",
@@ -6050,16 +6055,6 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "SNT",
             18,
         )
-        yield (  # address, symbol, decimals
-            b"\x28\x59\x02\x1e\xe7\xf2\xcb\x10\x16\x2e\x67\xf3\x3a\xf2\xd2\x27\x64\xb3\x1a\xff",
-            "SNTR",
-            4,
-        )
-        yield (  # address, symbol, decimals
-            b"\xc0\x11\xa7\x24\x00\xe5\x8e\xcd\x99\xee\x49\x7c\xf8\x9e\x37\x75\xd4\xbd\x73\x2f",
-            "SNX",
-            18,
-        )
         yield (  # address, symbol, decimals
             b"\xc0\x11\xa7\x3e\xe8\x57\x6f\xb4\x6f\x5e\x1c\x57\x51\xca\x3b\x9f\xe0\xaf\x2a\x6f",
             "SNX",
@@ -6180,11 +6175,6 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "SRX",
             8,
         )
-        yield (  # address, symbol, decimals
-            b"\x6e\x20\x50\xcb\xfb\x3e\xd8\xa4\xd3\x9b\x64\xcc\x9f\x47\xe7\x11\xa0\x3a\x5a\x89",
-            "SSH",
-            18,
-        )
         yield (  # address, symbol, decimals
             b"\x62\x4d\x52\x0b\xab\x2e\x4a\xd8\x39\x35\xfa\x50\x3f\xb1\x30\x61\x43\x74\xe8\x50",
             "SSP",
@@ -6340,6 +6330,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "SWM",
             18,
         )
+        yield (  # address, symbol, decimals
+            b"\x6e\x20\x50\xcb\xfb\x3e\xd8\xa4\xd3\x9b\x64\xcc\x9f\x47\xe7\x11\xa0\x3a\x5a\x89",
+            "SWRM",
+            18,
+        )
         yield (  # address, symbol, decimals
             b"\xb9\xe7\xf8\x56\x8e\x08\xd5\x65\x9f\x5d\x29\xc4\x99\x71\x73\xd8\x4c\xdf\x26\x07",
             "SWT",
@@ -6485,6 +6480,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "TDH",
             18,
         )
+        yield (  # address, symbol, decimals
+            b"\x31\x7e\xb4\xad\x9c\xfa\xc6\x23\x2f\x00\x46\x83\x13\x22\xe8\x95\x50\x7b\xcb\xeb",
+            "TDX",
+            18,
+        )
         yield (  # address, symbol, decimals
             b"\x1c\x79\xab\x32\xc6\x6a\xca\xa1\xe9\xe8\x19\x52\xb8\xaa\xa5\x81\xb4\x3e\x54\xe7",
             "TEAM",
@@ -6690,6 +6690,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "TRST",
             6,
         )
+        yield (  # address, symbol, decimals
+            b"\xf1\x0e\x3e\x8f\x6b\x02\xb5\x94\xb7\xc9\x5f\xca\x59\xdc\x7e\x5c\xe7\x36\x4d\xf5",
+            "TRUCCO",
+            8,
+        )
         yield (  # address, symbol, decimals
             b"\x2c\x53\x7e\x56\x24\xe4\xaf\x88\xa7\xae\x40\x60\xc0\x22\x60\x93\x76\xc8\xd0\xeb",
             "TRYB",
@@ -8140,6 +8145,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "USDM",
             2,
         )
+        yield (  # address, symbol, decimals
+            b"\x8e\x87\x0d\x67\xf6\x60\xd9\x5d\x5b\xe5\x30\x38\x0d\x0e\xc0\xbd\x38\x82\x89\xe1",
+            "USDP",
+            18,
+        )
         yield (  # address, symbol, decimals
             b"\xa4\xbd\xb1\x1d\xc0\xa2\xbe\xc8\x8d\x24\xa3\xaa\x1e\x6b\xb1\x72\x01\x11\x2e\xbe",
             "USDS",
@@ -8530,6 +8540,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "WCT",
             18,
         )
+        yield (  # address, symbol, decimals
+            b"\x8a\xa9\x38\x1b\x25\x44\xb4\x8c\x26\xf3\xb8\x50\xf6\xe0\x7e\x2c\x51\x61\xeb\x3e",
+            "WDOGE",
+            8,
+        )
         yield (  # address, symbol, decimals
             b"\x84\x0f\xe7\x5a\xbf\xad\xc0\xf2\xd5\x40\x37\x82\x95\x71\xb2\x78\x2e\x91\x9c\xe4",
             "WEB",
@@ -8700,6 +8715,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             "XCLR",
             8,
         )
+        yield (  # address, symbol, decimals
+            b"\x0c\xf0\xee\x63\x78\x8a\x08\x49\xfe\x52\x97\xf3\x40\x7f\x70\x1e\x12\x2c\xc0\x23",
+            "XDATA",
+            18,
+        )
         yield (  # address, symbol, decimals
             b"\x41\xab\x1b\x6f\xcb\xb2\xfa\x9d\xce\xd8\x1a\xcb\xde\xc1\x3e\xa6\x31\x5f\x2b\xf2",
             "XDCE",
@@ -9190,13 +9210,13 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             18,
         )
         yield (  # address, symbol, decimals
-            b"\x97\x76\x75\xb8\x63\xb3\xb1\xcf\x46\xa9\x27\xfd\xdc\xbe\x0c\x83\x1b\xf5\x01\x35",
-            "BOBCB",
+            b"\x44\x0c\xd8\x3c\x16\x0d\xe5\xc9\x6d\xdb\x20\x24\x68\x15\xea\x44\xc7\xab\xbc\xa8",
+            "BITP",
             18,
         )
         yield (  # address, symbol, decimals
-            b"\x44\x0c\xd8\x3c\x16\x0d\xe5\xc9\x6d\xdb\x20\x24\x68\x15\xea\x44\xc7\xab\xbc\xa8",
-            "BPro",
+            b"\x97\x76\x75\xb8\x63\xb3\xb1\xcf\x46\xa9\x27\xfd\xdc\xbe\x0c\x83\x1b\xf5\x01\x35",
+            "BOBCB",
             18,
         )
         yield (  # address, symbol, decimals
@@ -9207,7 +9227,7 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
         yield (  # address, symbol, decimals
             b"\xe3\x55\xc2\x80\x13\x1d\xfa\xf1\x8b\xf1\xc3\x64\x8a\xee\x3c\x39\x6d\xb6\xb5\xfd",
             "BRZ",
-            18,
+            4,
         )
         yield (  # address, symbol, decimals
             b"\xab\x2d\x29\x0b\x7a\x60\x0f\x5e\xa8\xd5\xb9\x33\xf6\xf1\x5c\x86\x7f\xd7\xe6\x0e",
@@ -9227,17 +9247,17 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
         yield (  # address, symbol, decimals
             b"\x87\x26\x64\xa8\x85\xa1\x99\x5d\x75\x4e\x36\x66\xa2\x3f\xad\x5c\x80\x14\x01\xc4",
             "cRBTC",
-            18,
+            8,
         )
         yield (  # address, symbol, decimals
             b"\xb7\xff\x2c\x56\xc8\x97\x56\x2c\x0a\xa6\x74\x7d\x26\x79\xd3\x5f\x5e\x93\x74\x92",
             "cRIF",
-            18,
+            8,
         )
         yield (  # address, symbol, decimals
             b"\xd2\x56\xc1\x21\xa5\x07\xca\xdd\x26\x87\x59\x9e\x27\xfa\x45\xe3\x1b\x7c\x31\x99",
             "crUSDT",
-            18,
+            8,
         )
         yield (  # address, symbol, decimals
             b"\xe7\x00\x69\x1d\xa7\xb9\x85\x1f\x2f\x35\xf8\xb8\x18\x2c\x69\xc5\x3c\xca\xd9\xdb",
@@ -9473,13 +9493,13 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
             18,
         )
     if chain_id == 43114:
-        yield (  # address, symbol, decimals
-            b"\xb3\x1f\x66\xaa\x3c\x1e\x78\x53\x63\xf0\x87\x5a\x1b\x74\xe2\x7b\x85\xfd\x66\xc7",
-            "AVAX",
-            18,
-        )
         yield (  # address, symbol, decimals
             b"\xde\x3a\x24\x02\x85\x80\x88\x44\x48\xa5\x39\x78\x72\x04\x6a\x01\x96\x49\xb0\x84",
             "USDT",
             6,
         )
+        yield (  # address, symbol, decimals
+            b"\xb3\x1f\x66\xaa\x3c\x1e\x78\x53\x63\xf0\x87\x5a\x1b\x74\xe2\x7b\x85\xfd\x66\xc7",
+            "WAVAX",
+            18,
+        )
diff --git a/core/src/apps/homescreen/__init__.py b/core/src/apps/homescreen/__init__.py
index 64bcbcbc02..2c6276bc7b 100644
--- a/core/src/apps/homescreen/__init__.py
+++ b/core/src/apps/homescreen/__init__.py
@@ -1,47 +1,57 @@
-from typing import Any
-
+import storage
 import storage.cache
 import storage.device
-from trezor import ui
+from trezor import config, wire
+from trezor.ui.layouts.homescreen import Busyscreen, Homescreen, Lockscreen
+
+from apps.base import busy_expiry_ms, lock_device
 
 
-class HomescreenBase(ui.Layout):
-    RENDER_INDICATOR: object | None = None
+async def busyscreen() -> None:
+    await Busyscreen(busy_expiry_ms())
 
-    def __init__(self) -> None:
-        super().__init__()
-        self.label = storage.device.get_label() or "My Trezor"
-        self.repaint = storage.cache.homescreen_shown is not self.RENDER_INDICATOR
 
-    def get_image(self) -> bytes:
-        from trezor import res
+async def homescreen() -> None:
+    if storage.device.is_initialized():
+        label = storage.device.get_label()
+    else:
+        label = "Go to trezor.io/start"
 
-        return storage.device.get_homescreen() or res.load(
-            "apps/homescreen/res/bg.toif"
-        )
+    notification = None
+    notification_is_error = False
+    if storage.device.is_initialized() and storage.device.no_backup():
+        notification = "SEEDLESS"
+        notification_is_error = True
+    elif storage.device.is_initialized() and storage.device.unfinished_backup():
+        notification = "BACKUP FAILED!"
+        notification_is_error = True
+    elif storage.device.is_initialized() and storage.device.needs_backup():
+        notification = "NEEDS BACKUP!"
+    elif storage.device.is_initialized() and not config.has_pin():
+        notification = "PIN NOT SET!"
+    elif storage.device.get_experimental_features():
+        notification = "EXPERIMENTAL MODE!"
 
-    async def __iter__(self) -> Any:
-        # We need to catch the ui.Cancelled exception that kills us, because that means
-        # that we will need to draw on screen again after restart.
-        try:
-            return await super().__iter__()
-        except ui.Cancelled:
-            storage.cache.homescreen_shown = None
-            raise
+    await Homescreen(
+        label=label,
+        notification=notification,
+        notification_is_error=notification_is_error,
+        hold_to_lock=config.has_pin(),
+    )
+    lock_device()
 
-    def on_render(self) -> None:
-        if not self.repaint:
-            return
-        self.do_render()
-        self.set_repaint(False)
 
-    def do_render(self) -> None:
-        raise NotImplementedError
+async def lockscreen() -> None:
+    from apps.common.request_pin import can_lock_device
+    from apps.base import unlock_device
 
-    def set_repaint(self, value: bool) -> None:
-        self.repaint = value
-        storage.cache.homescreen_shown = None if value else self.RENDER_INDICATOR
-
-    def _before_render(self) -> None:
-        if storage.cache.homescreen_shown is not self.RENDER_INDICATOR:
-            super()._before_render()
+    # Only show the lockscreen UI if the device can in fact be locked.
+    if can_lock_device():
+        await Lockscreen(label=storage.device.get_label())
+    # Otherwise proceed directly to unlock() call. If the device is already unlocked,
+    # it should be a no-op storage-wise, but it resets the internal configuration
+    # to an unlocked state.
+    try:
+        await unlock_device()
+    except wire.PinCancelled:
+        pass
diff --git a/core/src/apps/homescreen/busyscreen.py b/core/src/apps/homescreen/busyscreen.py
deleted file mode 100644
index 59c27e3304..0000000000
--- a/core/src/apps/homescreen/busyscreen.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from typing import TYPE_CHECKING
-
-import storage.cache as storage_cache
-
-from . import HomescreenBase
-
-if TYPE_CHECKING:
-    from trezor import loop
-
-
-async def busyscreen() -> None:
-    await Busyscreen()
-
-
-class Busyscreen(HomescreenBase):
-    RENDER_INDICATOR = storage_cache.BUSYSCREEN_ON
-
-    def create_tasks(self) -> tuple[loop.AwaitableTask, ...]:
-        return self.handle_rendering(), self.handle_input(), self.handle_expiry()
-
-    def handle_expiry(self) -> loop.Task:  # type: ignore [awaitable-is-generator]
-        from apps.base import busy_expiry_ms, set_homescreen
-        from trezor import ui, loop
-
-        yield loop.sleep(busy_expiry_ms())
-        storage_cache.delete(storage_cache.APP_COMMON_BUSY_DEADLINE_MS)
-        set_homescreen()
-        raise ui.Result(None)
-
-    def do_render(self) -> None:
-        from trezor.ui.layouts import show_coinjoin
-
-        show_coinjoin()
diff --git a/core/src/apps/homescreen/homescreen.py b/core/src/apps/homescreen/homescreen.py
deleted file mode 100644
index 31d0679f69..0000000000
--- a/core/src/apps/homescreen/homescreen.py
+++ /dev/null
@@ -1,142 +0,0 @@
-import utime
-from micropython import const
-from typing import TYPE_CHECKING, Tuple
-
-import storage.cache
-from trezor import config, ui
-
-from . import HomescreenBase
-
-if TYPE_CHECKING:
-    from trezor import loop
-
-
-_LOADER_DELAY_MS = const(500)
-_LOADER_TOTAL_MS = const(2500)
-
-
-async def homescreen() -> None:
-    from apps.base import lock_device
-
-    await Homescreen()
-    lock_device()
-
-
-class Homescreen(HomescreenBase):
-    RENDER_INDICATOR = storage.cache.HOMESCREEN_ON
-
-    def __init__(self) -> None:
-        from trezor.ui.loader import Loader, LoaderNeutral
-        import storage.device as storage_device
-
-        super().__init__()
-        if not storage_device.is_initialized():
-            self.label = "Go to trezor.io/start"
-
-        self.loader = Loader(
-            LoaderNeutral,
-            _LOADER_TOTAL_MS - _LOADER_DELAY_MS,
-            -10,
-            3,
-        )
-        self.touch_ms: int | None = None
-
-    def create_tasks(self) -> Tuple[loop.AwaitableTask, ...]:
-        return super().create_tasks() + (self.usb_checker_task(),)
-
-    async def usb_checker_task(self) -> None:
-        from trezor import loop, io
-
-        usbcheck = loop.wait(io.USB_CHECK)
-        while True:
-            await usbcheck
-            self.set_repaint(True)
-
-    def do_render(self) -> None:
-        from trezor import utils
-        from trezor import ui  # local_cache_global
-        import storage.device as storage_device
-
-        header_error = ui.header_error  # local_cache_attribute
-        header_warning = ui.header_warning  # local_cache_attribute
-        display = ui.display  # local_cache_attribute
-        model = utils.MODEL  # local_cache_attribute
-
-        # warning bar on top
-        if storage_device.is_initialized() and storage_device.no_backup():
-            header_error("SEEDLESS")
-        elif storage_device.is_initialized() and storage_device.unfinished_backup():
-            header_error("BACKUP FAILED!")
-        elif storage_device.is_initialized() and storage_device.needs_backup():
-            header_warning("NEEDS BACKUP!")
-        elif storage_device.is_initialized() and not config.has_pin():
-            header_warning("PIN NOT SET!")
-        elif storage_device.get_experimental_features():
-            header_warning("EXPERIMENTAL MODE!")
-        else:
-            display.bar(0, 0, ui.WIDTH, ui.get_header_height(), ui.BG)
-
-        # homescreen with shifted avatar and text on bottom
-        # Differs for each model
-
-        if not utils.usb_data_connected():
-            header_error("NO USB CONNECTION")
-
-        # TODO: support homescreen avatar change for R and 1
-        if model in ("T",):
-            display.avatar(48, 48 - 10, self.get_image(), ui.WHITE, ui.BLACK)
-        elif model in ("R",):
-            icon = "trezor/res/homescreen_model_r.toif"  # 92x92 px
-            display.icon(18, 18, ui.res.load(icon), ui.style.FG, ui.style.BG)
-        elif model in ("1",):
-            icon = "trezor/res/homescreen_model_1.toif"  # 64x36 px
-            display.icon(33, 14, ui.res.load(icon), ui.style.FG, ui.style.BG)
-
-        label_heights = {"1": 60, "R": 120, "T": 220}
-        display.text_center(
-            ui.WIDTH // 2,
-            label_heights[model],
-            self.label,
-            ui.BOLD,
-            ui.FG,
-            ui.BG,
-        )
-
-        ui.refresh()
-
-    def on_touch_start(self, _x: int, _y: int) -> None:
-        if self.loader.start_ms is not None:
-            self.loader.start()
-        elif config.has_pin():
-            self.touch_ms = utime.ticks_ms()
-
-    def on_touch_end(self, _x: int, _y: int) -> None:
-        if self.loader.start_ms is not None:
-            ui.display.clear()
-            self.set_repaint(True)
-        self.loader.stop()
-        self.touch_ms = None
-
-        # raise here instead of self.loader.on_finish so as not to send TOUCH_END to the lockscreen
-        if self.loader.elapsed_ms() >= self.loader.target_ms:
-            raise ui.Result(None)
-
-    def dispatch(self, event: int, x: int, y: int) -> None:
-        if (
-            self.touch_ms is not None
-            and self.touch_ms + _LOADER_DELAY_MS < utime.ticks_ms()
-        ):
-            self.touch_ms = None
-
-            # _loader_start
-            ui.display.clear()
-            ui.display.text_center(
-                ui.WIDTH // 2, 35, "Hold to lock", ui.BOLD, ui.FG, ui.BG
-            )
-            self.loader.start()
-            # END _loader_start
-
-        if event is ui.RENDER and self.loader.start_ms is not None:
-            self.loader.dispatch(event, x, y)
-        else:
-            super().dispatch(event, x, y)
diff --git a/core/src/apps/homescreen/lockscreen.py b/core/src/apps/homescreen/lockscreen.py
deleted file mode 100644
index 1fb84310ce..0000000000
--- a/core/src/apps/homescreen/lockscreen.py
+++ /dev/null
@@ -1,67 +0,0 @@
-import storage.cache
-from trezor import loop, ui
-
-from . import HomescreenBase
-
-
-async def lockscreen() -> None:
-    from trezor import wire
-
-    from apps.common.request_pin import can_lock_device
-    from apps.base import unlock_device
-
-    # Only show the lockscreen UI if the device can in fact be locked.
-    if can_lock_device():
-        await Lockscreen()
-    # Otherwise proceed directly to unlock() call. If the device is already unlocked,
-    # it should be a no-op storage-wise, but it resets the internal configuration
-    # to an unlocked state.
-    try:
-        await unlock_device()
-    except wire.PinCancelled:
-        pass
-
-
-class Lockscreen(HomescreenBase):
-    BACKLIGHT_LEVEL = ui.BACKLIGHT_LOW
-    RENDER_SLEEP = loop.SLEEP_FOREVER
-    RENDER_INDICATOR = storage.cache.LOCKSCREEN_ON
-
-    def __init__(self, bootscreen: bool = False) -> None:
-        if bootscreen:
-            self.BACKLIGHT_LEVEL = ui.BACKLIGHT_NORMAL
-            self.lock_label = "Not connected"
-            self.tap_label = "Tap to connect"
-        else:
-            self.lock_label = "Locked"
-            self.tap_label = "Tap to unlock"
-
-        super().__init__()
-
-    def do_render(self) -> None:
-        from trezor import res
-        from trezor import ui  # local_cache_global
-
-        display = ui.display  # local_cache_attribute
-        title_grey = ui.TITLE_GREY  # local_cache_attribute
-        bg = ui.BG  # local_cache_attribute
-
-        # homescreen with label text on top
-        display.text_center(ui.WIDTH // 2, 35, self.label, ui.BOLD, title_grey, bg)
-        display.avatar(48, 48, self.get_image(), ui.WHITE, ui.BLACK)
-
-        # lock bar
-        display.bar_radius(40, 100, 160, 40, title_grey, bg, 4)
-        display.bar_radius(42, 102, 156, 36, bg, title_grey, 4)
-        display.text_center(
-            ui.WIDTH // 2, 128, self.lock_label, ui.BOLD, title_grey, bg
-        )
-
-        # "tap to unlock"
-        display.text_center(
-            ui.WIDTH // 2 + 10, 220, self.tap_label, ui.BOLD, title_grey, bg
-        )
-        display.icon(45, 202, res.load(ui.ICON_CLICK), title_grey, bg)
-
-    def on_touch_end(self, _x: int, _y: int) -> None:
-        raise ui.Result(None)
diff --git a/core/src/apps/management/apply_settings.py b/core/src/apps/management/apply_settings.py
index 21fff28313..bde8846d8e 100644
--- a/core/src/apps/management/apply_settings.py
+++ b/core/src/apps/management/apply_settings.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from trezor.enums import ButtonRequestType
-from trezor.ui.layouts import confirm_action
+from trezor.ui.layouts import confirm_action, confirm_homescreen
 from trezor.wire import DataError
 
 if TYPE_CHECKING:
@@ -14,7 +14,7 @@ BRT_PROTECT_CALL = ButtonRequestType.ProtectCall  # CACHE
 
 
 def _validate_homescreen(homescreen: bytes) -> None:
-    from trezor import ui
+    import trezorui2
     import storage.device as storage_device
 
     if homescreen == b"":
@@ -26,13 +26,17 @@ def _validate_homescreen(homescreen: bytes) -> None:
         )
 
     try:
-        w, h, toif_format = ui.display.toif_info(homescreen)
+        w, h, mcu_height = trezorui2.jpeg_info(homescreen)
+    except ValueError:
+        raise DataError("Invalid homescreen")
+    if w != 240 or h != 240:
+        raise DataError("Homescreen must be 240x240 pixel large")
+    if mcu_height > 16:
+        raise DataError("Unsupported jpeg type")
+    try:
+        trezorui2.jpeg_test(homescreen)
     except ValueError:
         raise DataError("Invalid homescreen")
-    if w != 144 or h != 144:
-        raise DataError("Homescreen must be 144x144 pixel large")
-    if toif_format != ui.display.TOIF_FULL_COLOR_BE:
-        raise DataError("Homescreen must be full-color TOIF image")
 
 
 async def apply_settings(ctx: Context, msg: ApplySettings) -> Success:
@@ -54,6 +58,7 @@ async def apply_settings(ctx: Context, msg: ApplySettings) -> Success:
     display_rotation = msg.display_rotation  # local_cache_attribute
     msg_safety_checks = msg.safety_checks  # local_cache_attribute
     experimental_features = msg.experimental_features  # local_cache_attribute
+    hide_passphrase_from_host = msg.hide_passphrase_from_host  # local_cache_attribute
 
     if (
         homescreen is None
@@ -64,12 +69,13 @@ async def apply_settings(ctx: Context, msg: ApplySettings) -> Success:
         and auto_lock_delay_ms is None
         and msg_safety_checks is None
         and experimental_features is None
+        and hide_passphrase_from_host is None
     ):
         raise ProcessError("No setting provided")
 
     if homescreen is not None:
         _validate_homescreen(homescreen)
-        await _require_confirm_change_homescreen(ctx)
+        await _require_confirm_change_homescreen(ctx, homescreen)
         try:
             storage_device.set_homescreen(homescreen)
         except ValueError:
@@ -113,27 +119,41 @@ async def apply_settings(ctx: Context, msg: ApplySettings) -> Success:
         await _require_confirm_experimental_features(ctx, experimental_features)
         storage_device.set_experimental_features(experimental_features)
 
+    if hide_passphrase_from_host is not None:
+        if safety_checks.is_strict():
+            raise ProcessError("Safety checks are strict")
+        await _require_confirm_hide_passphrase_from_host(ctx, hide_passphrase_from_host)
+        storage_device.set_hide_passphrase_from_host(hide_passphrase_from_host)
+
     reload_settings_from_storage()
 
     return Success(message="Settings applied")
 
 
-async def _require_confirm_change_homescreen(ctx: GenericContext) -> None:
-    await confirm_action(
-        ctx,
-        "set_homescreen",
-        "Set homescreen",
-        description="Do you really want to change the homescreen image?",
-        br_code=BRT_PROTECT_CALL,
-    )
+async def _require_confirm_change_homescreen(
+    ctx: GenericContext, homescreen: bytes
+) -> None:
+    if homescreen == b"":
+        await confirm_action(
+            ctx,
+            "set_homescreen",
+            "Set homescreen",
+            description="Do you really want to set default homescreen image?",
+            br_code=BRT_PROTECT_CALL,
+        )
+    else:
+        await confirm_homescreen(
+            ctx,
+            homescreen,
+        )
 
 
 async def _require_confirm_change_label(ctx: GenericContext, label: str) -> None:
     await confirm_action(
         ctx,
         "set_label",
-        "Change label",
-        description="Do you really want to change the label to {}?",
+        "Device name",
+        description="Do you want to change device name to {}?",
         description_param=label,
         br_code=BRT_PROTECT_CALL,
     )
@@ -186,7 +206,7 @@ async def _require_confirm_change_display_rotation(
         ctx,
         "set_rotation",
         "Change rotation",
-        description="Do you really want to change display rotation to {}?",
+        description="Do you want to change device rotation to {}?",
         description_param=label,
         br_code=BRT_PROTECT_CALL,
     )
@@ -257,3 +277,16 @@ async def _require_confirm_experimental_features(
             reverse=True,
             br_code=BRT_PROTECT_CALL,
         )
+
+
+async def _require_confirm_hide_passphrase_from_host(
+    ctx: GenericContext, enable: bool
+) -> None:
+    if enable:
+        await confirm_action(
+            ctx,
+            "set_hide_passphrase_from_host",
+            "Hide passphrase",
+            description="Hide passphrase coming from host?",
+            br_code=BRT_PROTECT_CALL,
+        )
diff --git a/core/src/apps/management/change_pin.py b/core/src/apps/management/change_pin.py
index 45826dd0d3..9c970aacdc 100644
--- a/core/src/apps/management/change_pin.py
+++ b/core/src/apps/management/change_pin.py
@@ -72,30 +72,27 @@ def _require_confirm_change_pin(ctx: Context, msg: ChangePin) -> Awaitable[None]
         return confirm_action(
             ctx,
             "set_pin",
-            "Remove PIN",
-            "disable PIN protection?",
-            "Do you really want to",
-            reverse=True,
+            "PIN settings",
+            description="Do you want to disable PIN protection?",
+            verb="Disable",
         )
 
     if not msg.remove and has_pin:  # changing pin
         return confirm_action(
             ctx,
             "set_pin",
-            "Change PIN",
-            "change your PIN?",
-            "Do you really want to",
-            reverse=True,
+            "PIN settings",
+            description="Do you want to change your PIN?",
+            verb="Change",
         )
 
     if not msg.remove and not has_pin:  # setting new pin
         return confirm_action(
             ctx,
             "set_pin",
-            "Enable PIN",
-            "enable PIN protection?",
-            "Do you really want to",
-            reverse=True,
+            "PIN settings",
+            description="Do you want to enable PIN protection?",
+            verb="Enable",
         )
 
     # removing non-existing PIN
diff --git a/core/src/apps/management/change_wipe_code.py b/core/src/apps/management/change_wipe_code.py
index 455fc99826..2e35f7069b 100644
--- a/core/src/apps/management/change_wipe_code.py
+++ b/core/src/apps/management/change_wipe_code.py
@@ -26,7 +26,7 @@ async def change_wipe_code(ctx: Context, msg: ChangeWipeCode) -> Success:
     await _require_confirm_action(ctx, msg, has_wipe_code)
 
     # Get the unlocking PIN.
-    pin, salt = await request_pin_and_sd_salt(ctx)
+    pin, salt = await request_pin_and_sd_salt(ctx, "Enter PIN")
 
     if not msg.remove:
         # Pre-check the entered PIN.
@@ -107,7 +107,7 @@ async def _request_wipe_code_confirm(ctx: Context, pin: str) -> str:
             # _wipe_code_invalid
             await show_popup(
                 "Invalid wipe code",
-                "The wipe code must be\ndifferent from your PIN.\n\nPlease try again.",
+                "The wipe code must be different from your PIN.\n\nPlease try again.",
             )
             continue
 
@@ -117,5 +117,5 @@ async def _request_wipe_code_confirm(ctx: Context, pin: str) -> str:
         # _wipe_code_mismatch
         await show_popup(
             "Code mismatch",
-            "The wipe codes you\nentered do not match.\n\nPlease try again.",
+            "The wipe codes you entered do not match.\n\nPlease try again.",
         )
diff --git a/core/src/apps/management/get_next_u2f_counter.py b/core/src/apps/management/get_next_u2f_counter.py
index 2f65b46d05..00307d3e0b 100644
--- a/core/src/apps/management/get_next_u2f_counter.py
+++ b/core/src/apps/management/get_next_u2f_counter.py
@@ -19,7 +19,7 @@ async def get_next_u2f_counter(ctx: Context, msg: GetNextU2FCounter) -> NextU2FC
         ctx,
         "get_u2f_counter",
         "Get next U2F counter",
-        description="Do you really want to increase and retrieve\nthe U2F counter?",
+        description="Do you really want to increase and retrieve the U2F counter?",
         br_code=ButtonRequestType.ProtectCall,
     )
 
diff --git a/core/src/apps/management/reboot_to_bootloader.py b/core/src/apps/management/reboot_to_bootloader.py
index 2a39063b5d..0acceea3c6 100644
--- a/core/src/apps/management/reboot_to_bootloader.py
+++ b/core/src/apps/management/reboot_to_bootloader.py
@@ -7,14 +7,10 @@ if TYPE_CHECKING:
 
 
 async def reboot_to_bootloader(ctx: Context, msg: RebootToBootloader) -> NoReturn:
-    import storage.device
-    from trezor import io, loop, utils, wire
+    from trezor import io, loop, utils
     from trezor.messages import Success
     from trezor.ui.layouts import confirm_action
 
-    if not storage.device.get_experimental_features():
-        raise wire.UnexpectedMessage("Experimental features are not enabled")
-
     await confirm_action(
         ctx,
         "reboot",
diff --git a/core/src/apps/management/recovery_device/__init__.py b/core/src/apps/management/recovery_device/__init__.py
index 0491650ff0..df44ab62c0 100644
--- a/core/src/apps/management/recovery_device/__init__.py
+++ b/core/src/apps/management/recovery_device/__init__.py
@@ -57,9 +57,7 @@ async def recovery_device(ctx: Context, msg: RecoveryDevice) -> Success:
     # --------------------------------------------------------
     # _continue_dialog
     if not dry_run:
-        await confirm_reset_device(
-            ctx, "Do you really want to\nrecover a wallet?", recovery=True
-        )
+        await confirm_reset_device(ctx, "Wallet recovery", recovery=True)
     else:
         await confirm_action(
             ctx,
diff --git a/core/src/apps/management/recovery_device/homescreen.py b/core/src/apps/management/recovery_device/homescreen.py
index 01a5f92879..50c67bc4a0 100644
--- a/core/src/apps/management/recovery_device/homescreen.py
+++ b/core/src/apps/management/recovery_device/homescreen.py
@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 
 async def recovery_homescreen() -> None:
     from trezor import workflow
-    from apps.homescreen.homescreen import homescreen
+    from apps.homescreen import homescreen
 
     if not storage_recovery.is_in_progress():
         workflow.set_default(homescreen)
diff --git a/core/src/apps/management/recovery_device/layout.py b/core/src/apps/management/recovery_device/layout.py
index f27646c5eb..2b403c5ab5 100644
--- a/core/src/apps/management/recovery_device/layout.py
+++ b/core/src/apps/management/recovery_device/layout.py
@@ -62,7 +62,7 @@ async def request_mnemonic(
             await show_warning(
                 ctx,
                 "warning_known_share",
-                "Share already entered,\nplease enter\na different share.",
+                "Share already entered, please enter a different share.",
             )
             return None
         except word_validity.IdentifierMismatch:
@@ -70,7 +70,7 @@ async def request_mnemonic(
             await show_warning(
                 ctx,
                 "warning_mismatched_share",
-                "You have entered\na share from another\nShamir Backup.",
+                "You have entered a share from another Shamir Backup.",
             )
             return None
         except word_validity.ThresholdReached:
@@ -78,7 +78,7 @@ async def request_mnemonic(
             await show_warning(
                 ctx,
                 "warning_group_threshold",
-                "Threshold of this\ngroup has been reached.\nInput share from\ndifferent group.",
+                "Threshold of this group has been reached. Input share from different group.",
             )
             return None
 
@@ -92,15 +92,17 @@ async def show_dry_run_result(
 
     if result:
         if is_slip39:
-            text = "The entered recovery\nshares are valid and\nmatch what is currently\nin the device."
+            text = "The entered recovery shares are valid and match what is currently in the device."
         else:
-            text = "The entered recovery\nseed is valid and\nmatches the one\nin the device."
+            text = (
+                "The entered recovery seed is valid and matches the one in the device."
+            )
         await show_success(ctx, "success_dry_recovery", text, button="Continue")
     else:
         if is_slip39:
-            text = "The entered recovery\nshares are valid but\ndo not match what is\ncurrently in the device."
+            text = "The entered recovery shares are valid but do not match what is currently in the device."
         else:
-            text = "The entered recovery\nseed is valid but does\nnot match the one\nin the device."
+            text = "The entered recovery seed is valid but does not match the one in the device."
         await show_warning(ctx, "warning_dry_recovery", text, button="Continue")
 
 
@@ -109,13 +111,13 @@ async def show_invalid_mnemonic(ctx: GenericContext, word_count: int) -> None:
         await show_warning(
             ctx,
             "warning_invalid_share",
-            "You have entered\nan invalid recovery\nshare.",
+            "You have entered an invalid recovery share.",
         )
     else:
         await show_warning(
             ctx,
             "warning_invalid_seed",
-            "You have entered\nan invalid recovery\nseed.",
+            "You have entered an invalid recovery seed.",
         )
 
 
diff --git a/core/src/apps/management/reset_device/__init__.py b/core/src/apps/management/reset_device/__init__.py
index 471ff0a52d..258cc07681 100644
--- a/core/src/apps/management/reset_device/__init__.py
+++ b/core/src/apps/management/reset_device/__init__.py
@@ -25,11 +25,14 @@ _DEFAULT_BACKUP_TYPE = BAK_T_BIP39
 
 async def reset_device(ctx: Context, msg: ResetDevice) -> Success:
     from trezor import config
-    from trezor.ui.loader import LoadingAnimation
     from apps.common.request_pin import request_pin_confirm
-    from trezor.ui.layouts import confirm_backup, confirm_reset_device
+    from trezor.ui.layouts import (
+        confirm_backup,
+        confirm_reset_device,
+    )
     from trezor.crypto import bip39, random
     from trezor.messages import Success, EntropyAck, EntropyRequest
+    from trezor.pin import render_empty_loader
 
     backup_type = msg.backup_type  # local_cache_attribute
 
@@ -38,13 +41,15 @@ async def reset_device(ctx: Context, msg: ResetDevice) -> Success:
 
     # make sure user knows they're setting up a new wallet
     if backup_type == BAK_T_SLIP39_BASIC:
-        prompt = "Create a new wallet\nwith Shamir Backup?"
+        title = "Wallet creation\n(Shamir)"
     elif backup_type == BAK_T_SLIP39_ADVANCED:
-        prompt = "Create a new wallet\nwith Super Shamir?"
+        title = "Wallet creation\n(Super Shamir)"
     else:
-        prompt = "Do you want to create\na new wallet?"
-    await confirm_reset_device(ctx, prompt)
-    await LoadingAnimation()
+        title = "Wallet creation"
+    await confirm_reset_device(ctx, title)
+
+    # Rendering empty loader so users do not feel a freezing screen
+    render_empty_loader("PROCESSING", "")
 
     # wipe storage to make sure the device is in a clear state
     storage.reset()
diff --git a/core/src/apps/management/reset_device/layout.py b/core/src/apps/management/reset_device/layout.py
index b9e6873f4e..7d8d337117 100644
--- a/core/src/apps/management/reset_device/layout.py
+++ b/core/src/apps/management/reset_device/layout.py
@@ -69,7 +69,36 @@ async def _confirm_word(
     return selected_word == checked_word
 
 
-async def _confirm_share_words(
+async def _share_words_confirmed(
+    ctx: GenericContext,
+    share_index: int | None,
+    share_words: Sequence[str],
+    num_of_shares: int | None = None,
+    group_index: int | None = None,
+) -> bool:
+    """Shows initial dialog asking the user to select words, then presents
+    word selectors. Shows success popup if the user is done, failure if the confirmation
+    went wrong.
+
+    Return true if the words are confirmed successfully.
+    """
+    # TODO: confirm_action("Select the words bla bla")
+
+    if await _do_confirm_share_words(ctx, share_index, share_words, group_index):
+        await _show_confirmation_success(
+            ctx,
+            share_index,
+            num_of_shares,
+            group_index,
+        )
+        return True
+    else:
+        await _show_confirmation_failure(ctx)
+
+    return False
+
+
+async def _do_confirm_share_words(
     ctx: GenericContext,
     share_index: int | None,
     share_words: Sequence[str],
@@ -98,30 +127,28 @@ async def _show_confirmation_success(
     group_index: int | None = None,
 ) -> None:
     if share_index is None or num_of_shares is None:  # it is a BIP39 backup
-        subheader = "You have finished\nverifying your\nrecovery seed."
+        subheader = "You have finished verifying your recovery seed."
         text = ""
 
     elif share_index == num_of_shares - 1:
         if group_index is None:
-            subheader = "You have finished\nverifying your\nrecovery shares."
+            subheader = "You have finished verifying your recovery shares."
         else:
-            subheader = f"You have finished\nverifying your\nrecovery shares\nfor group {group_index + 1}."
+            subheader = f"You have finished verifying your recovery shares for group {group_index + 1}."
         text = ""
 
     else:
         if group_index is None:
-            subheader = f"Recovery share #{share_index + 1}\nchecked successfully."
+            subheader = f"Recovery share #{share_index + 1} checked successfully."
             text = f"Continue with share #{share_index + 2}."
         else:
-            subheader = f"Group {group_index + 1} - Share {share_index + 1}\nchecked successfully."
-            text = "Continue with the next\nshare."
+            subheader = f"Group {group_index + 1} - Share {share_index + 1} checked successfully."
+            text = "Continue with the next share."
 
     return await show_success(ctx, "success_recovery", text, subheader)
 
 
-async def _show_confirmation_failure(
-    ctx: GenericContext, share_index: int | None
-) -> None:
+async def _show_confirmation_failure(ctx: GenericContext) -> None:
     from trezor.ui.layouts import show_warning
 
     await show_warning(
@@ -141,7 +168,7 @@ async def show_backup_warning(ctx: GenericContext, slip39: bool = False) -> None
 
 
 async def show_backup_success(ctx: GenericContext) -> None:
-    text = "Use your backup\nwhen you need to\nrecover your wallet."
+    text = "Use your backup when you need to recover your wallet."
     await show_success(ctx, "success_backup", text, "Your backup is done.")
 
 
@@ -160,11 +187,8 @@ async def bip39_show_and_confirm_mnemonic(ctx: GenericContext, mnemonic: str) ->
         await show_share_words(ctx, words)
 
         # make the user confirm some words from the mnemonic
-        if await _confirm_share_words(ctx, None, words):
-            await _show_confirmation_success(ctx)
+        if await _share_words_confirmed(ctx, None, words):
             break  # this share is confirmed, go to next one
-        else:
-            await _show_confirmation_failure(ctx, None)
 
 
 # SLIP39
@@ -184,11 +208,8 @@ async def slip39_basic_show_and_confirm_shares(
             await show_share_words(ctx, share_words, index)
 
             # make the user confirm words from the share
-            if await _confirm_share_words(ctx, index, share_words):
-                await _show_confirmation_success(ctx, index, len(shares))
+            if await _share_words_confirmed(ctx, index, share_words, len(shares)):
                 break  # this share is confirmed, go to next one
-            else:
-                await _show_confirmation_failure(ctx, index)
 
 
 async def slip39_advanced_show_and_confirm_shares(
@@ -205,15 +226,7 @@ async def slip39_advanced_show_and_confirm_shares(
                 await show_share_words(ctx, share_words, share_index, group_index)
 
                 # make the user confirm words from the share
-                if await _confirm_share_words(
-                    ctx, share_index, share_words, group_index
+                if await _share_words_confirmed(
+                    ctx, share_index, share_words, len(group), group_index
                 ):
-                    await _show_confirmation_success(
-                        ctx,
-                        share_index,
-                        len(group),
-                        group_index,
-                    )
                     break  # this share is confirmed, go to next one
-                else:
-                    await _show_confirmation_failure(ctx, share_index)
diff --git a/core/src/apps/management/sd_protect.py b/core/src/apps/management/sd_protect.py
index 699ea16d5d..41e855f4a8 100644
--- a/core/src/apps/management/sd_protect.py
+++ b/core/src/apps/management/sd_protect.py
@@ -175,7 +175,7 @@ def require_confirm_sd_protect(ctx: Context, msg: SdProtect) -> Awaitable[None]:
     elif msg.operation == SdProtectOperationType.DISABLE:
         text = "Do you really want to remove SD card protection from your device?"
     elif msg.operation == SdProtectOperationType.REFRESH:
-        text = "Do you really want to replace the current\nSD card secret with a newly generated one?"
+        text = "Do you really want to replace the current SD card secret with a newly generated one?"
     else:
         raise ProcessError("Unknown operation")
 
diff --git a/core/src/apps/management/set_u2f_counter.py b/core/src/apps/management/set_u2f_counter.py
index 253671f2fe..3f911cc0f7 100644
--- a/core/src/apps/management/set_u2f_counter.py
+++ b/core/src/apps/management/set_u2f_counter.py
@@ -21,7 +21,7 @@ async def set_u2f_counter(ctx: Context, msg: SetU2FCounter) -> Success:
         ctx,
         "set_u2f_counter",
         "Set U2F counter",
-        description="Do you really want to\nset the U2F counter\nto {}?",
+        description="Do you really want to set the U2F counter to {}?",
         description_param=str(msg.u2f_counter),
         br_code=ButtonRequestType.ProtectCall,
     )
diff --git a/core/src/apps/management/wipe_device.py b/core/src/apps/management/wipe_device.py
index 476a6c8509..14ad78781a 100644
--- a/core/src/apps/management/wipe_device.py
+++ b/core/src/apps/management/wipe_device.py
@@ -18,7 +18,7 @@ async def wipe_device(ctx: GenericContext, msg: WipeDevice) -> Success:
         "confirm_wipe",
         "Wipe device",
         "All data will be erased.",
-        "Do you really want to\nwipe the device?\n",
+        "Do you really want to wipe the device?\n",
         reverse=True,
         verb="Hold to confirm",
         hold=True,
diff --git a/core/src/apps/misc/cosi_commit.py b/core/src/apps/misc/cosi_commit.py
new file mode 100644
index 0000000000..d2c0a07c6e
--- /dev/null
+++ b/core/src/apps/misc/cosi_commit.py
@@ -0,0 +1,75 @@
+from typing import TYPE_CHECKING
+
+from trezor.enums import ButtonRequestType
+from trezor.messages import CosiCommitment, CosiSign, CosiSignature
+from trezor.wire import DataError
+
+from apps.common.paths import PathSchema, unharden
+
+if TYPE_CHECKING:
+    from trezor.messages import CosiCommit
+    from trezor.wire import Context
+
+# This module implements the cosigner part of the CoSi collective signatures
+# as described in https://dedis.cs.yale.edu/dissent/papers/witness.pdf
+
+
+SCHEMA_SLIP18 = PathSchema.parse("m/10018'/address_index'/*'", slip44_id=())
+# SLIP-26: m/10026'/model'/type'/rotation_index'
+# - `model`: typically ASCII string T1B1 etc. parsed as little-endian number,
+#            but can also be 0 or other values. Maximum allowed value is 0x7F7F7F7F,
+#            the maximum 4-byte ASCII string.
+# - `type`: 0 = bootloader, 1 = vendorheader, 2 = firmware, 3 = definitions, 4 = reserved
+# - `rotation_index`: a fixed 0' for now
+SCHEMA_SLIP26 = PathSchema.parse("m/10026'/[0-2139062143]'/[0-4]'/0'", slip44_id=())
+
+
+async def cosi_commit(ctx: Context, msg: CosiCommit) -> CosiSignature:
+    import storage.cache as storage_cache
+    from trezor.crypto.curve import ed25519
+    from trezor.ui.layouts import confirm_blob
+    from apps.common import paths
+    from apps.common.keychain import get_keychain
+
+    keychain = await get_keychain(ctx, "ed25519", [SCHEMA_SLIP18, SCHEMA_SLIP26])
+    await paths.validate_path(ctx, keychain, msg.address_n)
+
+    node = keychain.derive(msg.address_n)
+    seckey = node.private_key()
+    pubkey = ed25519.publickey(seckey)
+
+    if not storage_cache.is_set(storage_cache.APP_MISC_COSI_COMMITMENT):
+        nonce, commitment = ed25519.cosi_commit()
+        storage_cache.set(storage_cache.APP_MISC_COSI_NONCE, nonce)
+        storage_cache.set(storage_cache.APP_MISC_COSI_COMMITMENT, commitment)
+    commitment = storage_cache.get(storage_cache.APP_MISC_COSI_COMMITMENT)
+    if commitment is None:
+        raise RuntimeError
+
+    sign_msg = await ctx.call(
+        CosiCommitment(commitment=commitment, pubkey=pubkey), CosiSign
+    )
+
+    if sign_msg.address_n != msg.address_n:
+        raise DataError("Mismatched address_n")
+
+    title = "CoSi sign message"
+    if SCHEMA_SLIP18.match(sign_msg.address_n):
+        index = unharden(msg.address_n[1])
+        title = f"CoSi sign index {index}"
+
+    await confirm_blob(
+        ctx, "cosi_sign", title, sign_msg.data, br_code=ButtonRequestType.ProtectCall
+    )
+
+    # clear nonce from cache
+    nonce = storage_cache.get(storage_cache.APP_MISC_COSI_NONCE)
+    storage_cache.delete(storage_cache.APP_MISC_COSI_COMMITMENT)
+    storage_cache.delete(storage_cache.APP_MISC_COSI_NONCE)
+    if nonce is None:
+        raise RuntimeError
+
+    signature = ed25519.cosi_sign(
+        seckey, sign_msg.data, nonce, sign_msg.global_commitment, sign_msg.global_pubkey
+    )
+    return CosiSignature(signature=signature)
diff --git a/core/src/apps/misc/get_entropy.py b/core/src/apps/misc/get_entropy.py
index 679ab8e959..e734087f7f 100644
--- a/core/src/apps/misc/get_entropy.py
+++ b/core/src/apps/misc/get_entropy.py
@@ -15,8 +15,8 @@ async def get_entropy(ctx: Context, msg: GetEntropy) -> Entropy:
         ctx,
         "get_entropy",
         "Confirm entropy",
-        "Do you really want\nto send entropy?",
-        "Continue only if you\nknow what you are doing!",
+        "Do you really want to send entropy?",
+        "Continue only if you know what you are doing!",
         br_code=ButtonRequestType.ProtectCall,
     )
 
diff --git a/core/src/apps/misc/get_firmware_hash.py b/core/src/apps/misc/get_firmware_hash.py
index 695fef739e..2eac1a4630 100644
--- a/core/src/apps/misc/get_firmware_hash.py
+++ b/core/src/apps/misc/get_firmware_hash.py
@@ -3,30 +3,32 @@ from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from trezor.messages import GetFirmwareHash, FirmwareHash
     from trezor.wire import Context
+    from trezor.ui.layouts.common import ProgressLayout
+
+_progress_obj: ProgressLayout | None = None
 
 
 async def get_firmware_hash(ctx: Context, msg: GetFirmwareHash) -> FirmwareHash:
     from trezor.messages import FirmwareHash
     from trezor.utils import firmware_hash
-    from trezor.ui.layouts import draw_simple_text
+    from trezor.ui.layouts import progress
     from trezor import wire, workflow
 
     workflow.close_others()
-    draw_simple_text("Please wait")
+    global _progress_obj
+    _progress_obj = progress()
 
     try:
         hash = firmware_hash(msg.challenge, _render_progress)
     except ValueError as e:
         raise wire.DataError(str(e))
+    finally:
+        _progress_obj = None
 
     return FirmwareHash(hash=hash)
 
 
 def _render_progress(progress: int, total: int) -> None:
-    from trezor.utils import DISABLE_ANIMATION
-    from trezor import ui
-
-    if not DISABLE_ANIMATION:
-        p = 1000 * progress // total
-        ui.display.loader(p, False, 18, ui.WHITE, ui.BG)
-        ui.refresh()
+    global _progress_obj
+    if _progress_obj is not None:
+        _progress_obj.report(1000 * progress // total)
diff --git a/core/src/apps/monero/key_image_sync.py b/core/src/apps/monero/key_image_sync.py
index d282f01b8d..80d39b5d9a 100644
--- a/core/src/apps/monero/key_image_sync.py
+++ b/core/src/apps/monero/key_image_sync.py
@@ -13,6 +13,7 @@ if TYPE_CHECKING:
         MoneroKeyImageSyncStepAck,
         MoneroKeyImageSyncStepRequest,
     )
+    from trezor.ui.layouts.common import ProgressLayout
     from trezor.wire import Context
 
     from apps.common.keychain import Keychain
@@ -34,9 +35,10 @@ async def key_image_sync(
     state = KeyImageSync()
 
     res = await _init_step(state, ctx, msg, keychain)
+    progress = layout.monero_keyimage_sync_progress()
     while state.current_output + 1 < state.num_outputs:
         step = await ctx.call(res, MoneroKeyImageSyncStepRequest)
-        res = await _sync_step(state, ctx, step)
+        res = _sync_step(state, ctx, step, progress)
         gc.collect()
     await ctx.call(res, MoneroKeyImageSyncFinalRequest)
 
@@ -92,8 +94,11 @@ async def _init_step(
     return MoneroKeyImageExportInitAck()
 
 
-async def _sync_step(
-    s: KeyImageSync, ctx: Context, tds: MoneroKeyImageSyncStepRequest
+def _sync_step(
+    s: KeyImageSync,
+    ctx: Context,
+    tds: MoneroKeyImageSyncStepRequest,
+    progress: ProgressLayout,
 ) -> MoneroKeyImageSyncStepAck:
     from trezor import log
     from trezor.messages import (
@@ -111,7 +116,8 @@ async def _sync_step(
     buff = bytearray(32 * 3)
     buff_mv = memoryview(buff)
 
-    await layout.keyimage_sync_step(ctx, s.current_output, s.num_outputs)
+    if s.current_output is not None and s.num_outputs > 0:
+        progress.report(1000 * (s.current_output + 1) // s.num_outputs)
 
     for td in tds.tdis:
         s.current_output += 1
diff --git a/core/src/apps/monero/layout.py b/core/src/apps/monero/layout.py
index 80c6fd72d3..00d1107eae 100644
--- a/core/src/apps/monero/layout.py
+++ b/core/src/apps/monero/layout.py
@@ -1,9 +1,13 @@
 from typing import TYPE_CHECKING
 
-from trezor import ui
 from trezor.enums import ButtonRequestType
-from trezor.ui.layouts import confirm_action, confirm_metadata
-from trezor.ui.popup import Popup
+from trezor.ui.layouts import (  # noqa: F401
+    confirm_action,
+    confirm_metadata,
+    monero_keyimage_sync_progress,
+    monero_live_refresh_progress,
+    monero_transaction_progress_inner,
+)
 
 DUMMY_PAYMENT_ID = b"\x00\x00\x00\x00\x00\x00\x00\x00"
 
@@ -22,6 +26,35 @@ if TYPE_CHECKING:
 BRT_SignTx = ButtonRequestType.SignTx  # global_import_cache
 
 
+class MoneroTransactionProgress:
+    def __init__(self) -> None:
+        self.inner = None
+
+    def step(self, state: State, step: int, sub_step: int = 0) -> None:
+        if step == 0 or self.inner is None:
+            self.inner = monero_transaction_progress_inner()
+            info = "Signing..."
+        elif step == state.STEP_INP:
+            info = f"Processing inputs\n{sub_step + 1}/{state.input_count}"
+        elif step == state.STEP_VINI:
+            info = f"Hashing inputs\n{sub_step + 1}/{state.input_count}"
+        elif step == state.STEP_ALL_IN:
+            info = "Processing..."
+        elif step == state.STEP_OUT:
+            info = f"Processing outputs\n{sub_step + 1}/{state.output_count}"
+        elif step == state.STEP_ALL_OUT:
+            info = "Postprocessing..."
+        elif step == state.STEP_SIGN:
+            info = f"Signing inputs\n{sub_step + 1}/{state.input_count}"
+        else:
+            info = "Processing..."
+
+        state.progress_cur += 1
+
+        p = 1000 * state.progress_cur // state.progress_total
+        self.inner.report(p, info)
+
+
 def _format_amount(value: int) -> str:
     from trezor import strings
 
@@ -78,6 +111,7 @@ async def require_confirm_transaction(
     state: State,
     tsx_data: MoneroTransactionData,
     network_type: MoneroNetworkType,
+    progress: MoneroTransactionProgress,
 ) -> None:
     """
     Ask for confirmation from user.
@@ -112,7 +146,7 @@ async def require_confirm_transaction(
         await _require_confirm_payment_id(ctx, payment_id)
 
     await _require_confirm_fee(ctx, tsx_data.fee)
-    await transaction_step(state, 0)
+    progress.step(state, 0)
 
 
 async def _require_confirm_output(
@@ -173,87 +207,3 @@ async def _require_confirm_unlock_time(ctx: Context, unlock_time: int) -> None:
         str(unlock_time),
         BRT_SignTx,
     )
-
-
-class TransactionStep(ui.Component):
-    def __init__(self, state: State, info: list[str]) -> None:
-        super().__init__()
-        self.state = state
-        self.info = info
-
-    def on_render(self) -> None:
-        from trezor import ui  # local_cache_global
-
-        state = self.state
-        info = self.info
-        ui.header("Signing transaction", ui.ICON_SEND, ui.TITLE_GREY, ui.BG, ui.BLUE)
-        p = 1000 * state.progress_cur // state.progress_total
-        ui.display.loader(p, False, -4, ui.WHITE, ui.BG)
-        ui.display.text_center(ui.WIDTH // 2, 210, info[0], ui.NORMAL, ui.FG, ui.BG)
-        if len(info) > 1:
-            ui.display.text_center(ui.WIDTH // 2, 235, info[1], ui.NORMAL, ui.FG, ui.BG)
-
-
-class KeyImageSyncStep(ui.Component):
-    def __init__(self, current: int, total_num: int) -> None:
-        super().__init__()
-        self.current = current
-        self.total_num = total_num
-
-    def on_render(self) -> None:
-        current = self.current
-        total_num = self.total_num
-        ui.header("Syncing", ui.ICON_SEND, ui.TITLE_GREY, ui.BG, ui.BLUE)
-        p = (1000 * (current + 1) // total_num) if total_num > 0 else 0
-        ui.display.loader(p, False, 18, ui.WHITE, ui.BG)
-
-
-class LiveRefreshStep(ui.Component):
-    def __init__(self, current: int) -> None:
-        super().__init__()
-        self.current = current
-
-    def on_render(self) -> None:
-        from trezor import ui  # local_cache_global
-
-        current = self.current
-        ui.header("Refreshing", ui.ICON_SEND, ui.TITLE_GREY, ui.BG, ui.BLUE)
-        p = (1000 * current // 8) % 1000
-        ui.display.loader(p, True, 18, ui.WHITE, ui.BG)
-        ui.display.text_center(
-            ui.WIDTH // 2, 145, str(current), ui.NORMAL, ui.FG, ui.BG
-        )
-
-
-async def transaction_step(state: State, step: int, sub_step: int = 0) -> None:
-    if step == 0:
-        info = ["Signing..."]
-    elif step == state.STEP_INP:
-        info = ["Processing inputs", f"{sub_step + 1}/{state.input_count}"]
-    elif step == state.STEP_VINI:
-        info = ["Hashing inputs", f"{sub_step + 1}/{state.input_count}"]
-    elif step == state.STEP_ALL_IN:
-        info = ["Processing..."]
-    elif step == state.STEP_OUT:
-        info = ["Processing outputs", f"{sub_step + 1}/{state.output_count}"]
-    elif step == state.STEP_ALL_OUT:
-        info = ["Postprocessing..."]
-    elif step == state.STEP_SIGN:
-        info = ["Signing inputs", f"{sub_step + 1}/{state.input_count}"]
-    else:
-        info = ["Processing..."]
-
-    state.progress_cur += 1
-    await Popup(TransactionStep(state, info))
-
-
-async def keyimage_sync_step(ctx: Context, current: int | None, total_num: int) -> None:
-    if current is None:
-        return
-    await Popup(KeyImageSyncStep(current, total_num))
-
-
-async def live_refresh_step(ctx: Context, current: int | None) -> None:
-    if current is None:
-        return
-    await Popup(LiveRefreshStep(current))
diff --git a/core/src/apps/monero/live_refresh.py b/core/src/apps/monero/live_refresh.py
index 081941d4e5..fc53eb220d 100644
--- a/core/src/apps/monero/live_refresh.py
+++ b/core/src/apps/monero/live_refresh.py
@@ -11,6 +11,7 @@ if TYPE_CHECKING:
         MoneroLiveRefreshFinalAck,
         MoneroLiveRefreshStartAck,
     )
+    from trezor.ui.layouts.common import ProgressLayout
     from trezor.wire import Context
     from apps.common.keychain import Keychain
 
@@ -28,6 +29,7 @@ async def live_refresh(
     state = LiveRefreshState()
 
     res = await _init_step(state, ctx, msg, keychain)
+    progress = layout.monero_live_refresh_progress()
     while True:
         step = await ctx.call_any(
             res,
@@ -36,7 +38,7 @@ async def live_refresh(
         )
         del res
         if MoneroLiveRefreshStepRequest.is_type_of(step):
-            res = await _refresh_step(state, ctx, step)
+            res = _refresh_step(state, ctx, step, progress)
         else:
             return MoneroLiveRefreshFinalAck()
         gc.collect()
@@ -69,8 +71,11 @@ async def _init_step(
     return MoneroLiveRefreshStartAck()
 
 
-async def _refresh_step(
-    s: LiveRefreshState, ctx: Context, msg: MoneroLiveRefreshStepRequest
+def _refresh_step(
+    s: LiveRefreshState,
+    ctx: Context,
+    msg: MoneroLiveRefreshStepRequest,
+    progress: ProgressLayout,
 ) -> MoneroLiveRefreshStepAck:
     from trezor.messages import MoneroLiveRefreshStepAck
     from trezor import log
@@ -81,7 +86,7 @@ async def _refresh_step(
     buff = bytearray(32 * 3)
     buff_mv = memoryview(buff)
 
-    await layout.live_refresh_step(ctx, s.current_output)
+    progress.report((1000 * s.current_output // 8) % 1000, str(s.current_output))
     s.current_output += 1
 
     if __debug__:
diff --git a/core/src/apps/monero/sign_tx.py b/core/src/apps/monero/sign_tx.py
index 3288c9f378..7c1618ae5d 100644
--- a/core/src/apps/monero/sign_tx.py
+++ b/core/src/apps/monero/sign_tx.py
@@ -1,6 +1,7 @@
 from typing import TYPE_CHECKING
 
 from apps.common.keychain import auto_keychain
+from apps.monero.layout import MoneroTransactionProgress
 
 if TYPE_CHECKING:
     from trezor.messages import MoneroTransactionFinalAck
@@ -19,6 +20,7 @@ async def sign_tx(
 
     state = State(ctx)
     mods = utils.unimport_begin()
+    progress = MoneroTransactionProgress()
 
     # Splitting ctx.call() to write() and read() helps to reduce memory fragmentation
     # between calls.
@@ -28,7 +30,9 @@ async def sign_tx(
         gc.collect()
         gc.threshold(gc.mem_free() // 4 + gc.mem_alloc())
 
-        result_msg, accept_msgs = await _sign_tx_dispatch(state, received_msg, keychain)
+        result_msg, accept_msgs = await _sign_tx_dispatch(
+            state, received_msg, keychain, progress
+        )
         if accept_msgs is None:
             break
 
@@ -42,7 +46,9 @@ async def sign_tx(
     return result_msg
 
 
-async def _sign_tx_dispatch(state: State, msg, keychain: Keychain) -> tuple:
+async def _sign_tx_dispatch(
+    state: State, msg, keychain: Keychain, progress: MoneroTransactionProgress
+) -> tuple:
     from trezor.enums import MessageType
     from trezor import wire
 
@@ -53,7 +59,7 @@ async def _sign_tx_dispatch(state: State, msg, keychain: Keychain) -> tuple:
 
         return (
             await step_01_init_transaction.init_transaction(
-                state, msg.address_n, msg.network_type, msg.tsx_data, keychain
+                state, msg.address_n, msg.network_type, msg.tsx_data, keychain, progress
             ),
             (MessageType.MoneroTransactionSetInputRequest,),
         )
@@ -62,7 +68,7 @@ async def _sign_tx_dispatch(state: State, msg, keychain: Keychain) -> tuple:
         from apps.monero.signing import step_02_set_input
 
         return (
-            await step_02_set_input.set_input(state, msg.src_entr),
+            step_02_set_input.set_input(state, msg.src_entr, progress),
             (
                 MessageType.MoneroTransactionSetInputRequest,
                 MessageType.MoneroTransactionInputViniRequest,
@@ -73,8 +79,8 @@ async def _sign_tx_dispatch(state: State, msg, keychain: Keychain) -> tuple:
         from apps.monero.signing import step_04_input_vini
 
         return (
-            await step_04_input_vini.input_vini(
-                state, msg.src_entr, msg.vini, msg.vini_hmac, msg.orig_idx
+            step_04_input_vini.input_vini(
+                state, msg.src_entr, msg.vini, msg.vini_hmac, msg.orig_idx, progress
             ),
             (
                 MessageType.MoneroTransactionInputViniRequest,
@@ -86,7 +92,7 @@ async def _sign_tx_dispatch(state: State, msg, keychain: Keychain) -> tuple:
         from apps.monero.signing import step_05_all_inputs_set
 
         return (
-            await step_05_all_inputs_set.all_inputs_set(state),
+            step_05_all_inputs_set.all_inputs_set(state, progress),
             (MessageType.MoneroTransactionSetOutputRequest,),
         )
 
@@ -98,8 +104,8 @@ async def _sign_tx_dispatch(state: State, msg, keychain: Keychain) -> tuple:
         del msg
 
         return (
-            await step_06_set_output.set_output(
-                state, dst, dst_hmac, rsig_data, is_offloaded_bp
+            step_06_set_output.set_output(
+                state, dst, dst_hmac, rsig_data, is_offloaded_bp, progress
             ),
             (
                 MessageType.MoneroTransactionSetOutputRequest,
@@ -111,7 +117,7 @@ async def _sign_tx_dispatch(state: State, msg, keychain: Keychain) -> tuple:
         from apps.monero.signing import step_07_all_outputs_set
 
         return (
-            await step_07_all_outputs_set.all_outputs_set(state),
+            step_07_all_outputs_set.all_outputs_set(state, progress),
             (MessageType.MoneroTransactionSignInputRequest,),
         )
 
@@ -119,7 +125,7 @@ async def _sign_tx_dispatch(state: State, msg, keychain: Keychain) -> tuple:
         from apps.monero.signing import step_09_sign_input
 
         return (
-            await step_09_sign_input.sign_input(
+            step_09_sign_input.sign_input(
                 state,
                 msg.src_entr,
                 msg.vini,
@@ -129,6 +135,7 @@ async def _sign_tx_dispatch(state: State, msg, keychain: Keychain) -> tuple:
                 msg.pseudo_out_alpha,
                 msg.spend_key,
                 msg.orig_idx,
+                progress,
             ),
             (
                 MessageType.MoneroTransactionSignInputRequest,
diff --git a/core/src/apps/monero/signing/step_01_init_transaction.py b/core/src/apps/monero/signing/step_01_init_transaction.py
index 140274fe01..a81863816a 100644
--- a/core/src/apps/monero/signing/step_01_init_transaction.py
+++ b/core/src/apps/monero/signing/step_01_init_transaction.py
@@ -17,6 +17,7 @@ if TYPE_CHECKING:
         MoneroTransactionRsigData,
     )
 
+    from apps.monero.layout import MoneroTransactionProgress
     from apps.monero.signing.state import State
 
 
@@ -26,6 +27,7 @@ async def init_transaction(
     network_type: int,
     tsx_data: MoneroTransactionData,
     keychain,
+    progress: MoneroTransactionProgress,
 ) -> MoneroTransactionInitAck:
     import gc
     from apps.monero.signing import offloading_keys
@@ -55,7 +57,11 @@ async def init_transaction(
 
     # Ask for confirmation
     await layout.require_confirm_transaction(
-        state.ctx, state, tsx_data, state.creds.network_type
+        state.ctx,
+        state,
+        tsx_data,
+        state.creds.network_type,
+        progress,
     )
     state.creds.address = None
     state.creds.network_type = None
diff --git a/core/src/apps/monero/signing/step_02_set_input.py b/core/src/apps/monero/signing/step_02_set_input.py
index 5437eb307b..55c01bce69 100644
--- a/core/src/apps/monero/signing/step_02_set_input.py
+++ b/core/src/apps/monero/signing/step_02_set_input.py
@@ -21,24 +21,26 @@ if TYPE_CHECKING:
         MoneroTransactionSourceEntry,
         MoneroTransactionSetInputAck,
     )
+    from apps.monero.layout import MoneroTransactionProgress
     from apps.monero.xmr import crypto
 
 
-async def set_input(
-    state: State, src_entr: MoneroTransactionSourceEntry
+def set_input(
+    state: State,
+    src_entr: MoneroTransactionSourceEntry,
+    progress: MoneroTransactionProgress,
 ) -> MoneroTransactionSetInputAck:
     from trezor.messages import MoneroTransactionSetInputAck
     from apps.monero.xmr.serialize_messages.tx_prefix import TxinToKey
     from apps.monero.xmr import chacha_poly, monero, serialize
     from apps.monero.signing import offloading_keys
-    from apps.monero import layout
 
     state.current_input_index += 1
     current_input_index = state.current_input_index  # local_cache_attribute
     amount = src_entr.amount  # local_cache_attribute
     outputs = src_entr.outputs  # local_cache_attribute
 
-    await layout.transaction_step(state, state.STEP_INP, current_input_index)
+    progress.step(state, state.STEP_INP, current_input_index)
 
     if state.last_step > state.STEP_INP:
         raise ValueError("Invalid state transition")
diff --git a/core/src/apps/monero/signing/step_04_input_vini.py b/core/src/apps/monero/signing/step_04_input_vini.py
index d07a73dba2..995f2b1dfa 100644
--- a/core/src/apps/monero/signing/step_04_input_vini.py
+++ b/core/src/apps/monero/signing/step_04_input_vini.py
@@ -11,16 +11,17 @@ if TYPE_CHECKING:
         MoneroTransactionSourceEntry,
     )
     from .state import State
+    from apps.monero.layout import MoneroTransactionProgress
 
 
-async def input_vini(
+def input_vini(
     state: State,
     src_entr: MoneroTransactionSourceEntry,
     vini_bin: bytes,
     vini_hmac: bytes,
     orig_idx: int,
+    progress: MoneroTransactionProgress,
 ) -> MoneroTransactionInputViniAck:
-    from apps.monero import layout
     from apps.monero.signing import offloading_keys
     from apps.monero.xmr import crypto
 
@@ -28,7 +29,7 @@ async def input_vini(
 
     STEP_VINI = state.STEP_VINI  # local_cache_attribute
 
-    await layout.transaction_step(state, STEP_VINI, state.current_input_index + 1)
+    progress.step(state, STEP_VINI, state.current_input_index + 1)
     if state.last_step not in (state.STEP_INP, STEP_VINI):
         raise ValueError("Invalid state transition")
     if state.current_input_index >= state.input_count:
diff --git a/core/src/apps/monero/signing/step_05_all_inputs_set.py b/core/src/apps/monero/signing/step_05_all_inputs_set.py
index 0d1bd60612..ca2890e998 100644
--- a/core/src/apps/monero/signing/step_05_all_inputs_set.py
+++ b/core/src/apps/monero/signing/step_05_all_inputs_set.py
@@ -8,16 +8,18 @@ from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from trezor.messages import MoneroTransactionAllInputsSetAck
     from .state import State
+    from apps.monero.layout import MoneroTransactionProgress
 
 
-async def all_inputs_set(state: State) -> MoneroTransactionAllInputsSetAck:
-    from apps.monero import layout
+def all_inputs_set(
+    state: State, progress: MoneroTransactionProgress
+) -> MoneroTransactionAllInputsSetAck:
     from apps.monero.xmr import crypto
     from trezor.messages import MoneroTransactionAllInputsSetAck
 
     state.mem_trace(0)
 
-    await layout.transaction_step(state, state.STEP_ALL_IN)
+    progress.step(state, state.STEP_ALL_IN)
 
     if state.last_step != state.STEP_VINI:
         raise ValueError("Invalid state transition")
diff --git a/core/src/apps/monero/signing/step_06_set_output.py b/core/src/apps/monero/signing/step_06_set_output.py
index 4d6533a4ed..b3661315c3 100644
--- a/core/src/apps/monero/signing/step_06_set_output.py
+++ b/core/src/apps/monero/signing/step_06_set_output.py
@@ -12,6 +12,7 @@ from apps.monero.xmr import crypto, crypto_helpers
 if TYPE_CHECKING:
     from apps.monero.xmr.serialize_messages.tx_ecdh import EcdhTuple
     from apps.monero.xmr.serialize_messages.tx_rsig_bulletproof import BulletproofPlus
+    from apps.monero.layout import MoneroTransactionProgress
     from trezor.messages import (
         MoneroTransactionDestinationEntry,
         MoneroTransactionSetOutputAck,
@@ -20,15 +21,14 @@ if TYPE_CHECKING:
     from .state import State
 
 
-async def set_output(
+def set_output(
     state: State,
     dst_entr: MoneroTransactionDestinationEntry,
     dst_entr_hmac: bytes,
     rsig_data: MoneroTransactionRsigData,
-    is_offloaded_bp=False,
+    is_offloaded_bp: bool,
+    progress: MoneroTransactionProgress,
 ) -> MoneroTransactionSetOutputAck:
-    from apps.monero import layout
-
     mem_trace = state.mem_trace  # local_cache_attribute
 
     mem_trace(0, True)
@@ -36,9 +36,7 @@ async def set_output(
 
     # Progress update only for master message (skip for offloaded BP msg)
     if not is_offloaded_bp:
-        await layout.transaction_step(
-            state, state.STEP_OUT, state.current_output_index + 1
-        )
+        progress.step(state, state.STEP_OUT, state.current_output_index + 1)
 
     mem_trace(1, True)
 
diff --git a/core/src/apps/monero/signing/step_07_all_outputs_set.py b/core/src/apps/monero/signing/step_07_all_outputs_set.py
index 90438a3252..650f01f4d0 100644
--- a/core/src/apps/monero/signing/step_07_all_outputs_set.py
+++ b/core/src/apps/monero/signing/step_07_all_outputs_set.py
@@ -8,19 +8,21 @@ from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from trezor.messages import MoneroTransactionAllOutSetAck
+    from apps.monero.layout import MoneroTransactionProgress
     from .state import State
 
 
-async def all_outputs_set(state: State) -> MoneroTransactionAllOutSetAck:
+def all_outputs_set(
+    state: State, progress: MoneroTransactionProgress
+) -> MoneroTransactionAllOutSetAck:
     import gc
-    from apps.monero import layout
 
     mem_trace = state.mem_trace  # local_cache_attribute
 
     mem_trace(0)
 
-    await layout.transaction_step(state, state.STEP_ALL_OUT)
-    mem_trace(1)
+    progress.step(state, state.STEP_ALL_OUT)
+    state.mem_trace(1)
 
     _validate(state)
     state.is_processing_offloaded = False
diff --git a/core/src/apps/monero/signing/step_09_sign_input.py b/core/src/apps/monero/signing/step_09_sign_input.py
index 41a470e078..eba7619865 100644
--- a/core/src/apps/monero/signing/step_09_sign_input.py
+++ b/core/src/apps/monero/signing/step_09_sign_input.py
@@ -14,12 +14,13 @@ import gc
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
+    from apps.monero.layout import MoneroTransactionProgress
     from trezor.messages import MoneroTransactionSourceEntry
     from trezor.messages import MoneroTransactionSignInputAck
     from .state import State
 
 
-async def sign_input(
+def sign_input(
     state: State,
     src_entr: MoneroTransactionSourceEntry,
     vini_bin: bytes,
@@ -29,6 +30,7 @@ async def sign_input(
     pseudo_out_alpha_enc: bytes,
     spend_enc: bytes,
     orig_idx: int,
+    progress: MoneroTransactionProgress,
 ) -> MoneroTransactionSignInputAck:
     """
     :param state: transaction state
@@ -44,7 +46,6 @@ async def sign_input(
     :return: Generated signature MGs[i]
     """
     from trezor import utils
-    from apps.monero import layout
     from apps.monero.xmr import crypto_helpers
     from apps.monero.xmr import crypto
 
@@ -53,7 +54,7 @@ async def sign_input(
     input_count = state.input_count  # local_cache_attribute
     outputs = src_entr.outputs  # local_cache_attribute
 
-    await layout.transaction_step(state, state.STEP_SIGN, state.current_input_index + 1)
+    progress.step(state, state.STEP_SIGN, state.current_input_index + 1)
 
     state.current_input_index += 1
     if state.last_step not in (state.STEP_ALL_OUT, state.STEP_SIGN):
diff --git a/core/src/apps/ripple/layout.py b/core/src/apps/ripple/layout.py
index fd5797ad7a..ecbc9e4844 100644
--- a/core/src/apps/ripple/layout.py
+++ b/core/src/apps/ripple/layout.py
@@ -35,4 +35,4 @@ async def require_confirm_destination_tag(ctx: Context, tag: int) -> None:
 async def require_confirm_tx(ctx: Context, to: str, value: int) -> None:
     from trezor.ui.layouts import confirm_output
 
-    await confirm_output(ctx, to, format_amount(value, DECIMALS) + " XRP")
+    await confirm_output(ctx, to, format_amount(value, DECIMALS) + " XRP", hold=True)
diff --git a/core/src/apps/tezos/layout.py b/core/src/apps/tezos/layout.py
index 5523dbf321..2c98e1b5d9 100644
--- a/core/src/apps/tezos/layout.py
+++ b/core/src/apps/tezos/layout.py
@@ -90,6 +90,7 @@ async def require_confirm_register_delegate(
             ("Fee:", format_tezos_amount(fee)),
             ("Address:", address),
         ),
+        hold=True,
         br_code=BR_SIGN_TX,
     )
 
@@ -111,6 +112,7 @@ async def require_confirm_ballot(ctx: Context, proposal: str, ballot: str) -> No
             ("Ballot:", ballot),
             ("Proposal:", proposal),
         ),
+        hold=True,
         br_code=BR_SIGN_TX,
     )
 
@@ -121,6 +123,7 @@ async def require_confirm_proposals(ctx: Context, proposals: list[str]) -> None:
         "confirm_proposals",
         "Submit proposals" if len(proposals) > 1 else "Submit proposal",
         [("Proposal " + str(i), proposal) for i, proposal in enumerate(proposals, 1)],
+        hold=True,
         br_code=BR_SIGN_TX,
     )
 
diff --git a/core/src/apps/webauthn/fido2.py b/core/src/apps/webauthn/fido2.py
index c62bf247cf..ae3de42fde 100644
--- a/core/src/apps/webauthn/fido2.py
+++ b/core/src/apps/webauthn/fido2.py
@@ -164,6 +164,7 @@ _U2FHID_IF_VERSION = const(2)  # interface version
 _U2F_REGISTER_ID = const(0x05)  # version 2 registration identifier
 _FIDO_ATT_PRIV_KEY = b"q&\xac+\xf6D\xdca\x86\xad\x83\xef\x1f\xcd\xf1*W\xb5\xcf\xa2\x00\x0b\x8a\xd0'\xe9V\xe8T\xc5\n\x8b"
 _FIDO_ATT_CERT = b"0\x82\x01\xcd0\x82\x01s\xa0\x03\x02\x01\x02\x02\x04\x03E`\xc40\n\x06\x08*\x86H\xce=\x04\x03\x020.1,0*\x06\x03U\x04\x03\x0c#Trezor FIDO Root CA Serial 841513560 \x17\r200406100417Z\x18\x0f20500406100417Z0x1\x0b0\t\x06\x03U\x04\x06\x13\x02CZ1\x1c0\x1a\x06\x03U\x04\n\x0c\x13SatoshiLabs, s.r.o.1\"0 \x06\x03U\x04\x0b\x0c\x19Authenticator Attestation1'0%\x06\x03U\x04\x03\x0c\x1eTrezor FIDO EE Serial 548784040Y0\x13\x06\x07*\x86H\xce=\x02\x01\x06\x08*\x86H\xce=\x03\x01\x07\x03B\x00\x04\xd9\x18\xbd\xfa\x8aT\xac\x92\xe9\r\xa9\x1f\xcaz\xa2dT\xc0\xd1s61M\xde\x83\xa5K\x86\xb5\xdfN\xf0Re\x9a\x1do\xfc\xb7F\x7f\x1a\xcd\xdb\x8a3\x08\x0b^\xed\x91\x89\x13\xf4C\xa5&\x1b\xc7{h`o\xc1\xa33010!\x06\x0b+\x06\x01\x04\x01\x82\xe5\x1c\x01\x01\x04\x04\x12\x04\x10\xd6\xd0\xbd\xc3b\xee\xc4\xdb\xde\x8dzenJD\x870\x0c\x06\x03U\x1d\x13\x01\x01\xff\x04\x020\x000\n\x06\x08*\x86H\xce=\x04\x03\x02\x03H\x000E\x02 \x0b\xce\xc4R\xc3\n\x11'\xe5\xd5\xf5\xfc\xf5\xd6Wy\x11+\xe50\xad\x9d-TXJ\xbeE\x86\xda\x93\xc6\x02!\x00\xaf\xca=\xcf\xd8A\xb0\xadz\x9e$}\x0ff\xf4L,\x83\xf9T\xab\x95O\x896\xc15\x08\x7fX\xf1\x95"
+_BOGUS_RP_ID = ".dummy"
 _BOGUS_APPID_CHROME = b"A" * 32
 _BOGUS_APPID_FIREFOX = b"\0" * 32
 _BOGUS_APPIDS = (_BOGUS_APPID_CHROME, _BOGUS_APPID_FIREFOX)
@@ -211,8 +212,8 @@ _MAX_CRED_COUNT_IN_LIST = const(10)
 # The CID of the last WINK command. Used to ensure that we do only one WINK at a time on any given CID.
 _last_wink_cid = 0
 
-# The CID of the last successful U2F_AUTHENTICATE check-only request.
-_last_good_auth_check_cid = 0
+# Indicates whether the last U2F_AUTHENTICATE or CBOR_GET_ASSERTION had a valid key handle / credential ID.
+_last_auth_valid = False
 
 
 class CborError(Exception):
@@ -545,10 +546,7 @@ async def handle_reports(iface: HID) -> None:
             req = await _read_cmd(iface)
             if req is None:
                 continue
-            if dialog_mgr.is_busy() and req.cid not in (
-                dialog_mgr.get_cid(),
-                _CID_BROADCAST,
-            ):
+            if not dialog_mgr.allow_cid(req.cid):
                 resp: Cmd | None = cmd_error(req.cid, _ERR_CHANNEL_BUSY)
             else:
                 resp = _dispatch_cmd(req, dialog_mgr)
@@ -611,12 +609,33 @@ async def _confirm_fido(title: str, credential: Credential) -> bool:
         return False
 
 
+async def _confirm_bogus_app(title: str) -> None:
+    if _last_auth_valid:
+        await show_popup(
+            title,
+            "This device is already registered with this application.",
+            "Already registered.",
+            timeout_ms=_POPUP_TIMEOUT_MS,
+        )
+    else:
+        await show_popup(
+            title,
+            "This device is not registered with this application.",
+            "Not registered.",
+            timeout_ms=_POPUP_TIMEOUT_MS,
+        )
+
+
 class State:
     def __init__(self, cid: int, iface: HID) -> None:
         self.cid = cid
         self.iface = iface
         self.finished = False
 
+    def allow_cid(self, cid: int) -> bool:
+        # Generally allow any CID, because Safari browser changes CID for every U2F message.
+        return True
+
     def keepalive_status(self) -> int:
         # Run the keepalive loop to check for timeout, but do not send any keepalive messages.
         return _KEEPALIVE_STATUS_NONE
@@ -657,50 +676,26 @@ class U2fState(State):
 
 
 class U2fConfirmRegister(U2fState):
-    def __init__(
-        self, cid: int, iface: HID, req_data: bytes, cred: U2fCredential
-    ) -> None:
-        super().__init__(cid, iface, req_data, cred)
-
     async def confirm_dialog(self) -> bool:
         if self._cred.rp_id_hash in _BOGUS_APPIDS:
-            if self.cid == _last_good_auth_check_cid:
-                await show_popup(
-                    "U2F",
-                    "This device is already\nregistered with this\napplication.",
-                    "Already registered.",
-                    timeout_ms=_POPUP_TIMEOUT_MS,
-                )
-            else:
-                await show_popup(
-                    "U2F",
-                    "This device is not\nregistered with this\napplication.",
-                    "Not registered.",
-                    timeout_ms=_POPUP_TIMEOUT_MS,
-                )
+            await _confirm_bogus_app("U2F")
             return False
         else:
             return await _confirm_fido("U2F Register", self._cred)
 
     def __eq__(self, other: object) -> bool:
         return (
-            isinstance(other, U2fConfirmRegister)
-            and self.cid == other.cid
-            and self._req_data == other._req_data
+            isinstance(other, U2fConfirmRegister) and self._req_data == other._req_data
         )
 
 
 class U2fConfirmAuthenticate(U2fState):
-    def __init__(self, cid: int, iface: HID, req_data: bytes, cred: Credential) -> None:
-        super().__init__(cid, iface, req_data, cred)
-
     async def confirm_dialog(self) -> bool:
         return await _confirm_fido("U2F Authenticate", self._cred)
 
     def __eq__(self, other: object) -> bool:
         return (
             isinstance(other, U2fConfirmAuthenticate)
-            and self.cid == other.cid
             and self._req_data == other._req_data
         )
 
@@ -725,8 +720,9 @@ class U2fUnlock(State):
 
 
 class Fido2State(State):
-    def __init__(self, cid: int, iface: HID) -> None:
-        super().__init__(cid, iface)
+    def allow_cid(self, cid: int) -> bool:
+        # In FIDO2 lock out other channels until user interaction or timeout.
+        return cid == self.cid
 
     def keepalive_status(self) -> int:
         return _KEEPALIVE_STATUS_UP_NEEDED
@@ -800,6 +796,9 @@ class Fido2ConfirmMakeCredential(Fido2State):
         self._user_verification = user_verification
 
     async def confirm_dialog(self) -> bool:
+        if self._cred.rp_id == _BOGUS_RP_ID:
+            await _confirm_bogus_app("FIDO2")
+            return True
         if not await _confirm_fido("FIDO2 Register", self._cred):
             return False
         if self._user_verification:
@@ -837,7 +836,7 @@ class Fido2ConfirmExcluded(Fido2ConfirmMakeCredential):
 
         await show_popup(
             "FIDO2 Register",
-            "This device is already\nregistered with {}.",
+            "This device is already registered with {}.",
             "Already registered.",
             self._cred.rp_id,  # description_param
             _POPUP_TIMEOUT_MS,
@@ -906,6 +905,10 @@ class Fido2ConfirmGetAssertion(Fido2State):
 
 
 class Fido2ConfirmNoPin(State):
+    def allow_cid(self, cid: int) -> bool:
+        # In FIDO2 lock out other channels until user interaction or timeout.
+        return cid == self.cid
+
     def timeout_ms(self) -> int:
         return _FIDO2_CONFIRM_TIMEOUT_MS
 
@@ -916,7 +919,7 @@ class Fido2ConfirmNoPin(State):
 
         await show_popup(
             "FIDO2 Verify User",
-            "Please enable PIN\nprotection.",
+            "Please enable PIN protection.",
             "Unable to verify user.",
             timeout_ms=_POPUP_TIMEOUT_MS,
         )
@@ -938,7 +941,7 @@ class Fido2ConfirmNoCredentials(Fido2ConfirmGetAssertion):
 
         await show_popup(
             "FIDO2 Authenticate",
-            "This device is not\nregistered with\n{}.",
+            "This device is not registered with\n{}.",
             "Not registered.",
             self._creds[0].app_name(),  # description_param
             _POPUP_TIMEOUT_MS,
@@ -946,9 +949,6 @@ class Fido2ConfirmNoCredentials(Fido2ConfirmGetAssertion):
 
 
 class Fido2ConfirmReset(Fido2State):
-    def __init__(self, cid: int, iface: HID) -> None:
-        super().__init__(cid, iface)
-
     async def confirm_dialog(self) -> bool:
         from trezor.ui.layouts.fido import confirm_fido_reset
 
@@ -989,10 +989,12 @@ class DialogManager:
             loop.close(self.keepalive)
         self._clear()
 
-    def get_cid(self) -> int:
-        if self.state is None:
-            return 0
-        return self.state.cid
+    def allow_cid(self, cid: int) -> bool:
+        return (
+            not self.is_busy()
+            or cid == _CID_BROADCAST
+            or (self.state is not None and self.state.allow_cid(cid))
+        )
 
     def is_busy(self) -> bool:
         if utime.ticks_ms() >= self.deadline:
@@ -1296,6 +1298,9 @@ def _msg_register_sign(challenge: bytes, cred: U2fCredential) -> bytes:
 
 
 def _msg_authenticate(req: Msg, dialog_mgr: DialogManager) -> Cmd:
+    global _last_auth_valid
+    _last_auth_valid = False
+
     cid = req.cid  # local_cache_attribute
     data = req.data  # local_cache_attribute
     info = log.info  # local_cache_attribute
@@ -1330,12 +1335,12 @@ def _msg_authenticate(req: Msg, dialog_mgr: DialogManager) -> Cmd:
         # specific error logged in _node_from_key_handle
         return msg_error(cid, _SW_WRONG_DATA)
 
+    _last_auth_valid = True
+
     # if _AUTH_CHECK_ONLY is requested, return, because keyhandle has been checked already
     if req.p1 == _AUTH_CHECK_ONLY:
         if __debug__:
             info(__name__, "_AUTH_CHECK_ONLY")
-        global _last_good_auth_check_cid
-        _last_good_auth_check_cid = cid
         return msg_error(cid, _SW_CONDITIONS_NOT_SATISFIED)
 
     # from now on, only _AUTH_ENFORCE is supported
@@ -1729,6 +1734,9 @@ def _cbor_get_assertion_process(req: Cmd, dialog_mgr: DialogManager) -> State |
         # User verification requested, but PIN is not enabled.
         return Fido2ConfirmNoPin(cid, dialog_mgr.iface)
 
+    global _last_auth_valid
+    _last_auth_valid = bool(cred_list)
+
     if not cred_list:
         # No credentials. This authenticator is not registered.
         if user_presence:
@@ -1885,7 +1893,7 @@ def _cbor_get_info(req: Cmd) -> Cmd:
         _GETINFO_RESP_EXTENSIONS: ["hmac-secret"],
         _GETINFO_RESP_AAGUID: _AAGUID,
         _GETINFO_RESP_OPTIONS: {
-            "rk": _ALLOW_RESIDENT_CREDENTIALS,
+            "rk": bool(_ALLOW_RESIDENT_CREDENTIALS),
             "up": True,
             "uv": True,
         },
diff --git a/core/src/apps/webauthn/knownapps.py b/core/src/apps/webauthn/knownapps.py
index 096186cf9f..252c9653d9 100644
--- a/core/src/apps/webauthn/knownapps.py
+++ b/core/src/apps/webauthn/knownapps.py
@@ -21,6 +21,14 @@ class FIDOApp:
 
 # fmt: off
 def by_rp_id_hash(rp_id_hash: bytes) -> FIDOApp | None:
+    if rp_id_hash == b"\x22\x65\xcb\xcc\x3e\xf2\x41\x06\xc9\xe0\xed\xdb\xd0\x4f\x3c\xca\x0d\x03\x22\x5d\xa3\xfc\xca\x8e\x2d\x86\xf7\xa3\x94\xaf\x92\x83":
+        # WebAuthn key for Apple
+        return FIDOApp(
+            "apple.com",  # label
+            "apple",  # icon_name
+            None,  # use_sign_count
+            False,  # use_self_attestation
+        )
     if rp_id_hash == b"\x96\x89\x78\xa2\x99\x53\xde\x52\xd3\xef\x0f\x0c\x71\xb7\xb7\xb6\xb1\xaf\x9f\x08\xe2\x57\x89\x6a\x8d\x81\x26\x91\x85\x30\x29\x3b":
         # U2F key for Amazon Web Services
         return FIDOApp(
@@ -203,7 +211,7 @@ def by_rp_id_hash(rp_id_hash: bytes) -> FIDOApp | None:
             "google.com",  # label
             "google",  # icon_name
             None,  # use_sign_count
-            None,  # use_self_attestation
+            False,  # use_self_attestation
         )
     if rp_id_hash == b"\xd4\xc9\xd9\x02\x73\x26\x27\x1a\x89\xce\x51\xfc\xaf\x32\x8e\xd6\x73\xf1\x7b\xe3\x34\x69\xff\x97\x9e\x8a\xb8\xdd\x50\x1e\x66\x4f":
         # WebAuthn key for Google
@@ -211,7 +219,7 @@ def by_rp_id_hash(rp_id_hash: bytes) -> FIDOApp | None:
             "google.com",  # label
             "google",  # icon_name
             None,  # use_sign_count
-            None,  # use_self_attestation
+            False,  # use_self_attestation
         )
     if rp_id_hash == b"\x9c\x2e\x02\xc4\xff\xf7\x76\x62\xe1\xde\x80\x3b\x43\x9e\x11\xc0\xdd\x0c\x3f\x66\x42\xce\xc4\xe6\x84\xd6\x49\x87\x0a\xd1\xbb\x59":
         # WebAuthn key for Invity
diff --git a/core/src/apps/workflow_handlers.py b/core/src/apps/workflow_handlers.py
index 568d101878..693d62df83 100644
--- a/core/src/apps/workflow_handlers.py
+++ b/core/src/apps/workflow_handlers.py
@@ -84,6 +84,8 @@ def _find_message_handler_module(msg_type: int) -> str:
         return "apps.misc.cipher_key_value"
     if msg_type == MessageType.GetFirmwareHash:
         return "apps.misc.get_firmware_hash"
+    if msg_type == MessageType.CosiCommit:
+        return "apps.misc.cosi_commit"
 
     if not utils.BITCOIN_ONLY:
         if msg_type == MessageType.SetU2FCounter:
diff --git a/core/src/apps/zcash/hasher.py b/core/src/apps/zcash/hasher.py
index 8a67fe30c3..22ad0a484f 100644
--- a/core/src/apps/zcash/hasher.py
+++ b/core/src/apps/zcash/hasher.py
@@ -60,7 +60,7 @@ class ZcashHasher:
 
     # The `txid_digest` method is currently a dead code,
     # but we keep it for future use cases.
-    if False:
+    if False:  # noqa
 
         def txid_digest(self) -> bytes:
             """
diff --git a/core/src/boot.py b/core/src/boot.py
index 8de0768fbb..4a88da4d5e 100644
--- a/core/src/boot.py
+++ b/core/src/boot.py
@@ -1,21 +1,58 @@
+# isort:skip_file
+
+import trezorui2
+import utime
+
+# Showing welcome screen as soon as possible
+# (display is also prepared on that occasion).
+# Remembering time to control how long we show it.
+trezorui2.draw_welcome_screen()
+welcome_screen_start_ms = utime.ticks_ms()
+
 import storage
 import storage.device
 from trezor import config, log, loop, ui, utils, wire
-from trezor.pin import show_pin_timeout
+from trezor.pin import (
+    allow_all_loader_messages,
+    ignore_nonpin_loader_messages,
+    show_pin_timeout,
+)
+from trezor.ui.layouts.homescreen import Lockscreen
 
 from apps.common.request_pin import can_lock_device, verify_user_pin
-from apps.homescreen.lockscreen import Lockscreen
+
+_WELCOME_SCREEN_MS = 1500  # how long do we want to show welcome screen (minimum)
+
+
+def enforce_welcome_screen_duration() -> None:
+    """Make sure we will show the welcome screen for appropriate amount of time."""
+    # Not wasting the time in debug builds (saves time during emulator debugging)
+    if __debug__:
+        return
+    while utime.ticks_ms() - welcome_screen_start_ms < _WELCOME_SCREEN_MS:
+        utime.sleep_ms(100)
 
 
 async def bootscreen() -> None:
-    lockscreen = Lockscreen(bootscreen=True)
+    """Sequence of actions to be done on boot (after device is connected).
+
+    We are starting with welcome_screen on the screen and want to show it
+    for at least _WELCOME_SCREEN_MS before any other screen.
+
+    Any non-PIN loaders are ignored during this function.
+    Allowing all of them before returning.
+    """
+    lockscreen = Lockscreen(label=storage.device.get_label(), bootscreen=True)
     ui.display.orientation(storage.device.get_rotation())
     while True:
         try:
             if can_lock_device():
+                enforce_welcome_screen_duration()
                 await lockscreen
             await verify_user_pin()
             storage.init_unlocked()
+            enforce_welcome_screen_duration()
+            allow_all_loader_messages()
             return
         except wire.PinCancelled:
             # verify_user_pin will convert a SdCardUnavailable (in case of sd salt)
@@ -29,8 +66,9 @@ async def bootscreen() -> None:
             utils.halt(e.__class__.__name__)
 
 
-ui.display.backlight(ui.BACKLIGHT_NONE)
-ui.backlight_fade(ui.BACKLIGHT_NORMAL)
+# Ignoring all non-PIN messages in the boot-phase (turned off in `bootscreen()`).
+ignore_nonpin_loader_messages()
+
 config.init(show_pin_timeout)
 
 if __debug__ and not utils.EMULATOR:
diff --git a/core/src/storage/cache.py b/core/src/storage/cache.py
index 333d38b044..aa574358fb 100644
--- a/core/src/storage/cache.py
+++ b/core/src/storage/cache.py
@@ -31,6 +31,8 @@ APP_COMMON_SAFETY_CHECKS_TEMPORARY = const(1 | _SESSIONLESS_FLAG)
 STORAGE_DEVICE_EXPERIMENTAL_FEATURES = const(2 | _SESSIONLESS_FLAG)
 APP_COMMON_REQUEST_PIN_LAST_UNLOCK = const(3 | _SESSIONLESS_FLAG)
 APP_COMMON_BUSY_DEADLINE_MS = const(4 | _SESSIONLESS_FLAG)
+APP_MISC_COSI_NONCE = const(5 | _SESSIONLESS_FLAG)
+APP_MISC_COSI_COMMITMENT = const(6 | _SESSIONLESS_FLAG)
 
 
 # === Homescreen storage ===
@@ -137,6 +139,8 @@ class SessionlessCache(DataCache):
             1,  # STORAGE_DEVICE_EXPERIMENTAL_FEATURES
             8,  # APP_COMMON_REQUEST_PIN_LAST_UNLOCK
             8,  # APP_COMMON_BUSY_DEADLINE_MS
+            32,  # APP_MISC_COSI_NONCE
+            32,  # APP_MISC_COSI_COMMITMENT
         )
         super().__init__()
 
@@ -216,10 +220,6 @@ def end_current_session() -> None:
     _active_session_idx = None
 
 
-def is_session_started() -> bool:
-    return _active_session_idx is not None
-
-
 def set(key: int, value: bytes) -> None:
     if key & _SESSIONLESS_FLAG:
         _SESSIONLESS_CACHE.set(key ^ _SESSIONLESS_FLAG, value)
diff --git a/core/src/storage/device.py b/core/src/storage/device.py
index 35cde49e17..8213a38da5 100644
--- a/core/src/storage/device.py
+++ b/core/src/storage/device.py
@@ -34,6 +34,7 @@ _SD_SALT_AUTH_KEY          = const(0x12)  # bytes
 INITIALIZED                = const(0x13)  # bool (0x01 or empty)
 _SAFETY_CHECK_LEVEL        = const(0x14)  # int
 _EXPERIMENTAL_FEATURES     = const(0x15)  # bool (0x01 or empty)
+_HIDE_PASSPHRASE_FROM_HOST = const(0x16)  # bool (0x01 or empty)
 
 SAFETY_CHECK_LEVEL_STRICT  : Literal[0] = const(0)
 SAFETY_CHECK_LEVEL_PROMPT  : Literal[1] = const(1)
@@ -144,10 +145,6 @@ def set_passphrase_enabled(enable: bool) -> None:
         set_passphrase_always_on_device(False)
 
 
-def get_homescreen() -> bytes | None:
-    return common.get(_NAMESPACE, _HOMESCREEN, public=True)
-
-
 def set_homescreen(homescreen: bytes) -> None:
     if len(homescreen) > HOMESCREEN_MAXSIZE:
         raise ValueError  # homescreen too large
@@ -338,3 +335,17 @@ def set_experimental_features(enabled: bool) -> None:
     cached_bytes = b"\x01" if enabled else b""
     storage_cache.set(storage_cache.STORAGE_DEVICE_EXPERIMENTAL_FEATURES, cached_bytes)
     common.set_true_or_delete(_NAMESPACE, _EXPERIMENTAL_FEATURES, enabled)
+
+
+def set_hide_passphrase_from_host(hide: bool) -> None:
+    """
+    Whether we should hide the passphrase from the host.
+    """
+    common.set_bool(_NAMESPACE, _HIDE_PASSPHRASE_FROM_HOST, hide)
+
+
+def get_hide_passphrase_from_host() -> bool:
+    """
+    Whether we should hide the passphrase from the host.
+    """
+    return common.get_bool(_NAMESPACE, _HIDE_PASSPHRASE_FROM_HOST)
diff --git a/core/src/trezor/crypto/slip39.py b/core/src/trezor/crypto/slip39.py
index 35975f6857..baa5bce1e9 100644
--- a/core/src/trezor/crypto/slip39.py
+++ b/core/src/trezor/crypto/slip39.py
@@ -103,25 +103,6 @@ _SECRET_INDEX = const(255)
 _DIGEST_INDEX = const(254)
 """The index of the share containing the digest of the shared secret."""
 
-
-# === Keyboard functions ===
-
-KEYBOARD_FULL_MASK = const(0x1FF)
-"""All buttons are allowed. 9-bit bitmap all set to 1."""
-
-
-def word_completion_mask(prefix: str) -> int:
-    if not prefix:
-        return KEYBOARD_FULL_MASK
-    return slip39.word_completion_mask(int(prefix))
-
-
-def button_sequence_to_word(prefix: str) -> str:
-    if not prefix:
-        return ""
-    return slip39.button_sequence_to_word(int(prefix))
-
-
 # === External API ===
 
 MAX_SHARE_COUNT = const(16)
diff --git a/core/src/trezor/enums/HomescreenFormat.py b/core/src/trezor/enums/HomescreenFormat.py
new file mode 100644
index 0000000000..9d72d56d17
--- /dev/null
+++ b/core/src/trezor/enums/HomescreenFormat.py
@@ -0,0 +1,6 @@
+# Automatically generated by pb2py
+# fmt: off
+# isort:skip_file
+
+Toif144x144 = 1
+Jpeg240x240 = 2
diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py
index 224a1374e0..1891c8d861 100644
--- a/core/src/trezor/enums/__init__.py
+++ b/core/src/trezor/enums/__init__.py
@@ -407,6 +407,10 @@ if TYPE_CHECKING:
         PromptAlways = 1
         PromptTemporarily = 2
 
+    class HomescreenFormat(IntEnum):
+        Toif144x144 = 1
+        Jpeg240x240 = 2
+
     class Capability(IntEnum):
         Bitcoin = 1
         Bitcoin_like = 2
diff --git a/core/src/trezor/loop.py b/core/src/trezor/loop.py
index bb7d9c212a..3806c63bd2 100644
--- a/core/src/trezor/loop.py
+++ b/core/src/trezor/loop.py
@@ -223,10 +223,6 @@ class Syscall:
         pass
 
 
-SLEEP_FOREVER = Syscall()
-"""Tasks awaiting `SLEEP_FOREVER` will never be resumed."""
-
-
 class sleep(Syscall):
     """Pause current task and resume it after given delay.
 
diff --git a/core/src/trezor/messages.py b/core/src/trezor/messages.py
index 8963ea4cb9..773448a93f 100644
--- a/core/src/trezor/messages.py
+++ b/core/src/trezor/messages.py
@@ -39,6 +39,7 @@ if TYPE_CHECKING:
     from trezor.enums import DecredStakingSpendType  # noqa: F401
     from trezor.enums import EthereumDataType  # noqa: F401
     from trezor.enums import FailureType  # noqa: F401
+    from trezor.enums import HomescreenFormat  # noqa: F401
     from trezor.enums import InputScriptType  # noqa: F401
     from trezor.enums import MessageType  # noqa: F401
     from trezor.enums import MoneroNetworkType  # noqa: F401
@@ -2102,6 +2103,8 @@ if TYPE_CHECKING:
         display_rotation: "int | None"
         experimental_features: "bool | None"
         busy: "bool | None"
+        homescreen_format: "HomescreenFormat | None"
+        hide_passphrase_from_host: "bool | None"
 
         def __init__(
             self,
@@ -2144,6 +2147,8 @@ if TYPE_CHECKING:
             display_rotation: "int | None" = None,
             experimental_features: "bool | None" = None,
             busy: "bool | None" = None,
+            homescreen_format: "HomescreenFormat | None" = None,
+            hide_passphrase_from_host: "bool | None" = None,
         ) -> None:
             pass
 
@@ -2187,6 +2192,7 @@ if TYPE_CHECKING:
         passphrase_always_on_device: "bool | None"
         safety_checks: "SafetyCheckLevel | None"
         experimental_features: "bool | None"
+        hide_passphrase_from_host: "bool | None"
 
         def __init__(
             self,
@@ -2200,6 +2206,7 @@ if TYPE_CHECKING:
             passphrase_always_on_device: "bool | None" = None,
             safety_checks: "SafetyCheckLevel | None" = None,
             experimental_features: "bool | None" = None,
+            hide_passphrase_from_host: "bool | None" = None,
         ) -> None:
             pass
 
diff --git a/core/src/trezor/pin.py b/core/src/trezor/pin.py
index 545df18aaa..983533c25f 100644
--- a/core/src/trezor/pin.py
+++ b/core/src/trezor/pin.py
@@ -1,30 +1,58 @@
-from typing import Any
+from typing import TYPE_CHECKING
 
-from trezor import utils
+if TYPE_CHECKING:
+    from typing import Any
+    from trezor.ui.layouts.common import ProgressLayout
 
-_previous_progress: int | None = None
 _previous_seconds: int | None = None
+_previous_remaining: str | None = None
+_progress_layout: ProgressLayout | None = None
+_started_with_empty_loader = False
 keepalive_callback: Any = None
 
+_ignore_loader_messages: tuple[str, ...] = ()
+
+
+def ignore_nonpin_loader_messages() -> None:
+    global _ignore_loader_messages
+    _ignore_loader_messages = ("Processing", "Starting up")
+
+
+def allow_all_loader_messages() -> None:
+    global _ignore_loader_messages
+    _ignore_loader_messages = ()
+
+
+def render_empty_loader(message: str, description: str) -> None:
+    """Render empty loader to prevent the screen appear to be frozen."""
+    from trezor.ui.layouts import pin_progress
+
+    global _progress_layout
+    global _started_with_empty_loader
+
+    _progress_layout = pin_progress(message, description)
+    _progress_layout.report(0, None)
+
+    _started_with_empty_loader = True
+
 
 def show_pin_timeout(seconds: int, progress: int, message: str) -> bool:
-    from trezor import ui
+    from trezor.ui.layouts import pin_progress
+
+    # Possibility to ignore certain messages - not showing loader for them
+    if message in _ignore_loader_messages:
+        return False
 
-    global _previous_progress
     global _previous_seconds
+    global _previous_remaining
+    global _progress_layout
+    global _started_with_empty_loader
 
     if callable(keepalive_callback):
         keepalive_callback()
 
-    if progress == 0:
-        if progress != _previous_progress:
-            # avoid overdraw in case of repeated progress calls
-            ui.display.clear()
-            _previous_seconds = None
-        ui.display.text_center(ui.WIDTH // 2, 37, message, ui.BOLD, ui.FG, ui.BG)
-
-    if not utils.DISABLE_ANIMATION:
-        ui.display.loader(progress, False, 0, ui.FG, ui.BG)
+    if progress == 0 or _progress_layout is None:
+        _previous_seconds = None
 
     if seconds != _previous_seconds:
         if seconds == 0:
@@ -33,12 +61,25 @@ def show_pin_timeout(seconds: int, progress: int, message: str) -> bool:
             remaining = "1 second left"
         else:
             remaining = f"{seconds} seconds left"
-        ui.display.bar(0, ui.HEIGHT - 42, ui.WIDTH, 25, ui.BG)
-        ui.display.text_center(
-            ui.WIDTH // 2, ui.HEIGHT - 22, remaining, ui.BOLD, ui.FG, ui.BG
-        )
+        _previous_remaining = remaining
         _previous_seconds = seconds
+    else:
+        remaining = _previous_remaining
+
+    # create the layout if it doesn't exist yet or should be started again
+    if _progress_layout is None or (progress == 0 and not _started_with_empty_loader):
+        _progress_layout = pin_progress(message, description=remaining or "")
+
+    # reset the flag - the render_empty_loader() has the effect only in the first call
+    # of this function, where we do not want to re-initialize the layout
+    # to avoid a screen flicker
+    _started_with_empty_loader = False
+
+    # update the progress layout
+    _progress_layout.report(progress, remaining)
+
+    # drop the layout when done so trezor.ui doesn't have to remain in memory
+    if seconds == 0:
+        _progress_layout = None
 
-    ui.refresh()
-    _previous_progress = progress
     return False
diff --git a/core/src/trezor/res/__init__.py b/core/src/trezor/res/__init__.py
deleted file mode 100644
index c5d3ae3bd7..0000000000
--- a/core/src/trezor/res/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-try:
-    from .resources import load_resource
-except ImportError:
-    raise RuntimeError("Please regenerate resources via 'make templates'")
-
-
-def load(name: str) -> bytes:
-    """
-    Loads resource of a given name as bytes.
-    """
-    return load_resource(name)
-
-
-def gettext(message: str) -> str:
-    """
-    Returns localized string. This function is aliased to _.
-    """
-    return message
-
-
-_ = gettext
diff --git a/core/src/trezor/res/cancel.toif b/core/src/trezor/res/cancel.toif
deleted file mode 100644
index 79de5e5f8d..0000000000
Binary files a/core/src/trezor/res/cancel.toif and /dev/null differ
diff --git a/core/src/trezor/res/check.toif b/core/src/trezor/res/check.toif
deleted file mode 100644
index 6251dfff95..0000000000
Binary files a/core/src/trezor/res/check.toif and /dev/null differ
diff --git a/core/src/trezor/res/click.toif b/core/src/trezor/res/click.toif
deleted file mode 100644
index adcef93ff3..0000000000
Binary files a/core/src/trezor/res/click.toif and /dev/null differ
diff --git a/core/src/trezor/res/confirm.toif b/core/src/trezor/res/confirm.toif
deleted file mode 100644
index 2fbfe253e2..0000000000
Binary files a/core/src/trezor/res/confirm.toif and /dev/null differ
diff --git a/core/src/trezor/res/header_icons/cog.toif b/core/src/trezor/res/header_icons/cog.toif
deleted file mode 100644
index abde68818b..0000000000
Binary files a/core/src/trezor/res/header_icons/cog.toif and /dev/null differ
diff --git a/core/src/trezor/res/header_icons/nocopy.toif b/core/src/trezor/res/header_icons/nocopy.toif
deleted file mode 100644
index f193be0ad5..0000000000
Binary files a/core/src/trezor/res/header_icons/nocopy.toif and /dev/null differ
diff --git a/core/src/trezor/res/header_icons/receive.toif b/core/src/trezor/res/header_icons/receive.toif
deleted file mode 100644
index 8ed603c4e2..0000000000
Binary files a/core/src/trezor/res/header_icons/receive.toif and /dev/null differ
diff --git a/core/src/trezor/res/header_icons/recovery.toif b/core/src/trezor/res/header_icons/recovery.toif
deleted file mode 100644
index d9c4779852..0000000000
Binary files a/core/src/trezor/res/header_icons/recovery.toif and /dev/null differ
diff --git a/core/src/trezor/res/header_icons/reset.toif b/core/src/trezor/res/header_icons/reset.toif
deleted file mode 100644
index 581917864a..0000000000
Binary files a/core/src/trezor/res/header_icons/reset.toif and /dev/null differ
diff --git a/core/src/trezor/res/header_icons/send.toif b/core/src/trezor/res/header_icons/send.toif
deleted file mode 100644
index d8b1e37ab7..0000000000
Binary files a/core/src/trezor/res/header_icons/send.toif and /dev/null differ
diff --git a/core/src/trezor/res/header_icons/wipe.toif b/core/src/trezor/res/header_icons/wipe.toif
deleted file mode 100644
index f19ef0ea84..0000000000
Binary files a/core/src/trezor/res/header_icons/wipe.toif and /dev/null differ
diff --git a/core/src/trezor/res/header_icons/wrong.toif b/core/src/trezor/res/header_icons/wrong.toif
deleted file mode 100644
index bf1c34bc57..0000000000
Binary files a/core/src/trezor/res/header_icons/wrong.toif and /dev/null differ
diff --git a/core/src/trezor/res/homescreen_model_1.toif b/core/src/trezor/res/homescreen_model_1.toif
deleted file mode 100644
index 6fc25df0ce..0000000000
Binary files a/core/src/trezor/res/homescreen_model_1.toif and /dev/null differ
diff --git a/core/src/trezor/res/homescreen_model_r.toif b/core/src/trezor/res/homescreen_model_r.toif
deleted file mode 100644
index 2c954ac417..0000000000
Binary files a/core/src/trezor/res/homescreen_model_r.toif and /dev/null differ
diff --git a/core/src/trezor/res/left.toif b/core/src/trezor/res/left.toif
deleted file mode 100644
index 8c148c38a0..0000000000
Binary files a/core/src/trezor/res/left.toif and /dev/null differ
diff --git a/core/src/trezor/res/lock.toif b/core/src/trezor/res/lock.toif
deleted file mode 100644
index d196a2eef9..0000000000
Binary files a/core/src/trezor/res/lock.toif and /dev/null differ
diff --git a/core/src/trezor/res/pin_close.toif b/core/src/trezor/res/pin_close.toif
deleted file mode 100644
index 09c601fb17..0000000000
Binary files a/core/src/trezor/res/pin_close.toif and /dev/null differ
diff --git a/core/src/trezor/res/recovery.toif b/core/src/trezor/res/recovery.toif
deleted file mode 100644
index d9c4779852..0000000000
Binary files a/core/src/trezor/res/recovery.toif and /dev/null differ
diff --git a/core/src/trezor/res/resources.py b/core/src/trezor/res/resources.py
deleted file mode 100644
index 1483dc59b8..0000000000
--- a/core/src/trezor/res/resources.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# generated from resources.py.mako
-# (by running `make templates` in `core`)
-# do not edit manually!
-# fmt: off
-
-def load_resource(name: str) -> bytes:
-    if name == "trezor/res/check.toif":
-        return b'TOIG@\x00@\x00\xa8\x00\x00\x00\xed\xd21\x12\x820\x14\x04\xd0\x0f:\x06\xba\xdc\x84#x\x04<\x82\xad\x9d7\x80\x1b\xe81\xed\xac\x82\xb1Zc\x10\x1c\xc7\xfce\xc6\xd6l\x99\x9d\xf7C\x12\n\xa1\xb1\x92\xf3\x879\xf0\xba\xc7\x9a\xf6\x1e-\xab\xcf\x00\x1d\xe0C\xdfr\x0el\xd4\xfe\x1e\xfb\x9a\xf3\xd3\x02\xaf~\xe5^\xe1v\x81_Vt\xf7=\x1a\xca\x07\xa0\xa4\x1c\xd8N\xbc\xfb\xe6\xb7\xe7z\xa9\xf2>\xae7\xea\xee\xc7X\\Gn$\xf9yS\xba\xd4\xad\xed\xde\xbdI^\xeb@\xf9x@\xc2E\x1c\xe5\xf3\x00\xa3>\xac\xa3\xfcu\x04C~kGy\x1c\xc0x\x18@yx\x85Zrr>R\xf0\xda>\x00'
-    if name == "trezor/res/click.toif":
-        return b"TOIG\x10\x00\x15\x00\x81\x00\x00\x00-\xcb1\n\xc2@\x14\x84\xe1_Q\xb4\x10\xdc\x1b\x98#x\x83\x15\xecMa+\xe4\x00\x82\xae'07\xc8;\x90\x85\x07\x11\xd2\xdb\x04\x15L\x11\xe5\xf96\xeb4\x1f\xcc0\xb8N7X\xda\xc3\xfa3\x83P\x80\xab\xe19\xb6\xee1\xe5\x1e\xb70\xe7\x8c\xdb\x91yr\xca\x06\n\x8eH\x83\xf3\xdc\xa2\xb6\xbfFf6D\xbc\xd4\xdb\xf8\xe9J\xd5\xc9\x00\x96\xe6wa\x85\xa8j\xb5O\xaa\x86<y\xd5S\xefJ/\xbd\xbc5)\x7fi#\xd5\x0f"
-    if name == "trezor/res/header_icons/cog.toif":
-        return b'TOIG\x18\x00\x18\x00\x8c\x00\x00\x00cd``8\xf0\xfe\x1f/\x90\x12\x00b\x86\x8f\xff\xff\xcb3@\xc1\xe7\xff\xff\xed\xc1\x0c\x07\x06\x86o\xff\xff\xd730\x88\x00\x19y\x8b\xfe\x03\x81\xd6\xb3z\x06\x81\xffp\xc08\x01\xc1\xe6\xfc\x02"\xf7\xff\x06\x91\xfe?\x80\xc4|\x06\x86\x9f@\xaa\xbf\x01$\xc9\xc0\x00\xa28\x18\x80\x8a\x18\x19@F\xf830<\xf8\x7f\x1ed\xcd\x9f\xff|\xa8l$5\x05`M\x10\xbd\xc8f"\xdb\x85\xec\x06d\xb7\xc1\xdc\xac\rt3\xc2/,\xa8~D\xf2;\xd0N\x86\x0b\xd00\x01\x00'
-    if name == "trezor/res/header_icons/send.toif":
-        return b'TOIG\x18\x00\x18\x00\\\x00\x00\x00c`\xc0\x03\x16p"\xd8\xbf\xe6#\x84\xff\xff\x87K\xfc\xfa\xff\xbf\x1f!\xfc\xff?\x07\\\x18&\x01\x16\x86J\xfc\x82\xb0A\x12\x0b\xffC\x01\xd0\xa8\x1f\xef\xde\x81X\xef\xde\xd510\x08\t&\x00\x99\xefY\x05\x05A\x1a\x02@lf\x88\x99`6\x0bu\xd9\x0e\xef\xde\xbd\xbb\x0f5\x9fAQII\x08=\x08\x00'
-    if name == "apps/homescreen/res/bg.toif":
-        return b'TOIf\x90\x00\x90\x00&%\x00\x00\xe5\x92;\x90#\xc7y\x801\n\x16\x98\x19`\xf7\xa6a\xd1\xc6\x80\x0c\x08D\xde\xcbx\x99\x95Y\xac\xe2@\x8b\xd9;\x9b\xb4T:\x93\x8c\x142\xb431\xa3\xaa4X\x0c\x8e\xb2\xc9\xba*\xb3\xb4\x19\x99Q!Ce\xdc\xab\x1d\xbc$\x15iI%\x95/dx\xe1\x85\xf6\xff\xec\xee\xc1\x02{o\x1eI\xcf_\xd3\xef\xe9\xe9\xff\xeb\xaf\xd1x\xbeO\xb8\x07\xd1\xe4h\x9diK\xda{\xad\xb3\xc6\xff\xbb\'l6\xce\x1aw\x92\x0c\x19@\xeb,\x81\x1a[\\6\xa4M\xab\xb8\xfe\\F\xb1\xfeNs!/\xee@\xaew\xb8\xdd\xb8\x83\x99\x03\xabVC\xc8 \x1b\x9a\x11V\r\xee\xef\x05M\xc7\x0fG\xbesdZL&\xa0\x12\xed\xa9g\xdc\xb8\xd3BJwp\x16W\xb2=\t\xf2\x84~\xafpFi\x90O\xdf\x11g0\xe3\x00\x18%\x19\x13\x00\x06Y\x83I\x88/a3\xa05dVK\xec\xb2D6\xfb\rd\x03\xf4\x84\xef\xb7\x9a\x8c\xcd7KF\xc8G3\x05Nw\x98\x8b\x96I\xe6\xbe@\x8e8\xc24\x82\xbd\x80}\xca\x94\x90\xb2\x81\xb5{B\xec[\xc5F\xef<\x19\x01\x9d\x96G\xa9\xa9.\xa0?\x01\x8d\xf2Z$\xd4\xd2\xaf\x84\xa3\xc4\x9e:\xc4$\x90Lb\xcd\xb2F\xa1S\xdf\x12oj\xd9y\\Zg\x01\x8f\xb4\xc2,Pwp>\x0bd\xb6q\'\xc9\x92,\x90\x1d\xd466\x87}i\x9d56\xa2\xe5\xf8|\xfe\xcdf\xe4x`\x8e\x92}\x06\xd1\xac\x05\xaeh\xc1,\xced\x7f?G\x8f\xd0\x1cZ\xdf\x0c\x9a\xfc\xa5|/~\xf8=\xe4\xd1\xfb%[%\xd6\xed!\x19\xe2\xf49\xda\xf5\x8dd\xd3\xa2\x0c3\xcc\xbcWXo2\x8f\n\xaf\x90L\x13\x8fZ\xe3\x8c\x8dA?\xbc5-\xe7O(\xdf(\x9f\x84\xb9\x81m\xad3\xe5\xa2+\x0fcX\xd9\xfc\x86\xd1\xc9\x92\x11\x13\xe0\x0c\x81PK\xb3\x17ZhR\x8b#\xa8\xd9\x144-[u\xce\xe3\x186\x99\x92\xee\xac\xb4\xa8n\xa9_8\x86\x0ei\x8fl\xfa\xa6\xb0\xc1\x8cF\xbd\x89f\xaf\x99\x04\x92-\x9a\x02\xf4\x98\x0e\xb4\x92" \x17\x92Q\xb0A\xd2\x8f\xc6\x9d\xde\x8898\xc7\x82\xa6Z\xc2\x1e%\xcc\xe9sz?O\xc4/\xa2\xb5\xd7\xe2\xd6s\xf7F\x98@\xce\t2j\x92\'\xf6\xee\xd9\x1b&"\xec2\xe5\x91x^\x05M\xcf\xa9\xcc~\xeb<"\xeb\x1ag\xbd\xa2W \x191FX0-\xa6\xd8\xa2\xd9\xb0\xc9kz\xd9\xf3\xf4(\x1cY3F\x14\xd0B+\x98\x80\xfa\x03\x86p[X(%\xc9\x1d\xeaDz\xd65\x1aO\xb2M\xa7xG\xc8\xfb\x0e\x84p\x91\xfas5G\xdd\xe2\x11a\xf8|\xe8\xd0\x9d&\x05\xe4\xd3\n \x9b^\x11h\xf6\x12\xbd\t\xe6\x8ee \x1c\x91\x84\xb2\x01\x9e\xbc\xba\x05&e\xc2d\xf4r\x95\xd0\xfa^\xf1r\x15\xb6\x1aw\x90e\xeb\x0e\xbb\xc1\xbb6\xce\xc0\xa4;\xce\x1f\xdf\xa1\x96\x8c\x02\xe5f\xb8gW|\xfe\xf5\x9bC\xf9f\xcc\x88Z\x13\xc8\x92I\x15\xc2\x08Zl\x05\xbd\xc2\x8eV\xf3\xbc|\x8fT\x92\xa27\t\x99\xcf\x1cY%\x99\xf8\x06\\\x89\x91\xf8C\x99guW\x90K/c\x16\x89\xd4\xc0iO\x991!\xe8}\x8dt\xe0\xe4\xa3p\xa4\xf9\xd9Z\xc3\xe6\xe3\xf5\x81\x06\xb2IFP\x8e\x12\xa8{Em=\xed\x98L\xd0F\xfa\x12\xd7\x16d\\\xf3\xef+\xbb\x1fZ\x99\xb5\x98\x80g\x94\x8b\xa0\xe9\x1b\xd5\xf8<i\xb6\xd0\x1f\x8e\xaf\x8b\x0e\xe4\xd0\x9b\x90\'\xec\x00\xbc\xc9\x84\xea\xa6}\xd9\x1b!\x87L\xc0\x102E\xe8\xb5<\xb6\x1e\x1f\xda\x11\xbf\x87o\x80`\x96dP2\x99\x16\xb7\x02"\xc2%\xda\x146[g\x8d\x9d\x01\xdf\xed5~\x01l\xce\xe8\xfd\xba\xdciQ\x999><\x86\xc6\xf4\xaa\xa4\x08\x9a\x1b\x14hF\x1cjI\xc9\xdfel\x0c\xb4i\xbf\xa0\xf5r\xf5\xca\x18H\x8dte\x80\xdf\x92\x8b\t\xf1\xc26\xd8\x931\xab\x04\xf2\x87h\x8a/\xca\xa4\x89\x86\t74\xc7\xb5\x9f\xbd;#\xcad$d8x\x8c\x89d\xe2\x8e\xd0\t\xd42\xe5\x92%Eo\xaet\x93\xc9 \xc6\xb1^1h#\x15\x8f\xdb$T2MfA\xad\x8c{\t\x93\xdaC\x93\x1c\x13?\xeaV%\xaf\x89A\xcf\x90PR\xc0\r\x8e\xc4 e\xe4q\xc2\xf3\xc3\n\xeb\x8c8$+\x82\x96\xe4>\nZ\x87m,\xc3\x96\xa5\xa1\xd43G\xb67AZ\x81\x10A&D\x01V\xb4\xee\xa8\x9f\xc1\x1ePC{2\x9f\x85c\x05\x0c\xf7\xc4\x9b_\x88I\xc8\xe8\x99\xb9\x93h\x16\x99\xad3\xc9\x90]\xa1l\xc8\x98\x91\x8e%\x15\xb1h\xca\x18\x93l\xd9=Z\xeaJ\xaf\x92y&\xd3\xa4\xd1\xcc2k1\xa1\xa0)=0.\xc9\x82\xa6F\xcb\xb3&\x11\x9a\xbeK0\xb6\'\xfe\x9c=\x0bB\xbd9f\x93L\xc0\x0f\xc9\x8c\xdaB!\x10/\xc4 \xf6\xaa\x95\x10C\xc8[=\xc9\x90oR\xf4\x8apt\x81\xef\x08\xfe@;\xcb\xf7\xb0\xcf?\xcctM \x06a`+\xc9\x92\xacqGGy\x06\xd8\xed\xb19\xc1\x9e\xcf\x86\x98\xb2Q\x9f3+j?]:\x15X\xa0YaYl\xe4G\x19\xb2\r\xc9\xc8\x8e\xb05bSo2\x88\xe5{\xfd&s\xe6%\x85\x90\x9f\x90\xa3-\xfb]\x06\xe3\xb8\x0f\x99\xc9$\xb0\xdf\xb8\x03\x9c\'\x94\xf7\x9d\xc6\x99\xfa\x02\xb3{H\'`\x1eglU\xd8\xac\xf3z\xda\x0e\x11\x91\x11\xd8\xae|\x8a\xd0\xb57)\xb5\xac\x11\xf0&\x13 \x0by\xf7&\x98U\xe2\xbe\xe0u\xb8\xa7~_\x08\x19\x1c\xe3\x9b\x10\xeb^\x9e\x87-f\x02\xac21\x14\xea\x84\xbc\n\x9a=\xafG\x04\x81P\xd0\xd4hx\x84B\xf1(\xdc{\x9a\x84\x98\x0e\xe4X\t\xa7Q\xa8\x91y6\x10\x1fr\x00f\x82\x96\x185\x91o\nY\xa3\xde\x8c\xc4\x0c\x9f\xf1\x04\xfa0\xd2\xabz\x93\x04\x02\xbfOxUF|\xf0\xdbf\xc0&1\x0b\x18\x0b\x98:\x99\xc5;+\x19\xa2\xd1J\x80)\x12A\xab\xc8\xbe\xbd\xb0\xd9r&=\xf1\xd3\x9b\x93/\x99\x10\x99\xf4\xe6\xc9\x9c\xb3"\x9f\\v>3<\xbf?Vx4G\xde\xea\xcc\xdb;cwzD\xb47?l{;\x16\x8e\x07\xd0j\x02\x03$\x92\x11\x91\x91\x90\xe0\x9e\x90\xe12\xc9\xd4\x18\xe6\x826q\xbf\xf1\x94\x08\x85\x05RH\xe6\xd6y\r\xf1\xe20v\xf9\xf6&\x8e\x8e\xc7\xa0\xa8q\xd3\xd5\xc5\x16\xae\xae\x04N\xe8\x16Y4\x12/Z\xe2PKv!\xb7\x024\xa8I\xcc\xd4-\x8f\x10\x073\xc1\x96\xf2R\xbf\x90O\xeb\x89\x08\x85\xc8e\x92\xc6\x94O\xd1\xab\xe4\xf4sK(\xf3\x98\xc1\xcad\x93QV\xb3\xc0\x92H*XIy\xea\x9ea\x96\xcc\xd9\x9dp\xe2\xfc\xec\xf1\xba\x0c\xcb\xa0\xc5\x9cdW&\xa5\xc4\x90\x1dg\x9d9\x7f\x94\x06\xbf\x8d;\xc8\x07]bNH\x07\xe9=\x11\x9d\t\x9f\xb7GD\xa8$\x0e\x92E!\x84\xf4\xee\xd5\xb2\xcc\xbe\x94\x0b\xf1D&s;_\x08\x1f\x8a\x7f\\M\xbf\xf8\xf4Og7\xef\xbex\xff\xf4\xfe\xe9\xdd\x17\xcfn~\xfa\xa7\xe9\x07\xff\xb8rw\xd0\x9b\x04\xad\xc31x\xc2t24\x06\x18P/\x10B\x81\x170\x8f\x9cZ\x8e\x12\xb2Pj\xd0\xde\xe3RZ\x8fKG\xbcH\x90\x8c\xde\xad\x8e\xd6YH\xaeI\xe5\xf9\x92%u\xbf2\xf9\x1a\xc6\x82\x8c|*\x8e\xae\x7f|\xfb\xde\xdb\xff{w{\xdc{\xfb\xe3\xdbG\x07\xc4\xa7\n[\x83vR\x04b%\xe6\x89\x0c4\x12>\x03\xd9\xc3\x16\x11\x9bV\xd8Tn\xc8G<:cs \xf6\x90\x10\xc5\xe3\xb93I \xa0\x9cs\x8fG\x84\x0c\xb6F\xcaF\xce\xca\xb5\x8ef\x83\xb68\xa61\x01~\xcawtt\xb0\xfa\xaf]d\xfcX\xdd<\xda\x0f\x80h V&bm\xa2~:\xa7FL\x00\xb9\xa8A\xa1P\xa1q\xa4\xb7\xe7\xf3\x11:h\xd2c\xf1\x818\x01:\'\x1b| S0\xaa\xa0\xdc\xe1\\p\xbb\x995\xc9\x19\xc5V\x15\xd6;&K\xfd\xc3\xf1\xd9\xcd\x87a\xa3qv\xf3\x1fJ{\x17\xd5E>I\x91\x8c\xc8\x1a\xa0\x885\xfa\x86>\x05\xc2\x0b\xcckZ\x97\xf6\xac=\xcd$C64\xf6Xt\x92\x93\xba=46O\xb85\x92\xec\xe9\xb56Y\xa7\xbc(\xc461\xef\xf5\xeb\xf7N\x1f\x85\x0e\xc6\xfd\xd3\xd7o\xf0\xae\x83x\xe3\x1eZ\x01\xe4\x0f\x04Z\xc4\x85\x995\x85\\\xd3\xe7\x14\x08\x1f"\xc2\xe4\x9a\xc4\n\xfa\xe1k\x8fe\x8f\x90H\xdb\x83\x9c2\x84\xfc,\x1f\xce\xd8\xf1\x80\xb7W\xd91/\x02\xcc\xaa\x1dr9\x99~\xf9\xa8l4\xde\xfb@8\xe8\xceji\x0b\xd9\x80;\xc0\x89\xcc*\xbc9\xa6D\x8c\xd4\x1f\xe1\xe4F\xc9\xa8G\xa5\x93,L\x1bX@\x84\xf8\x9e\xe0\x89<65~\xc0\x8d,J\xe3\x1e\xaeP\xabFL+\x8d\xd3\x98<,\x92\xaa\xfc\xfe\xe3\xd2\xc1\x98~i\x8d$\xear3\x85%Q$\xdcVF#\xb5)\x19\xd1L\x8b)\x85\xad\x04f\xd8! NN\x85\xcdG\xa2\x03D,\x9bI\xf8#\x19\xb5LhT\xd9L\x88\x0f\xba5I*8\xe3\\\x1cbN\x93\x1e\xee\x81\xa4&\xef\x98\'\xa1\x83\xf1oFv-\xc4\xa0\x91w\x17J\xac%\xe3#r\xbeE!\x1e\x01\xa5&\xd6\x87q\xe3\x0e\xb5\xd4*\x8a\x87\xe637m\xe4\x03\xd6\x00!\xa4\x819\xf7\xe6i\x9b\xfe\xe9\x05\x9aA|`V\xa80E]W\xd0(\xb5_\xbf\xf1\xa4t0^\xbfaoF\xf9\xd4\x02\xfe\xdb\x12\xaf\xa0\x0c\x98\x8ez\x93\xf5\xc0\x96$\x132\xad\xc0c\x13>\x14\x1f\xe6\x01q\x02\xc1\xe7\x006\x89\xf8\xd2\x9b\x0f\x8e\xd3\x8ee\xd3f\x93\xacK\x13w\xf2d~\x98+\x17\x8e\xde\xfc\xde[O\x83\xcf\xbd\xb7\xe8&\xd4\x99"\x99\x88\'#\xb2c"\xd4Z^\x00\x89\xa4\x08j\xa6h\x0f\xe7d|\x0f\xe2\x81\x84\xd2\xf6 \xe7\xdc!\xc3\x99\xcb\\)\xd8\xb2\xa0\x1a])\xac\'Z#O\xf4iD\xbd\x82bR~\xff\x81\x99\x9f\xfe\xf7_\xef\xbet\xef\xf4A\xeb>|\x81\xffAt \x82,\xa9\x88\x17\xd9\x94 \xad\xec\xe599\xd4bk\x80B&4\x1c\x9f\x16\xfbC3\xc4&\xc9\x82\xbd\x07\xd8\xc3\xd6\x10\x8bdr\x98[7N\xb0_sd\x1e\x9e$\xf3Wr8\x99e\xa3\xec\xd07\x1c\xa5\x1a\xe6\xc0\xa4\xc9ayY\xc6g\xff\xf5Nw\x90\x83\x8f\x8b7\xff\xe6p=(\xff\xed\x8d\xd5G\x97\xad\xc7\x1d\x85;\xc7\xc8ER\xf4\xaa\xa0\x95\xb0G\x19f\xefJn%\x99Pcz\x8e\xdb\x1e\xf2z \x9f\x13\xf2\xa7\x03\x99.\x929\x9c\x19YL6\x02\xb9\xcd\xc9e\xca>\x99\xa3\xf3\xccg\x90S=g\x07\xa5\x9c\x7f|{W\xaew_<\xba\x81LM\xfbp\x96vL\xc7\xe4\xa6\x9d\xb6\xd3\xfc\xe8\xc6\xdd\x97v}\xf3\xf1mq\xb5\xb0\xb7\xe3\x11B\x9fzs6*\xc8\x80U\x81\xcc\x98\x17\xd8\x864\x94\x9c\xba\xf4\x9a\xf3\xea\x12:\x98\xf3\x89\xf5\x83\xf2\xb5\x06\xf9d&\xa6m\xda\xda\xa6\xf3\xcd\xc3\xf9\x06\xc5\xb9\x8e!\x9ddq\xeft{\xa6\xbf\xed\xa510\xcc\xc1\x9e\x1c\xd7\xa5\xc7)\xb4h\x7f\xb8\x9b\xcfz\xdb\xbf\xbaw*\xde\x16\x96\x91\xa3\x04\\L\xfc\xca\x0cHd\xa1\x8b\x91\xf8\xd4\xa4\xb7\xc5\xeeh \xab\xe0\x81\x84\xf0\x0e\x91\x87\xbbu\xb0a,|4{<\x17\xf3\x81y*\x1d\x0f\xae+\x18\xad\x98\x1e\xaf\n\'G7\xb6\xe7yv\x13v\xa7\xb5\x83|0C>\xa6\x03\x0e\xb5\xe1\x96\x84\xed\xd9\xcd\xed_\xbe~Cn\xc62J\xd8\xe7"\xa1\xb1`DL\xc8\x18r%\xc3\x99\xa0\xc5\xee\x00\x85\x96O\xc4\x99\xb4\x9bOHd\x88\x8b\xf2\x98\x0b\x91\xb95\xabR\x16x\xdb\x9e3s5J\xbe\xab8\xbbA\xce\x0c?\xbe\xbd-\xc7\xfb\xa7\x831~\x9d\x10i\xb0\xa6\x13\x92k`Q\x9e\xc8\xde\x83\xf6\xfd\xad\xe6}|\xdb\xddWP\xf4\xe6r6$UQ9Rgz\x95gQ\xc6,\xb0\x0e\x85I\xd8\x0c6"\xcc\xb6\xf3\x91?N6\x8c\xf0\xfb\xcaN\xcdp!\x14\xd3\xb6\xe7\x19\x8d\x0c \xd7\xff\xf9\xeb\xb6\x1c\xdf\xfb\x12VU\xc8\x1av[ \xa1pa\xf7\x9b\x18\xb9\xa9\xf7\xbe\xdc\xf6\xed\xff\xfcU\xfc\xa9\x9c\xd5\xb0\x1e\x89(\x9dL\tQ\xa8E\xf0"\x01m%E\xc2\xcc2\xa6v)\x9f\x1a\x0f\x13\'~_\x89T\x1e\xab\xc5EB\xe98\x8a\xdd\xaaD\xe6\xb6;pX\xc2\xae\xbc\xfa$Y\x98\x8eiG\xed\xc1lp\xcc\xe701\xce\x99\xf6+\xab\xed\xee!\x159c\x01e\xc1\xf6\x04\xcc\'#F\x85\x94lN\x16\xb4\xd4\xa0@Xa$D\x86\xf8X\x83\xb6\xd0!\xfe\x89c\xc4\xf7?\xa1\xfb\x1dc\xa6\xe9LID\x9b\xee@\x16H\x0f\xc7\xcd\x988\xfa\x14\xc1\xa9m\x19\xde}\x91\xec\xa9\xf8Oh\x0fx\xd49\\#\x1f\xa0\x85;V`#\xfc\xff\xee\x8b\xdb\xbeGztb\xeb\x0f\xf1@Z\x95\x10r\xbcF@c4h\x03\x95\xd7 \x90\x15\x19\xe5s\n\xd9\xab\x1d\x06Y.\xce\x86\xc9aNNTpR\x18?\\\xab\rii\xf2:\'\xbcy\xec[\xc7*\xfe\x92\xad\xdbn\xc0\xd9G\xe2\\Ey.p\xed\xe0\x16Y\xb9@\xa6iN\x7f\x86\xd9\xdf\xde\xdc\xf6\xfd++\xba\xb5\x98o\x96O\x1f\x8czUo\xced\x88\xd7\xc8\xab\x0b5)d>\xc2&hj\xcb\xf9\x136\xb7\xf9S\xe33\xf1F*\xce\xc1\xa7\x81\xf7\x1dY*L\n\xef\\\xdb\x9a7\xf29\xba\xb1-\xbf\xdf\xf4\xe0\x8b\x98\xbe\x8b\xf9\x8b\xc1,\xcd\xdd?d\x1cN\xf0\xe9\x9f\xb6}\xff\xc3\x83p\x92\xc6`\xd8\xc4\xc4b\x0f\xbc\xe4\x85\xb4]\x04\x1e\x9b\x84\xddBS\x84\x13\x8e\x04-\xac\x99\r\x96\xdb\xe8\xd0\x7f\xd0\x8fq\x84\xb6\x8fq,m\x0frg\x94\xa57O\xf3\xc35\xd0\xe8\x903\x8b\x88^\x0c\x93\x8bCs\xb6\x0e\xa9\x1e\xfdj[~\x9f\xfe\x19-q;\xf2Z\xe4n\xac\x87|\xa2O\xff\xbc\x8b\x0f\x9a\x93\xf8w\x89,F\x9e?.F\xe4P\x86%P\x19\x05HC\xbdQ\x93\x80Y\x02\x16Q\xbfFH\xef;m3\x03:\xdf\x04G\xa4\xb4Fh\xee\x10y:\x03\x1a\x1d#\x0ea\ts\x0b\xfe\x1aFb\xf5\xe2\x877v\xf1\xb9\x18\x86oF\xfe\x87\x7f\t\xe7\x9f\xf5v\xf11\xf1 G>\xf0\xa7\x8ay\xd0_\x0bG\xeb\x02\xa3,T.\xd6\xa8@)\x81;\x89\xf4\xb7\xf2\x01[\xa0\xac\x84\xc3\x04M\xc2V\x14\'\x17\x08\xb1-d\x8cW\x1b)e\x8d\xf0y\xfd\x0f\xbb\xf8\x10Q)\xd5K\xec!%\xa2\x83\xf5.>7\xdcI\x939\xb5\x8b\xa4\x92\xf3\xd7\x8c\x02"T&\xc0-\x10V\x01S\xc8B\xcf\x1f!Ct|>r\xc6\xca\x9aS\xb9\xd3\x12\x89x0\x0e\xab(6\xb4\xc603\xcbE\xe9\x80I\xb9\xb4;\xf5\xac/\xf1g\x11.`}\xee\xd6\x1a6\x91\xdc31\xfes0\xfb\xf4\xcf;\xfc!\x16F\xee\xf4\x955RJ\xf1KaC&\x15J\xa4\xe6\xd3/\xd5\x1a.\x13\xdb\xa6x\r\xc2#\x14\xb5\x93\xf9\xe1\x8c\xa9\xd0\x9dWf,\x0eLt\x14)q\x16\xc8\x07\xcf\x8d7\x9d\xce\x8c\xd2\xc1:\x8f<\x87\xd8#\xcc};\x9f\xdf\xf4<\xfbbg\x9bk\xe1\xec`\x16u.\xe1\xe3\xbc\xaeR\xc8\x02\t\x89Kj\x91\xf2\xa9\x92*(RK\x0cL\xfb%\xb47\xbc\xf1\xa9\x05\x99\xe3C\x96`6\xb1\xd2\xd0\xf3\xf1\xdf\xc9\x1d=\t\xd3b.\xb9\xc17\'\x1a\xb9\x8e\xfe\xfcK\x88\x0f\xca\x17\xde\xc3\xfa\xc3\x9f\x7f\xf9\xeb\x9fl\xcb\xef\xbf\xffJ\xebh-\xae\xa2\x1a\xe3\x0b\x88/\xdf\x83(_\xf8\xf9\x97\xbf\xf8\xdbO\xfaw_\xda\xf6\xfd\xaf\x7f"\xebmX\x07c{Vg\x8fDR\x1f\xc9\x82Q\xe8,*\x98VR\x845>\x86\xee<-\xd1\xeed\x9e\xe6\x17\\\x1f\x0fJ\xb4\x05\xb8\xa0\xf1\xb9\xdc7\x11I\xf3\xc3\xb5\xb2\xd2z[6_G\xb0G|\xd7pr1(\xa9\x06c\xb0E\x89L\xc4\xa0Q@\xb5\xf3\x87\xc6\xa5\xe7\xf3\t\x17\x94[\x07M`*\xd0\x17_(cd\xd26\xdcr\x14\xa0\x95\xe6\x9eG\xc7\xe8\x11\xb5;\xcf\x91\x8f\xbbY\xbd\xe5\xea\x95UX\x05\xc2\xc5\xf9\x84d\x88\xd0(te\x16\x8a9\x1a\xc8\x873Ls\xca/\xb6\xd9\xb7#/\x06\xb3\xc3\x95p\xb0c\x86\xa8b\rl;L\x88g\x9e/\x9f\xa8\xed8\xb1AdR\x85&)\xa5\xbaM\xe1\x88K\x8f\xcf\x08=\n\x0b\xf2Gv\x1c\x94\x98\x1f\xe6\xaf\xe6\x08\x0b\xf0\'\xcd\xd3\x99\xa3\xc5\xa6\xb8\xd2\xcc\xb8\x05s\xd4~~|\x8c=?d\x10S=!FUP\t%v\x07\xe2p\x9c\xc6\x01R\xb1^9oB)\x91\x8f\xb1\xbc)\xf7\x8e\x01[L[I\xa1Q\x83\x19\x9646\x16"\xca\'\x17>\x18\xc7\xd2\xcb\x9f\xaf?\xbe=\xc9\x9c\xcda\x8b\xa8\'\xe6\x04\x85\xe3b\xc7\x84\x0c\xb9C\x84.\xf2ao\xc4\x1c\xe2\x83,\xc2y\x9a\x0fJ\x1a\x1bG\xe4\x12p86\xb3t\xcd\x94\x94L\xd4\xc1\x99\xe7\xc9\xc7\xc4\xe2\r\xb2`:U@t$&@\x02\xfa\t\xcf\x00\x15h1\xa5,D\x9b\x90\x0f\xb1\n\x85\x0f\xed\xca\xb6,\x8c\xb01\x1d\xcc\x94\x82\xf8\xb09i\x0e\x94VjOz\x0b\x08Q\x1b\x98\x8d\x89Q\x99\xce\xbeA\xfe(\x91*\xa8\xc4\x9b\x89\x89\xc3\xca\xc4\tpI*\xe4\xe2|r\x91 \x1br\x89\xf9\x90%\x90;Q\x00\x02\xc0\x06Hq\xcf\xf9t\xf5\x80\x0c\x99\xa5b\x8a\x99\xb15BF8\xa1O\xd1s\xe5\x139\x7f\xe6\xc4\xc5\xb1B\x8b\xb8U0\x9fD\xe8\x04\x85\xd6\xda\n3\xe5c\x88\x0e\xee\xa1\x99\x8b7\x1d\xe4c\xacE\xc2\xa9\x04\x92\xb3\xe1\x15Z\x87\\\x84\x12\x8c\x0b\xa9\xe89\xfa\x83l\xe8\xacq\xcd"\xcf\xa6\x80]bV<Rc\x13h[\xf8\x84\x99\xe4\xddA\x83 \xe7\x8e9\x16&\x1d\xacM[\xf8\xe4B(\x1f\xac\xc5\x1b\x9f\x0f\x94\xa6\xe4v\xf4\x1c\xfdA2F\xf8\x08%\xa0c\x94We\xc3o[2T\xabQ\x96\x8fi\xab3\xa6Cu\'\xeap\x8f_?\xc4/\x9f\x0fzS"\x1b\xb3R>\xbb\xfdy\xe7\x8d7\xbb\x9b\xf13\x1e3\xf4\x9a\x9fQI\xa3F\xe3_\xff\xc0\xaf\xce\xbf\xf3\xfa\xa5|\xc4\xa0`\x8em\xd3F2\xc8\xacNH\xd8MB&"T &\xb6\x85A|\xc8\x8e6x\x93\x8b)DF\xc6\xf3t&\xe3J\xa7#\x96\x8c\x99\x92\x99\r\x0f\xcc\x1a\xf8`\xe4\\\xef:\xff`M\xa6\xe1\xd7\xc7\xeaZ4\x96\xfdi?\xa3\xfd\x18\xfbt\xae\xdc\xbb\x1f\x9aK\xcb\x9d|\x88\x0c\xac\x1aG\xd6\x19\xac\x99\x92\xcf\xc7\xc4u\x8b\x02\x9f\x11\xd9D\xf5(,\xc0\x1f\x979\xc68j\xabS\x98\xcd`\x9d\xcep\x842hG\xd6\x1e\xfaf\x16\x81?\xd7\xae\xb09D\xa9Lg\x83\xf5\xae\xf3\x0f\x0fR^\x99\xc3m\xcc\x84\xf28-\xcd\x98ys\xdfF^sW\x08=\x80\x8f[\xad\xc6\xcc\x89Y\xdb\xf2\x81~P\x85^\x0cJ\xa2\x85\x8c&\xe1$\x006I\x95\x00\xad\x04g\x91\x8f:\x82t\x88\x00\x9eBZ3\xd3qwh\x94\x0c\xe7VF\\\xcf"\xf1\xc6\x94\x97\xfb\xc3t(\x80\x0f\xfdu\xac\xc4-\xf3\xdc\xdd\x83%\x857F\xee\xe0\xec`v)\x9f1\xdd8\x99\x84\xf1\xbd\xd8\xc4l\x13ZE\xd6\xcc\xc5\x9d9s\xb1\xad\x82)ap/\x8d\xc3\x82\xf6\xecH\xfe\x1d\xc3\xa7\x12\x16r^\xe78\xb1\xc1\xbc\xc0\x93\x15\x92H\xd7\xe2\r\xb4\x84\xd1e|VBc\x86\xfe0\x13\xe8\x95\x10\xca\x83\xf9\x8c\x85\xbf\x9c\xc5\x9e\x80\xe6v\xf31zv\xf4\x0c\x98\xa4cCd\xa0\xddFK\xb1\xc5\xaf\xb8TI=\xe1:\x00\x7f\xc2s\xa0\x83\x84\xa4$o;\x96@\'\xca\x99M\xba\xa6\xfb\xe5\xf1\xb1\x9c\rg \xff\x08y\xcc\xd0\x9f\xe1\x01\xd0\xf1\xc8`\\\xbdr)\x9f2\xa2\x1d"^\xadwP\x12\xf1R)\xc9+t\xeaF=\x04\x9f1\xf3\xc1:\xa8\x90\xc7`5X\xa9=in\xbd\xd1(\x80\x8c\xb4\xc9\x9eBK\xe0\x83<\xda\xe4D\x87\xee\xc9Z\xc3g\x82\xf6\x98\xcd\xe1\x9b\xe7\xbc$\xbb\xb5\xbc\x12@\x8bL\xdau\xfe\xe1\x01\xd0)y-\xfb\x06=\xfe\x1f\x8c\xa7+`\x9e\x93Kc\xe2\xe8\xf3\x19\x0b\x1f\x88t\xb5k\x7f!\xd9F6H\x83K\xa4\xc2\xce\x04\xd4JK\x1eu\x94\xa8U(\x9d@\xe8p\x98\xb6\x1aL\xd6\xa83\x1d\x1e\x1b\xac\x0c\x1b/|\xd2\x95\x1a4\xbcb\xb9\xdc"J\xc2):\x1e\x1e\xec\xe6c\x90N\xa9_F\xd8\xc6@N%\xd2\xa7\xbf\xe5\xc8\x89m\xd1\xbf\xdb\x18_\xcag,L\x89O\x84O,\xd1fB\xcal\x8bA\x96\t\xd4\xe7\xd0\xfb%\xf7\xac%\x1dsl\xe4\x14\xc2H\x9d\x11\xa7d\x8e\xf2\x82\xc8\x07kv\x00\xc9\xa4\xeb\xfe\x15\xc9\x18h\xed:?\xd0foV\xce9\xf0\x06\xf6\x89J\xa1V\xca-1\xaf\x9c\xd8YV\xec\xd1n>\x86\xf9\x8c\xa1\x8e]\xd0(\xd4\xdfC2\xf3m|\x82\x82\xf9\xa4q\xc2\x06\x9d\x13%z\xf1<\x87k\xf4\xc5\xe4\xde=\xe5\x86\t\x94\xdc\x03[\xa4\x85\xf9\xa8+\xd6\x02\xa2\x14\xb1E\x10\xbb\xfdIW\xe0\x900%k\xf8\xdb\x15\xb5WL\x07\xff\xc1\xac\xf4\x8f<CV\x95\xf0\xff\x07\xf9\x83T\x8e \x98\xcd\x11\xb3\x81\x1d\xc6hO\xdd\x1b\x13\x07\x13\xf6\x87\x82Y\x9dC}\xae6\xa5\xecF[=\x91w\xe6[#g\xc5\x1b,1\x7f\xa2\xa7&\xac\x86WR\xe1\xd2\xbd\xf2 >\x98\x1f~\x83_\xf4\x0f\xc4\xa4\x15\xe6\x9f\xae\xc4*\xb2\x86\x8c\x9a\x19\xe5C$\xa5]\x0e\x1e\xc4\x07\xfd\x19\xa7\xd3A\td\x88\x17\xfa\x94\x96X\xa2?H\x01Kj\xcd\x036\xe8<@"\xd8>\xe7>\x1b\x15\x9e\x0b\x8d\x99c\x13y5\xb7\xc9\xf5\x99]\x87/\x9cwx\xe3\xea\xaf\x94\x0c0\x93\x12\xb2\xbe\x84\x8f\xf0`&\\\xc3N@c\x86\xb4\x88\x1d\x99\x03\x7f,#\xe6SJ\xf0\xdf\xa1~0\x1f?LI>\x91C\xec\x162\xe2:\xac\xd2\xb1\x89\x95\x0f\xda\x84\xfe`\x0b\xe9\xf0k<\x16\x96\xce\xcc3\xc7\x95\xa5\xc4\x8cb=\xbca\xd6\xc0gE\x99\xac\x80\xce,\x82<\xb1\xde\xc9\xe7z\x1f\t\xad"\xe13<\xe8\x1fDl\x93\xd8\xd3?\x18^\x89x\x7fb\x81\xffKWL\xe8*\x11\x8c\xa0\xff\x90|\x98\xcb\x91\xd4m;\x12\xb3C\xc4\x05\x98\xa4c\xb2\x06\x03\xfaD\x87\r\xc2(\x88\xc5,\x9d\xc1\xf7\x8eS)\xb7\xc8\xbe\xd3i\xbbpn\x0cc\xe3\xda\x1f\x88\t\x86\xe7\x10\xae\xd8\xc9\x07\x88\xa2_b\x0f1\x89V\xd6\'\xb7\xf7\x8a\xf6-\xe1V\xc8$\xbe\x17u\xe9\x12>%\xf92&\x16\x10\xe9l\xb0\x8abj\xd7\xe80![G\xc2\xa3\x12NEx.NA\xab\xd1@?\xe0\x8e\xdaJH\xcda\x17\xbc3\xaf\x89\x0f\xdc&9\x80\xd6\xe0H)\xebV\xc4\x88\xd6\xee\xe4s\x05\xbf\xec\x1ex|\xbc@\xb7\xe4\x06\x94VY\xe3\xc3\xadY\xba\xbe\xcc\x1f\xe2\x93\x0b\x1f$<N\x97\xdc3\x1b\x84\xa2\xd8@DQ\x14\x07UX\x0b\xe9\x9f#\x9dF\x03\xdc\xc97\x83\xcf\xc6\xa7\x8d\\\xac\xa2u\xe4\xf7KzK\xb9\xefU\x84Y\x01\xa5]\xe7\xbf\xfa+\x9f\x87p\x02\x9b\xe0\xbbu\xf7\x00\xfaD?U\xbf\x80v\xff \x122\x18\xfd\x83tu\xa9?@\x07V\xa0g\xb9e\xe5\xc7\x91\xcf&\xac.\x06\xfa\x14\x08\xa3\xa0\x08\x88\x0f\xe4&\xceD\xd8"\x8f\xf9\x9e\xf0\xect\x8fk\xb2\tF\xf8\x8e\xc9\xa5\x15\xdd\xb4\x90\xa2\x9b\xa7<\x1f\xc8gm\xb9\xac\xb9\xec\x1e\xf4oP\x1b\rb\x1f\xd9\x9f\x15\x12\xe1Z\x82\xeedp\t\x1fv\x8d\x0c\xca\xa5U\x0b\x18\x016\xdf\xc37J\xd1\xa7\x88\xa8D8\x8at"\xa2\xc6\xec\xd2\x98\xf9\xd0N3\xe3\xec)\x89\xff\xac\x7f\x05(\xcc\x94\x11\xfb\xc3~\xc0=\xae\xa9\xc7\xde \'\xcaG\xf3\xdeu\xfek\xbf\xf7\xfd\x11F\xc0\xe7\xda\x1f\x98\x0f\xde\x83\xce\x91\x973rS\xdapJj]\xc2\x87ON\xee\xec\xe0\xc3/\x1a\x141\x1d~\x81\xcb\\\xfdI\xc7\xec\x92\x89LL\xfe\x94\xc6\xe7\x92\xcb=\xe5\xe4\xcf\x8c\xee\x9b\xf8 \x15\xec\xb3?l\x94as\xa4\xe6\x1c\xbb\x07\xbb\xce?\xbcq\x91\x0e\xd2\x06\x7f\xf4kd\xb0\xa4\xba\x94[Qwh\x04y\r\x0fv\xf3!&Dh\xb0\xc2r\x83P\x1c\x1d!\x1f\xf4\xc7\x0br\x88\xf9\x04d\x13\xfa\x13\x9c\x87\xe7a\xc5|\x80\xf5\xcc\xcc\x84\x8f\x9e\x86\xcdq\x1cf\xc3+d;\xdd\xf4\xb5_IFk\xb9\xf9\x99]\x7f\x89?\xca\'Zu\xf7\x81:\xb9\xc3/\x8fF+\xdf\x1e&"\xf6\x94b\x0f\xdc\xd2%|\xa6\xb8.]\x11#\xe4Q\x9a)\x122\x8e\xd0\x91p\x02R\xe2\x91\r\xb6\x06i%\x10@\n\x08!\x1fv\x06\xf6\x99\xd1\xde\xb8{\xc9\x9eG3G\x87OM\xfeh\x16D\x84\xf3\xc4\x16\xdc5\xf7V\x97\xf1\xe9\x1e\x00\x1b\xa0c\xbf[\xf7\xaf(!/J\xb3\xa4\xffa=cB\xe8N\x1f\xbe\xee\xef\xef\xe43\xb6,\xc5\x1bjM\x91\x8f\x99\x9aqT\x8f#\xdf!\xe5\xc3\x16\xa1G\xea\x8f\x12"J\x98?\x1b4\xc3\xfb\x14B+\xe6\x14\xcd\xc4\x97\xb5\xd0\xc3\x1b_\x93\x15Lh\xc5s\xbb\xf9 \x97\xee>Q\xa2\x88\xd6J\tw\x04?\x95NiI-\x85\r\x1b\x05\xcc.\xe1\x83k\x84\x11\xd1\x99Z\x16\xb1A\x8b\x8e\xd0\x1a\xc3\x06m\xf0qt\x1c\xa1F\xc3\xe7\x93\xae\xd3ud\x8d&B\xc4&bf4N\'\x16\x83x\xae\x7f\xe5\xda\x7f0%qbu\t\x9f\xf7\x85\xca\n\t\xf5q=}\xc9\\\\I\xfb\xa3\xcbK\xb6\x99\xcc\xd9\xe7S\x99rxp\t\x9f\xb1\x9c\xddZb\x19\x1d1\x11r\xa9\x1c\xac\x9c7\x11=\xca\x85_n+\x1f\x93\xd3\x9e\\\x96p~\xe5\xb2"F\xab\xfe\x15<3\x07\xb5\xd6\xc8\x88)\x995QYK\xb6\x94\xf9n\x7f\xfad\x0f\xafB\xa2\xf8u_\xa8\xea\xb8Y\xa5\xcc\x9fy,\xb9\xc5\xb3\xf8\xcf\xe1\xf5K\xfd\x99z\x84\xa6\x96\x8c2"g\xcc8-}>\xcc\x03\xdbZ\x86\x95\x89\x9d?\xe2LN\x1e;gVb\xd0\x8c\xcf\xaf}Ki\x85\\\x0c\xb3\x82\xb7\x7f\xa09\xee\xe6C\x8e\xad\x98\x11\xf1]\x1b\xdeE\xfb\x14}\x9c_F\x18\xe0\x0b\x9e\xaa\xbb\xdf?\x80\x1e\xfeu\xf9@>S\xfc\x8a\xea\xa9\xf3H\xfdaB\xf5\x00\xa7\xd8"*\x03kP\xc3>\xe0\xce\x8c\x08\xad\xa8&Frc\xe8\xcf\r\xf4\x1e\xbcb2\xe4\x0ef\x8a\xe3\xccF\xf8\xad8\x87\xdd|\x90\x04\xd2Q\xd7,#\xbf^\x11\x17Gli\xc7qf9<\xb8\x94\x8f3hZ\xf3\xe7\xc8\x8c\x8d\x18D-\x8f\x8e\xeb\xa9I\xf0\xc6\r\xef\xa1\xfd\xf2TL\x16oV\xd6\x1a\x9b\x8b5G\xfc\x89\xa4\xe7\xb2\xc1\xecw\xf3a\xc7\xba\xfb\xc8G\xbe[\x03\xe7\x03G\xcc\x0f\xf6\x0c\xdd\x06\x9b\xf0\x84t\xbe\x07\xf2QB\xcc\xe7H\xf8p\xebH\x08M\xcd\xf8\xa2I\xc8\t\xe9 \x1f\xdf\x1e\xe1S\x0e\xd1\x87\x99\xf0\xa9\x111\x178p\xbf{0|\x9fs\x05\xbb\xc0\x1d\xc8\x1cr\xdfu\xfe\xab\xef\xf7\xafk\xd6\xfd\x83\xbepA/\xf1+\x88}\xcf\x14\xaf\x8e\x96`\xef>\xba\x13\x81K\x0f\xe1\xcf\xd4#4%>G\xc2\x89Y\xc5\x1b\xc4\xe2\x1a\xab\x88(\xd5\xfc\x01B9\xee\xd8?\xa0["g\x9c\'\x1c\xee\x86\x9d5\xc0\x07\x99\xf27x\xfeU\xffFw\x7f\xd7\xf9\xbfz\xfb\x17?\xee\xcb.XGK\xdd\x13\xd9\xc0{\xdd\xfd\x83Y\xe1\xaeT\xe3\xde%p\xda\x7f\xf7\x85\xaf\xde\xbe\x94\xcf\xd4\xf2\xd1\xd6\xd8#s\x04\xe6L\xadS\xc2\xc7\x8c\xd1\x1c\x8e\xefEX\xd6\xed\x11>@\x08\xce2C\xe7\xeb\xde\x08\x1ftc?Z\xf9\xe4\xfcy\x1b\xcb]\xe7\xc7\xb8\x7f\xfa\xe1\xed\xab7,\xe9\xa5\xb2\xe8\x1e\xc4\xfb\xfc\x07b\xb5\xef\xf1\x81@>\xc3\xeb\xe5\xed\xfb\xa7\x97\xedm\x99,\xb1\xa4\xef\x90\x18\xbb\xa2\xac\xa6\x96\xcc.\x7f\xd0\xa0\xe8"\x1f\xb9Sp\x87\x18\t\x9f\xee\x81\xb5\xa9\xec_w\xe6\xd0\x9d\x1ft\xc9\x02q\xc9\xb2\xbb,\x07\x8eOz?\xf8=\x12\xe8_\xef\x939\xb1\x10\x82\xfeu\xb3r| \x96\xd8\xba\xf6\xfe\'\xbd\x07\xef\xca\xfe\x18\xa1\xc4|L\x99.\xadI8\x8a\xfeL\x85\xcb\xd8\x06\xd3\xb2t.\xf2\x01B@\x05H\x94\x96\x07\x93X\x13\xa1Z`.\xca\x83\xea\xf2Q\xf9`|vsl\xfa\xd7\xd5\x16\xb6\xa7\xbfo\x96z7\xb2\xdf\xf2U\xf3\xd9\xcd\x87\xdb\x11\xbe-\x8dOCx\x19\xe2"\x16\x8d\x81\xdf\x91\x8d\xb1Pr\x0eE\xf86\xb6<\x9c%\xba\x03\xbb\xce\x94\x91YC\xb0\xe9|\xe2%\x8f#!\xbe_"\xea\xe5\xd4\xdd\x7f\xb8l0V\x7fy\xf3\x03!\x846^\x87\xba\xe3\xb3~\xf3\x83\xd5_\x1e~7\xe6\xb3AH\xa8\xa4K&D\xf6 \x8f#4\xc9\x8c\xadE1\xf1b{\xe2K\xf8P\xa03\\r\xee\x92?\xb2X\x1a\xb5f\x15\xef\x0b\xa1\x15f\xc8_\xa2\x07\x0f\x9f\x11\xc6\xdd\x97\xde\xf9\xb2\x7f\xa0\x1eu;\x10d\xd3\xbb/\xdc}\xe9\xd1v\x92\xf3\xf9|\xa6\x92\xbdm\x03\xa7R\ty\x0eQ\xa4Su\xa8\xb1\xf5\x11\x16j\x0e\xb8\x83\x96\xf8\x8c\x9c?\xec\n\x8d.\x99\xde\xf0\xc6\xf0\xfd\x98\xf2|\xb4\xac0\xee\x9d\xbe\xfb\xe3\xfe\r!\xb4\xdf\xbf\xfe\xee\x8f\xbfz\xfb\xd1w\x81\xb3a0\x8b\x05\x99]\xd6XM\xd1\x9ftii\x1dm\x89\x9dt\xd0 b3\xa3z\xa6\x9c \xca\xc8QZb\x06@\xe7\x00K\xe4\xe5\x08\x1a\x19\xfd\xedG\x8f\x9e\xdb\xff\xde\xbd\x7f\xfa\xe1\xed\xe1\xf5\xab\xb7>\xbc}\xff\xf4q\xbe?\xfbH\xf8P\xfeDgz!\x80\x8f\x91\xb6)\xcdt+\xa1\x9d|,!\xe2\x83\xf9F%\x12\x91 \n\xfd\xeb\xfd\x03"\xb1o\xe9\xc9\xac\xde>\x8e\xfd\xf0\xf7\xbf\xf9\xe9\xe3\xe4\xf8\xb8\xf1\x9b\x9f\xfe\xe0wF\xcf\x89\\\x96f\x1b\xa51\x042q=\xdf\x1b(\r\xbc\x8d\xc6\xa5|l0\x1f\xfc#\xfdEh \x01C\xd6\x98\r>\x11Q\x13\xbb\xa0\xbc\xf6\xfe\'\xbd\xfb\xcf\x9c\xcc\xfd\xbb\xbf\xfe\xd3\xd5[p&<\xc3\x82\xce\xba\x1c\xee\xf7;uo\xc8\x155\x87\xf8\x98i\x8d\x8e%t9\x1f%dJ"R\x12\x9f\xd2,\xfb\xc4\xc4\xe3\xb1b\x1eB\x0f"\xde\xd7\xf1\xee~L\x0c\x91\xd1\xf0z\xf9\x93{\xa7\xcf\x8a\xcd\xbd\xd3\xf2\xf6\xf0\x98O\xd0\xed`i\x16fI\xa7]\n\x99\x85\xf0\xa9\xd1\x02\nc3\xdd\xa0#O\xa3\xf1@>S\xcf"\xf25]\r\xf7\xb1Mn0\x85e\xcd\x1d\x8a\xfeu\x9c\x8f\xc9\x9fHL\x02\xcb\xe0\xb4\xff\xfe\xfd\xaf\xdez\xdal\xbez\xeb\xdd\xef#\x07\xbe\x1d\x83\xee\x10\x1b\xack\x01l|:\xd4;\xd9`\xf3#\xcb\xe7\xa8\xd1x\x08B%\xedU\xd2\x7f\x85Q$\xe70K6\xc7X\x7f\xe4\xfe\xf6\xbb\xc7D\x0f\xc6\xc1%\x9a#F\x1d~\x7f\xf6\xc5\x1f_|Zl\xfe\xf8\xe2\xcf\xfe\xb3\xdb\xe1\xd3t;\xc3[X\x0f\xafci\x16p\x82\x05\xce\x11-\xe2\x03-\xa4\xb4L\x97LG\xf9\x98:\xa5\xc8\x00\xa7\xc6C<\xc4`\xaa\x16\xf1\xfd\x10\x9f\xa9\xa3Q\x0f\xc3\xdcl\xe9\xc6\x89\xd01\x12\x8a;\xdd\xce\x1b\xff|\xf6\xd1\x93\xb29\xfb\xe8\x8d\x7f\xeev\xcc\xd2E\x7f\x1f\xfb\xc8\x84\xc7\xe1\xbf\xc4\xc6\xda\xc4\xd6,\xd8#\xca\x8d\x89l\xf0\x01\x8b\x1e\x8a\x0f\x184\xf5\t\x89G\xf0\xf7\xfe\xb1\xf2\xa93\xea\xee\xa3\xe9:\xd7g\x8f\x96|\xde\xee\xfe\xf0\x16\xf8\xc3\x01\xb4^M>\xbb\xf9\xb8l>\xfb\xe9\xabI\xac{)\x0b\xfc\x0b\xb3\xa0?\xb27}Gp\x81d\xa2\x93a\x87s"{\xf0\xd5`:?zx:L\x08\x19\x99)yS\xf2M\xe0M\xa9C\xdd}\x9f\x90\x9e\x95l\xe9\x0c\xaf\xe3l\xdc\x89%\x0b\x1c\xf3\x02z\xd7~w\xfaw\xf7\x1f\x89\xcc\xfd\xbb\x9f\xfc\xdd\xb5\xdf1\xe1n\x8d\x90!B\x18p\x92E\xdc!\x1e\x0b\xa2\xa4t\x16D\x05\x98\x88AD\x08\xda\'\xc6\x122G\x8fB\xc7\xf2a\x8b\x90\xc14b\xfa\x0b%\xa4\xb7g\x96\xbe+\xe4\xcb\xfbL\xaf{\xdc=\x8e;l^\xb7\x13\xb7\xb1\x04\xb7\x84\xd2\xd5[\xe5\xed\xfb\xa7\x0f\xc5\xe6\xb4\xbc\r\x0e\xee\xdb\xe8\xd4\xa3\xcfl\xe8/\xd1\x82\x8986\xc8\x8ah\x10\x1f\xe4\x81T\x8c\x1at$\x94\x1e\x91O\xa3a\x94\x8b\xe3\xc4\xec\x85\x90\x91\x17\xedVb\xb1w\xa3t\xab\xc7X\xaaI\xf1F^1\xd0z\xf7_\xbez\xeb26_\xbd\xf5\xee\xbf\x10\xd3\xfd\xee\xb1\xdaW\x0f\xb3\x00c\x8f\xc9\x97\xc5\xf6\xc0[\x85\x98\n\x1dls\x8d\xc4\xc4!s\xd2x\xc4\xc7\x12Y\x18%3\xf5(M\xf1\xa6\xd0h\xbc+n3\x156\xaa\xbf\xdf\xdfWR\x8e\x8d\x10\xcamn0;\xbc\xf5\xce\x17w_\xdc\xc6\xe6\x8f/\xbe\xf3\x85G"\xdf\xca\xa7M~\x10\x1d\xa6u\x91\x0e\xd9\xa3=\xe1c\xa6\xfdN\xba\x8c,\x9dG\xe7\x83\x84L\x8d\x8a\x1f\xc6rQ\xa7\xa3\x05\xd3\x89\x96\xca\xc8Xb\x9cI\xb4\x88\xdb\xcc\xa8\x7f\\\xcf\xb2\x7f\xfc\xe6\x7f\x9e\xfd\xc5gs\xf6\x977\xfeC\t\xd4\xd6\xe6u:\x18u\x1e\xd8\x97\xf19\x04\x8f\x82)?\xb8\xd5\xef@\x1fY\x10\x1f*m4\x1e\xeb\xa9ysr\x81\x0fQ\xe1\xfb\x8b\xe4\xf6\xc0(\x08>\xbd\x92\xaae#\x19\xc7v\x0c\x99\xf1\xf8\xab\xc9g?E6\x9f\xdd|\xf5\x9f\xe2N\xec\xd6(\x99:\x9b\x8e\xe5\xe0\x9d\xc5\x1b\x99{\xaf\x0b%\x84t\xe6OFG\t\x89\x9f\xc2Jy86|\xb6>z\xd0\xf1\xcda\xef\xa1\xb7\x00_\xda8\xdb\xa7\x0c\xa3\x05\x11j\x13\xd3\xb6\xe7\x07\xb4\xaf\xad\xaf\xad\x89D\xbb\xeeH\xff\x18\xf7\x88\x91&\xcd\xc4\x1e\x17\xd9\xa3\xed\x1b\x14\xcd\xa3\xb9rJ\xe1l}j\xc3\xf9N\x84\x19\xc7I\xf4Dt\x1a\r\xa3|`\'2\xc8\xf2\x88<6\xda\xef\x1f\x13\x1f9%Y\xd5f\x1a\x94c\xde\xc7\xbc)G\xff\xedz\xb5\xe6\xba=xG\xc7\x83_\rGG\tDs\xb6\x87\xc6\xe6T\xcf7\x02x5\x1aOFH\xd8P\x98\rw\x94\x91Y\xd4g\x94\x90rbW(\x1b\xa1T\xcf\xad\x1e\xf1\x8e\xbe7\x9e\xbb\x11|\xfbm\xde\xd5\xcc\xb9\xe4\xe0\x96\xfb\x9bg\x8e\xd29i<\xf1\xe3\xf8\xe0\x1d@=g\x7fa\xdcR\xda\xac\x85\x89\xdc9ga\xef\xde\xde<\x8e\xf4\x8f\xe3\xad\\\xe2v\xb7\xfd\xb0\xfc\xfc "\xb1\xc7\x80mZH{\xc3\x9f\xc6Sy\x80\xf3\x02Y\xb3A\xfc?\xe4D\x94\xb0\xb4\x1eE\x1b&\xb15\xce\x14e$\xb4\xc4%\xca7\xee\xc6\xb1\xf8\x10?2\x1d\xd9\xc1\x8d\xc4\x1c\xe2Q\xac\xa5s\xeb\xe9\xd1\xc1\xe7j\x8et\x8c\xf2Y\x88M5BWgl\x0b3\xe2\xfb\x8a\xa4\xc4\x0c|N\xb82\xb6|\\Vq\xdc\xad\x11\xc2}$W\x7f]\xdem?06\x08\xb9x\xfat\xf0\x89N8\x88\xc6\t\xff\xc17\x888(\x9d\xb9\xce\xbbU\xc8\xc8\xe7\xa3,\xd5\xa8n\xdc\x1fw\xe3h\x8e\x84b%\xd3\xa6>\x8e\x089\xcf\x9e\xb8k\xc7\xec\xc8\x05:\xe4L\xad\xf5l\xe8\xd4\t\xd9\xccO\\\xf6l\n\x19\xb3p\xdc\xea\xf38\xe7g\x19#\xa3\xb9\xf4\xf8\xfcc&\x89#D&\xc6~\x0c%fo\xf4\xfbX\xe9D53\xbam\xebc\\7\xc6o=\x1b:L\x08\x99\x10#\xf1(\x9aD5\n\xca\xa6\xc6\xc4\x92b\x83\xa2E\xdc\x8e\x9d\x07m\xbeO>=\x7f\x15sF\x94=\xf3\xe2\xec\xd9$/\xe3\xf6\xd5\x997\xdb\xde\xe6\xcff<;:\xbeCH\xc6H\xe6\x8e\x90\xdf\x037(O\x7f\xd6f\x11\xc7\xb1f\x8c\xab8_l\xc5\xec\x05\xb4\xfby?\'6J&\xb6=/\xfac\xd9S\xe8]\xce\x86\xf94\x9e\xe9\x03\xe6L\x80M\x85\xe6\x98y\xbf\r\xad\x9a\'.\xf8\xaep<\x8e\xd5\x0b\xa1\x14+!\xa6\xa3\x992\x1dg\x88\x12\xd11\xcb5\xde \xe5\xb3i\x0b\xb5\x1d\xd1x\xe6\x0f\x93\x11\x1e\x15\x10\x12;\\\xf8}\xe6\xa2,"K\xe7\xeal\x98S\xde\xf6\xc6\xdd\xd3\xf5x\xc4\xb5\xec\xe2K\xdd\xc0\x9d\x86y\xbf\xbd\x9bO\xe3ky\x94\x8d\xbc\x1e\tm\xe3\xfdC\xafB&l\x0c\x96|nl\xc5\xf1p\xdc\x1f\xd7Y\xe0Z\x9fQ\xb7f\x8d\x99w\xe3\x87\x89a\xd9o?_:\xec\x10\xb31\x15\x95D\xc2w\xc7\'\x15y\x0e\xb9Ly\x84\x1f^\xb7i\x87\xf1V\xe8\xfa\x87\xb2\xe8\xb9\xd3\xe1\xc7T\xfd\xb6P\x12w\x1c\x15#\x94\xb0\xc5\xf9\xb35j\x8c\xa3\xb5;\xd7\xa8fL\xbc\xd1\x7f@\x1c\xd5[\x8d\xe7\xf2\xa0Eh\x10\x85R"\xa3\xe8\xfe\xc9/\xc8\xb3\x8a#nAD\x06z]\xcbHI\xc1\x1a\xe9\xe3\xf74\x1e\xa9E\xea\x12\x8f\xf3.\x0f\xb4H\xf8\xf4\x8f\xb0\xd5xn\x0f\x10\xaa\x90\x92\xd83!\x9b\x94Xe$8g C9n\x0ba\x16\xd1|\xc4\x81\xcc\x98M$;\x08-\x9aU~\x1a\xfd\xa3]\xac\x1a\xcf\xf9AO"\xc9\x81\xe98*\xae\x8d3\xe8\x0e\xe6\x8568\x03b6\x02n:\x8e\xc8\x8c(f\x021~\xed[\xd4U{8\xb6\xf8\xc2\xa4\x1c\xab\xc67\xe4\xf1\x9c\x99;.\x91\xc7IIa\xee\x9cu4\xc7\xb5\x94\xaf\xe7\x0c\xcc\xd9\xfc\xf9\x1b!\x11\x19\xa6\xc55\xee\x11\x01\x87h\x975\xdf\x1c6\xfcD\x93\x9a-\x17j\x9de_\xb0\xc61)\xa3\x8b\xe1v\x13\x87d\xac\x1b)!k\x91\xbe\xb1O\xab\xf1\r|\xa2\r\x16\xa6\xea\x8f\x8duHo\x9d\xf3\xa3\xd1\xf9&\x13\xcd<\xb6k\xea\xa4\xa2\xca\xf9c\xdd\xb2\xfe\t\xc9o$\x1b\x9f\x91#\x14\x89#\xbeKu\x82\xcaF\xdb\x9a{T9\xb3\xd4\x9a\xc8#\xe3\x98\xbb\xaf\xf1m|\x0b\x1e\xc7#\x9205\x07\xfc\xd9X\xf2\x8b\xcekT\xcf\x95\x03\x8e\xf4/\xb0ql}\xc6\x8do\xd1\xe3\xfb2<\xda\xa4\xc2V9Gd\xed9P\x82W\x99R\xfb<\xaa\xcc\x96\x88<JX6\xbe\x95\x0fgx1\xb7\xa8Vs\x86\xd4;\xf7\xac;\xb7\xcc*\xb7G$\xa69J\x8do\xfd\x83V`D\x17\xc8D\x9e\x07\x1e\x93*\x9aDD\x86\x8dr\x94\xa3"*L!\xf5y\xe3;\xf5\x10\x9fskG\xe59\x83\xc1<\x94\xd3D\xfa\xc4\x01\xcb\x08\xa9L \xa8\xdd\xf8\x0e?uo\xa8v\x8e\xa8%\x13\xb1\xe4\xbcN\xa9\xf1\xff\xeeA\x1e\xdd\x08\xb9t#\xa8+\x1b\x85!F\xcf\xfb|\xff\x07'
-
-    return bytes()
diff --git a/core/src/trezor/res/space.toif b/core/src/trezor/res/space.toif
deleted file mode 100644
index 3ede7a6298..0000000000
Binary files a/core/src/trezor/res/space.toif and /dev/null differ
diff --git a/core/src/trezor/res/swipe.toif b/core/src/trezor/res/swipe.toif
deleted file mode 100644
index de5920b8f3..0000000000
Binary files a/core/src/trezor/res/swipe.toif and /dev/null differ
diff --git a/core/src/trezor/res/swipe_left.toif b/core/src/trezor/res/swipe_left.toif
deleted file mode 100644
index 0eb06d004a..0000000000
Binary files a/core/src/trezor/res/swipe_left.toif and /dev/null differ
diff --git a/core/src/trezor/res/swipe_right.toif b/core/src/trezor/res/swipe_right.toif
deleted file mode 100644
index 9c3e3d1c9a..0000000000
Binary files a/core/src/trezor/res/swipe_right.toif and /dev/null differ
diff --git a/core/src/trezor/strings.py b/core/src/trezor/strings.py
index de8637ff23..58918f5479 100644
--- a/core/src/trezor/strings.py
+++ b/core/src/trezor/strings.py
@@ -21,7 +21,7 @@ def format_amount(amount: int, decimals: int) -> str:
     return s
 
 
-if False:
+if False:  # noqa
 
     def format_ordinal(number: int) -> str:
         return str(number) + {1: "st", 2: "nd", 3: "rd"}.get(
diff --git a/core/src/trezor/ui/__init__.py b/core/src/trezor/ui/__init__.py
index e2defdc00c..9b93df79a4 100644
--- a/core/src/trezor/ui/__init__.py
+++ b/core/src/trezor/ui/__init__.py
@@ -4,7 +4,7 @@ from micropython import const
 from trezorui import Display
 from typing import TYPE_CHECKING, Any, Awaitable, Generator
 
-from trezor import io, loop, res, utils, workflow
+from trezor import io, loop, utils, workflow
 
 # all rendering is done through a singleton of `Display`
 display = Display()
@@ -50,10 +50,6 @@ if utils.EMULATOR or utils.MODEL in ("1", "R"):
     loop.after_step_hook = refresh
 
 
-def rgb(r: int, g: int, b: int) -> int:
-    return ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | ((b & 0xF8) >> 3)
-
-
 # import style later to avoid circular dep
 from trezor.ui import style  # isort:skip
 
@@ -91,50 +87,15 @@ def backlight_fade(val: int, delay: int = 14000, step: int = 15) -> None:
             display.backlight(val)
             return
     current = display.backlight()
-    if current > val:
+    if current < 0:
+        display.backlight(val)
+        return
+    elif current > val:
         step = -step
     for i in range(current, val, step):
         display.backlight(i)
         utime.sleep_us(delay)
-
-
-def header(
-    title: str,
-    icon: str = style.ICON_DEFAULT,
-    fg: int = style.FG,
-    bg: int = style.BG,
-    ifg: int = style.GREEN,
-) -> None:
-    if icon is not None:
-        display.icon(14, 15, res.load(icon), ifg, bg)
-    display.text(44, 35, title, BOLD, fg, bg)
-
-
-# Common for both header functions
-MODEL_HEADER_HEIGHTS = {"1": 12, "R": 15, "T": 30}
-MODEL_Y_BASELINES = {"1": 10, "R": 11, "T": 22}
-
-
-def header_warning(message: str) -> None:
-    height = MODEL_HEADER_HEIGHTS[utils.MODEL]
-    y_baseline = MODEL_Y_BASELINES[utils.MODEL]
-
-    display.bar(0, 0, WIDTH, height, style.YELLOW)
-    display.text_center(
-        WIDTH // 2, y_baseline, message, BOLD, style.BLACK, style.YELLOW
-    )
-
-
-def header_error(message: str) -> None:
-    height = MODEL_HEADER_HEIGHTS[utils.MODEL]
-    y_baseline = MODEL_Y_BASELINES[utils.MODEL]
-
-    display.bar(0, 0, WIDTH, height, style.RED)
-    display.text_center(WIDTH // 2, y_baseline, message, BOLD, style.WHITE, style.RED)
-
-
-def get_header_height() -> int:
-    return MODEL_HEADER_HEIGHTS[utils.MODEL]
+    display.backlight(val)
 
 
 # Component events.  Should be different from `io.TOUCH_*` events.
@@ -328,7 +289,7 @@ class Layout(Component):
 
     def _before_render(self) -> None:
         # Before the first render, we dim the display.
-        backlight_fade(style.BACKLIGHT_DIM)
+        backlight_fade(style.BACKLIGHT_NONE)
         # Clear the screen of any leftovers, make sure everything is marked for
         # repaint (we can be running the same layout instance multiple times)
         # and paint it.
diff --git a/core/src/trezor/ui/components/common/confirm.py b/core/src/trezor/ui/components/common/confirm.py
deleted file mode 100644
index d8f247fd93..0000000000
--- a/core/src/trezor/ui/components/common/confirm.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from typing import TYPE_CHECKING
-
-from trezor import ui, wire
-
-import trezorui2
-
-if TYPE_CHECKING:
-    from typing import Callable, Any, Awaitable, TypeVar
-
-    T = TypeVar("T")
-
-CONFIRMED = trezorui2.CONFIRMED
-CANCELLED = trezorui2.CANCELLED
-INFO = trezorui2.INFO
-
-
-def is_confirmed(x: Any) -> bool:
-    return x is CONFIRMED
-
-
-async def raise_if_cancelled(a: Awaitable[T], exc: Any = wire.ActionCancelled) -> T:
-    result = await a
-    if result is CANCELLED:
-        raise exc
-    return result
-
-
-async def is_confirmed_info(
-    ctx: wire.GenericContext,
-    dialog: ui.Layout,
-    info_func: Callable,
-) -> bool:
-    while True:
-        result = await ctx.wait(dialog)
-
-        if result is INFO:
-            await info_func(ctx)
-        else:
-            return is_confirmed(result)
-
-
-class Pageable:
-    def __init__(self) -> None:
-        self._page = 0
-
-    def page(self) -> int:
-        return self._page
-
-    def page_count(self) -> int:
-        raise NotImplementedError
-
-    def is_first(self) -> bool:
-        return self._page == 0
-
-    def is_last(self) -> bool:
-        return self._page == self.page_count() - 1
-
-    def next(self) -> None:
-        self._page = min(self._page + 1, self.page_count() - 1)
-
-    def prev(self) -> None:
-        self._page = max(self._page - 1, 0)
diff --git a/core/src/trezor/ui/layouts/common.py b/core/src/trezor/ui/layouts/common.py
index 7f068a9bac..478134ea78 100644
--- a/core/src/trezor/ui/layouts/common.py
+++ b/core/src/trezor/ui/layouts/common.py
@@ -5,12 +5,16 @@ from trezor.enums import ButtonRequestType
 from trezor.messages import ButtonAck, ButtonRequest
 
 if TYPE_CHECKING:
-    from typing import Any, Awaitable
+    from typing import Any, Awaitable, Protocol
 
     LayoutType = Awaitable[Any]
     PropertyType = tuple[str | None, str | bytes | None]
     ExceptionType = BaseException | type[BaseException]
 
+    class ProgressLayout(Protocol):
+        def report(self, value: int, description: str | None = None) -> None:
+            ...
+
 
 async def button_request(
     ctx: wire.GenericContext,
diff --git a/core/src/trezor/ui/layouts/homescreen.py b/core/src/trezor/ui/layouts/homescreen.py
new file mode 100644
index 0000000000..0ca2c462da
--- /dev/null
+++ b/core/src/trezor/ui/layouts/homescreen.py
@@ -0,0 +1 @@
+from .tt_v2.homescreen import *  # noqa: F401,F403
diff --git a/core/src/trezor/ui/layouts/tr/__init__.py b/core/src/trezor/ui/layouts/tr/__init__.py
index ca61dea6e2..70848394a8 100644
--- a/core/src/trezor/ui/layouts/tr/__init__.py
+++ b/core/src/trezor/ui/layouts/tr/__init__.py
@@ -2,10 +2,10 @@ from typing import TYPE_CHECKING, Sequence
 
 from trezor import io, log, loop, ui, wire, workflow
 from trezor.enums import ButtonRequestType
+from trezor.utils import DISABLE_ANIMATION
 
 import trezorui2
 
-from ...components.common.confirm import is_confirmed
 from ..common import button_request, interact
 
 if TYPE_CHECKING:
@@ -14,7 +14,15 @@ if TYPE_CHECKING:
     ExceptionType = BaseException | Type[BaseException]
 
 
-class _RustLayout(ui.Layout):
+if __debug__:
+    trezorui2.disable_animation(bool(DISABLE_ANIMATION))
+
+
+def is_confirmed(x: Any) -> bool:
+    return x is trezorui2.CONFIRMED
+
+
+class RustLayout(ui.Layout):
     # pylint: disable=super-init-not-called
     def __init__(self, layout: Any):
         self.layout = layout
@@ -31,6 +39,7 @@ class _RustLayout(ui.Layout):
         button = loop.wait(io.BUTTON)
         ui.display.clear()
         self.layout.paint()
+        ui.refresh()
         while True:
             # Using `yield` instead of `await` to avoid allocations.
             event, button_num = yield button
@@ -41,6 +50,7 @@ class _RustLayout(ui.Layout):
             if msg is not None:
                 raise ui.Result(msg)
             self.layout.paint()
+            ui.refresh()
 
     def handle_timers(self) -> loop.Task:  # type: ignore [awaitable-is-generator]
         while True:
@@ -50,6 +60,7 @@ class _RustLayout(ui.Layout):
             if msg is not None:
                 raise ui.Result(msg)
             self.layout.paint()
+            ui.refresh()
 
 
 async def confirm_action(
@@ -60,15 +71,15 @@ async def confirm_action(
     description: str | None = None,
     description_param: str | None = None,
     description_param_font: int = ui.BOLD,
-    verb: str | bytes | None = "OK",
-    verb_cancel: str | bytes | None = "cancel",
+    verb: str = "CONFIRM",
+    verb_cancel: str | None = None,
     hold: bool = False,
     reverse: bool = False,
     exc: ExceptionType = wire.ActionCancelled,
     br_code: ButtonRequestType = ButtonRequestType.Other,
 ) -> None:
-    if isinstance(verb, bytes) or isinstance(verb_cancel, bytes):
-        raise NotImplementedError
+    if verb_cancel is not None:
+        verb_cancel = verb_cancel.upper()
 
     if description is not None and description_param is not None:
         if description_param_font != ui.BOLD:
@@ -80,7 +91,7 @@ async def confirm_action(
 
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_action(
                 title=title.upper(),
                 action=action,
@@ -108,7 +119,7 @@ async def confirm_text(
 ) -> None:
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_text(
                 title=title.upper(),
                 data=data,
@@ -129,7 +140,7 @@ async def show_success(
 ) -> None:
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_text(
                 title="Success",
                 data=content,
@@ -158,7 +169,7 @@ async def show_address(
 ) -> None:
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_text(
                 title="ADDRESS",
                 data=address,
@@ -181,7 +192,7 @@ async def confirm_output(
 ) -> None:
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_text(
                 title=title,
                 data=f"Send {amount} to {address}?",
@@ -208,7 +219,7 @@ async def confirm_total(
 ) -> None:
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_text(
                 title=title,
                 data=f"{total_label}{total_amount}\n{fee_label}{fee_amount}",
@@ -234,7 +245,7 @@ async def confirm_blob(
 ) -> None:
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_text(
                 title=title,
                 data=str(data),
@@ -248,10 +259,6 @@ async def confirm_blob(
         raise wire.ActionCancelled
 
 
-def draw_simple_text(title: str, description: str = "") -> None:
-    log.error(__name__, "draw_simple_text not implemented")
-
-
 async def request_pin_on_device(
     ctx: wire.GenericContext,
     prompt: str,
diff --git a/core/src/trezor/ui/layouts/tt_v2/__init__.py b/core/src/trezor/ui/layouts/tt_v2/__init__.py
index d3c653dd6d..bb98d0642d 100644
--- a/core/src/trezor/ui/layouts/tt_v2/__init__.py
+++ b/core/src/trezor/ui/layouts/tt_v2/__init__.py
@@ -12,7 +12,7 @@ if TYPE_CHECKING:
     from typing import Any, Awaitable, Iterable, NoReturn, Sequence, TypeVar
 
     from trezor.wire import GenericContext, Context
-    from ..common import PropertyType, ExceptionType
+    from ..common import PropertyType, ExceptionType, ProgressLayout
 
     T = TypeVar("T")
 
@@ -24,7 +24,13 @@ CANCELLED = trezorui2.CANCELLED
 INFO = trezorui2.INFO
 
 
-class _RustLayout(ui.Layout):
+if __debug__:
+    from trezor.utils import DISABLE_ANIMATION
+
+    trezorui2.disable_animation(bool(DISABLE_ANIMATION))
+
+
+class RustLayout(ui.Layout):
     # pylint: disable=super-init-not-called
     def __init__(self, layout: Any, is_backup: bool = False):
         self.layout = layout
@@ -42,6 +48,15 @@ class _RustLayout(ui.Layout):
         msg = self.layout.request_complete_repaint()
         assert msg is None
 
+    def _paint(self) -> None:
+        import storage.cache as storage_cache
+
+        painted = self.layout.paint()
+
+        ui.refresh()
+        if storage_cache.homescreen_shown is not None and painted:
+            storage_cache.homescreen_shown = None
+
     if __debug__:
 
         def create_tasks(self) -> tuple[loop.AwaitableTask, ...]:
@@ -91,7 +106,7 @@ class _RustLayout(ui.Layout):
                     (io.TOUCH_END, orig_x + 2 * off_x, orig_y + 2 * off_y),
                 ):
                     msg = self.layout.touch_event(event, x, y)
-                    self.layout.paint()
+                    self._paint()
                     if msg is not None:
                         raise ui.Result(msg)
 
@@ -121,11 +136,11 @@ class _RustLayout(ui.Layout):
         def create_tasks(self) -> tuple[loop.AwaitableTask, ...]:
             return self.handle_timers(), self.handle_input_and_rendering()
 
-    def _before_render(self) -> None:
+    def _first_paint(self) -> None:
         # Clear the screen of any leftovers.
-        ui.backlight_fade(ui.style.BACKLIGHT_DIM)
+        ui.backlight_fade(ui.style.BACKLIGHT_NONE)
         ui.display.clear()
-        self.layout.paint()
+        self._paint()
 
         if __debug__ and self.should_notify_layout_change:
             from apps.debug import notify_layout_change
@@ -143,7 +158,7 @@ class _RustLayout(ui.Layout):
         from trezor import workflow
 
         touch = loop.wait(io.TOUCH)
-        self._before_render()
+        self._first_paint()
         # self.layout.bounds()
         while True:
             # Using `yield` instead of `await` to avoid allocations.
@@ -154,7 +169,7 @@ class _RustLayout(ui.Layout):
                 msg = self.layout.touch_event(event, x, y)
             if msg is not None:
                 raise ui.Result(msg)
-            self.layout.paint()
+            self._paint()
             # self.layout.bounds()
 
     def handle_timers(self) -> loop.Task:  # type: ignore [awaitable-is-generator]
@@ -164,12 +179,25 @@ class _RustLayout(ui.Layout):
             msg = self.layout.timer(token)
             if msg is not None:
                 raise ui.Result(msg)
-            self.layout.paint()
+            self._paint()
 
     def page_count(self) -> int:
         return self.layout.page_count()
 
 
+def draw_simple(layout: Any) -> None:
+    # Simple drawing not supported for layouts that set timers.
+    def dummy_set_timer(token: int, deadline: int) -> None:
+        raise RuntimeError
+
+    layout.attach_timer_fn(dummy_set_timer)
+    ui.backlight_fade(ui.style.BACKLIGHT_DIM)
+    ui.display.clear()
+    layout.paint()
+    ui.refresh()
+    ui.backlight_fade(ui.style.BACKLIGHT_NORMAL)
+
+
 async def raise_if_not_confirmed(a: Awaitable[T], exc: Any = ActionCancelled) -> T:
     result = await a
     if result is not CONFIRMED:
@@ -185,19 +213,15 @@ async def confirm_action(
     description: str | None = None,
     description_param: str | None = None,
     description_param_font: int = ui.BOLD,
-    verb: str | bytes | None = "CONFIRM",
-    verb_cancel: str | bytes | None = None,
+    verb: str = "CONFIRM",
+    verb_cancel: str | None = None,
     hold: bool = False,
     hold_danger: bool = False,
     reverse: bool = False,
     exc: ExceptionType = ActionCancelled,
     br_code: ButtonRequestType = BR_TYPE_OTHER,
 ) -> None:
-    if isinstance(verb, bytes) or isinstance(verb_cancel, bytes):
-        raise NotImplementedError
-    if isinstance(verb, str):
-        verb = verb.upper()
-    if isinstance(verb_cancel, str):
+    if verb_cancel is not None:
         verb_cancel = verb_cancel.upper()
 
     if description is not None and description_param is not None:
@@ -208,12 +232,12 @@ async def confirm_action(
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.confirm_action(
                     title=title.upper(),
                     action=action,
                     description=description,
-                    verb=verb,
+                    verb=verb.upper(),
                     verb_cancel=verb_cancel,
                     hold=hold,
                     hold_danger=hold_danger,
@@ -228,20 +252,20 @@ async def confirm_action(
 
 
 async def confirm_reset_device(
-    ctx: GenericContext, prompt: str, recovery: bool = False
+    ctx: GenericContext, title: str, recovery: bool = False
 ) -> None:
     if recovery:
-        title = "RECOVERY MODE"
+        button = "RECOVER WALLET"
     else:
-        title = "CREATE NEW WALLET"
+        button = "CREATE WALLET"
 
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.confirm_reset_device(
                     title=title.upper(),
-                    prompt=prompt.replace("\n", " "),
+                    button=button,
                 )
             ),
             "recover_device" if recovery else "setup_device",
@@ -256,7 +280,7 @@ async def confirm_reset_device(
 async def confirm_backup(ctx: GenericContext) -> bool:
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_action(
                 title="SUCCESS",
                 action="New wallet created successfully.",
@@ -273,7 +297,7 @@ async def confirm_backup(ctx: GenericContext) -> bool:
 
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_action(
                 title="WARNING",
                 action="Are you sure you want to skip the backup?",
@@ -296,7 +320,7 @@ async def confirm_path_warning(
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.show_warning(
                     title="Unknown path"
                     if not path_type
@@ -310,8 +334,27 @@ async def confirm_path_warning(
     )
 
 
-def _show_xpub(xpub: str, title: str, cancel: str) -> ui.Layout:
-    content = _RustLayout(
+async def confirm_homescreen(
+    ctx: GenericContext,
+    image: bytes,
+) -> None:
+    await raise_if_not_confirmed(
+        interact(
+            ctx,
+            RustLayout(
+                trezorui2.confirm_homescreen(
+                    title="SET HOMESCREEN",
+                    image=image,
+                )
+            ),
+            "set_homesreen",
+            ButtonRequestType.ProtectCall,
+        )
+    )
+
+
+def _show_xpub(xpub: str, title: str, cancel: str | None) -> ui.Layout:
+    content = RustLayout(
         trezorui2.confirm_blob(
             title=title,
             data=xpub,
@@ -323,11 +366,11 @@ def _show_xpub(xpub: str, title: str, cancel: str) -> ui.Layout:
     return content
 
 
-async def show_xpub(ctx: GenericContext, xpub: str, title: str, cancel: str) -> None:
+async def show_xpub(ctx: GenericContext, xpub: str, title: str) -> None:
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _show_xpub(xpub, title, cancel),
+            _show_xpub(xpub, title, None),
             "show_xpub",
             ButtonRequestType.PublicKey,
         )
@@ -351,7 +394,7 @@ async def show_address(
     while True:
         result = await interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.confirm_blob(
                     title=title.upper(),
                     data=address,
@@ -368,7 +411,7 @@ async def show_address(
 
         result = await interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.show_qr(
                     address=address if address_qr is None else address_qr,
                     case_sensitive=case_sensitive,
@@ -419,9 +462,9 @@ async def show_error_and_raise(
 ) -> NoReturn:
     await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.show_error(
-                title=content.replace("\n", " "),
+                title=content,
                 description=subheader or "",
                 button=button.upper(),
                 allow_cancel=False,
@@ -444,9 +487,9 @@ async def show_warning(
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.show_warning(
-                    title=content.replace("\n", " "),
+                    title=content,
                     description=subheader or "",
                     button=button.upper(),
                     allow_cancel=False,
@@ -468,9 +511,9 @@ async def show_success(
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.show_success(
-                    title=content.replace("\n", " "),
+                    title=content,
                     description=subheader or "",
                     button=button.upper(),
                     allow_cancel=False,
@@ -487,6 +530,7 @@ async def confirm_output(
     address: str,
     amount: str,
     title: str = "SENDING",
+    hold: bool = False,
     br_code: ButtonRequestType = ButtonRequestType.ConfirmOutput,
 ) -> None:
     title = title.upper()
@@ -503,6 +547,7 @@ async def confirm_output(
         verb="NEXT",
     )
 
+    # Second screen could be HoldToConfirm if requested
     await confirm_value(
         ctx,
         title,
@@ -510,7 +555,8 @@ async def confirm_output(
         "Amount:",
         "confirm_output",
         br_code,
-        verb="NEXT",
+        verb=None if hold else "NEXT",
+        hold=hold,
     )
 
 
@@ -519,12 +565,10 @@ async def confirm_payment_request(
     recipient_name: str,
     amount: str,
     memos: list[str],
-) -> Any:
-    from ...components.common import confirm
-
+) -> bool:
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_with_info(
                 title="SENDING",
                 items=[(ui.NORMAL, f"{amount} to\n{recipient_name}")]
@@ -536,10 +580,13 @@ async def confirm_payment_request(
         "confirm_payment_request",
         ButtonRequestType.ConfirmOutput,
     )
+
+    # When user pressed INFO, returning False, which gets processed in higher function
+    # to differentiate it from CONFIRMED. Raising otherwise.
     if result is CONFIRMED:
-        return confirm.CONFIRMED
+        return True
     elif result is INFO:
-        return confirm.INFO
+        return False
     else:
         raise ActionCancelled
 
@@ -563,7 +610,7 @@ async def should_show_more(
 
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.confirm_with_info(
                 title=title.upper(),
                 items=para,
@@ -609,7 +656,7 @@ async def _confirm_ask_pagination(
             return
 
         if paginated is None:
-            paginated = _RustLayout(
+            paginated = RustLayout(
                 trezorui2.confirm_more(
                     title=title,
                     button="CLOSE",
@@ -620,7 +667,7 @@ async def _confirm_ask_pagination(
             paginated.request_complete_repaint()
 
         result = await interact(ctx, paginated, br_type, br_code)
-        assert result in (trezorui2.CONFIRMED, trezorui2.CANCELLED)
+        assert result in (CONFIRMED, CANCELLED)
 
     assert False
 
@@ -637,7 +684,7 @@ async def confirm_blob(
 ) -> None:
     title = title.upper()
     description = description or ""
-    layout = _RustLayout(
+    layout = RustLayout(
         trezorui2.confirm_blob(
             title=title,
             description=description,
@@ -738,7 +785,7 @@ def confirm_value(
     return raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.confirm_value(
                     title=title.upper(),
                     description=description,
@@ -767,7 +814,7 @@ async def confirm_properties(
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.confirm_properties(
                     title=title.upper(),
                     items=items,
@@ -821,7 +868,7 @@ async def confirm_joint_total(
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.confirm_joint_total(
                     spending_amount=spending_amount,
                     total_amount=total_amount,
@@ -871,7 +918,7 @@ async def confirm_metadata(
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(layout),
+            RustLayout(layout),
             br_type,
             br_code,
         )
@@ -899,7 +946,7 @@ async def confirm_modify_output(
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.confirm_modify_output(
                     address=address,
                     sign=sign,
@@ -924,7 +971,7 @@ async def confirm_modify_fee(
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.confirm_modify_fee(
                     sign=sign,
                     user_fee_change=user_fee_change,
@@ -943,7 +990,7 @@ async def confirm_coinjoin(
     await raise_if_not_confirmed(
         interact(
             ctx,
-            _RustLayout(
+            RustLayout(
                 trezorui2.confirm_coinjoin(
                     max_rounds=str(max_rounds),
                     max_feerate=max_fee_per_vbyte,
@@ -955,10 +1002,6 @@ async def confirm_coinjoin(
     )
 
 
-def show_coinjoin() -> None:
-    log.error(__name__, "show_coinjoin not implemented")
-
-
 # TODO cleanup @ redesign
 async def confirm_sign_identity(
     ctx: GenericContext, proto: str, identity: str, challenge_visual: str | None
@@ -1011,7 +1054,7 @@ async def show_popup(
 ) -> None:
     if subtitle:
         title += f"\n{subtitle}"
-    await _RustLayout(
+    await RustLayout(
         trezorui2.show_error(
             title=title,
             description=description.format(description_param),
@@ -1021,8 +1064,13 @@ async def show_popup(
     )
 
 
-def draw_simple_text(title: str, description: str = "") -> None:
-    log.error(__name__, "draw_simple_text not implemented")
+def request_passphrase_on_host() -> None:
+    draw_simple(
+        trezorui2.show_info(
+            title="Please type your passphrase on the connected host.",
+            button="",
+        )
+    )
 
 
 async def request_passphrase_on_device(ctx: GenericContext, max_len: int) -> str:
@@ -1030,7 +1078,7 @@ async def request_passphrase_on_device(ctx: GenericContext, max_len: int) -> str
         ctx, "passphrase_device", code=ButtonRequestType.PassphraseEntry
     )
 
-    keyboard = _RustLayout(
+    keyboard = RustLayout(
         trezorui2.request_passphrase(prompt="Enter passphrase", max_len=max_len)
     )
     result = await ctx.wait(keyboard)
@@ -1046,28 +1094,25 @@ async def request_pin_on_device(
     prompt: str,
     attempts_remaining: int | None,
     allow_cancel: bool,
+    wrong_pin: bool = False,
 ) -> str:
     from trezor.wire import PinCancelled
 
     await button_request(ctx, "pin_device", code=ButtonRequestType.PinEntry)
 
-    warning = "Wrong PIN" if "Wrong" in prompt else None
-
     if attempts_remaining is None:
         subprompt = ""
     elif attempts_remaining == 1:
-        prompt = "Enter PIN"
         subprompt = "Last attempt"
     else:
-        prompt = "Enter PIN"
         subprompt = f"{attempts_remaining} tries left"
 
-    dialog = _RustLayout(
+    dialog = RustLayout(
         trezorui2.request_pin(
             prompt=prompt,
             subprompt=subprompt,
             allow_cancel=allow_cancel,
-            warning=warning,
+            wrong_pin=wrong_pin,
         )
     )
     while True:
@@ -1076,3 +1121,55 @@ async def request_pin_on_device(
             raise PinCancelled
         assert isinstance(result, str)
         return result
+
+
+class RustProgress:
+    def __init__(
+        self,
+        title: str,
+        description: str | None = None,
+        indeterminate: bool = False,
+    ):
+        self.layout: Any = trezorui2.show_progress(
+            title=title.upper(),
+            indeterminate=indeterminate,
+            description=description or "",
+        )
+        ui.backlight_fade(ui.style.BACKLIGHT_DIM)
+        ui.display.clear()
+        self.layout.attach_timer_fn(self.set_timer)
+        self.layout.paint()
+        ui.backlight_fade(ui.style.BACKLIGHT_NORMAL)
+
+    def set_timer(self, token: int, deadline: int) -> None:
+        raise RuntimeError  # progress layouts should not set timers
+
+    def report(self, value: int, description: str | None = None):
+        msg = self.layout.progress_event(value, description or "")
+        assert msg is None
+        self.layout.paint()
+        ui.refresh()
+
+
+def progress(message: str = "PLEASE WAIT") -> ProgressLayout:
+    return RustProgress(message.upper())
+
+
+def bitcoin_progress(message: str) -> ProgressLayout:
+    return RustProgress(message.upper())
+
+
+def pin_progress(message: str, description: str) -> ProgressLayout:
+    return RustProgress(message.upper(), description=description)
+
+
+def monero_keyimage_sync_progress() -> ProgressLayout:
+    return RustProgress("SYNCING")
+
+
+def monero_live_refresh_progress() -> ProgressLayout:
+    return RustProgress("REFRESHING", description="", indeterminate=True)
+
+
+def monero_transaction_progress_inner() -> ProgressLayout:
+    return RustProgress("SIGNING TRANSACTION", description="")
diff --git a/core/src/trezor/ui/layouts/tt_v2/fido.py b/core/src/trezor/ui/layouts/tt_v2/fido.py
index 0e50672892..142a7a0894 100644
--- a/core/src/trezor/ui/layouts/tt_v2/fido.py
+++ b/core/src/trezor/ui/layouts/tt_v2/fido.py
@@ -5,7 +5,7 @@ from trezor.enums import ButtonRequestType
 import trezorui2
 
 from ..common import interact
-from . import _RustLayout
+from . import RustLayout
 
 if TYPE_CHECKING:
     from trezor.loop import AwaitableTask
@@ -13,10 +13,10 @@ if TYPE_CHECKING:
 
 
 if __debug__:
-    from trezor import io
+    from trezor import io, ui
     from ... import Result
 
-    class _RustFidoLayoutImpl(_RustLayout):
+    class _RustFidoLayoutImpl(RustLayout):
         def create_tasks(self) -> tuple[AwaitableTask, ...]:
             return (
                 self.handle_timers(),
@@ -42,13 +42,14 @@ if __debug__:
             ):
                 msg = self.layout.touch_event(event, x, y)
                 self.layout.paint()
+                ui.refresh()
                 if msg is not None:
                     raise Result(msg)
 
     _RustFidoLayout = _RustFidoLayoutImpl
 
 else:
-    _RustFidoLayout = _RustLayout
+    _RustFidoLayout = RustLayout
 
 
 async def confirm_fido(
@@ -85,7 +86,7 @@ async def confirm_fido(
 
 
 async def confirm_fido_reset() -> bool:
-    confirm = _RustLayout(
+    confirm = RustLayout(
         trezorui2.confirm_action(
             title="FIDO2 RESET",
             action="erase all credentials?",
diff --git a/core/src/trezor/ui/layouts/tt_v2/homescreen.py b/core/src/trezor/ui/layouts/tt_v2/homescreen.py
new file mode 100644
index 0000000000..df176f3084
--- /dev/null
+++ b/core/src/trezor/ui/layouts/tt_v2/homescreen.py
@@ -0,0 +1,133 @@
+from typing import TYPE_CHECKING
+
+import storage.cache as storage_cache
+from trezor import ui
+
+import trezorui2
+
+from . import RustLayout
+
+if TYPE_CHECKING:
+    from trezor import loop
+    from typing import Any, Tuple
+
+
+class HomescreenBase(RustLayout):
+    RENDER_INDICATOR: object | None = None
+
+    def __init__(self, layout: Any) -> None:
+        super().__init__(layout=layout)
+
+    def _paint(self) -> None:
+        self.layout.paint()
+        ui.refresh()
+
+    def _first_paint(self) -> None:
+        if storage_cache.homescreen_shown is not self.RENDER_INDICATOR:
+            super()._first_paint()
+            storage_cache.homescreen_shown = self.RENDER_INDICATOR
+        else:
+            self._paint()
+
+    # In __debug__ mode, ignore {confirm,swipe,input}_signal.
+    def create_tasks(self) -> tuple[loop.AwaitableTask, ...]:
+        return self.handle_timers(), self.handle_input_and_rendering()
+
+
+class Homescreen(HomescreenBase):
+    RENDER_INDICATOR = storage_cache.HOMESCREEN_ON
+
+    def __init__(
+        self,
+        label: str | None,
+        notification: str | None,
+        notification_is_error: bool,
+        hold_to_lock: bool,
+    ) -> None:
+        level = 1
+        if notification is not None:
+            notification = notification.rstrip("!")
+            if "EXPERIMENTAL" in notification:
+                level = 2
+            elif notification_is_error:
+                level = 0
+
+        skip = storage_cache.homescreen_shown is self.RENDER_INDICATOR
+        super().__init__(
+            layout=trezorui2.show_homescreen(
+                label=label or "My Trezor",
+                notification=notification,
+                notification_level=level,
+                hold=hold_to_lock,
+                skip_first_paint=skip,
+            ),
+        )
+
+    async def usb_checker_task(self) -> None:
+        from trezor import io, loop
+
+        usbcheck = loop.wait(io.USB_CHECK)
+        while True:
+            is_connected = await usbcheck
+            self.layout.usb_event(is_connected)
+            self.layout.paint()
+            ui.refresh()
+
+    def create_tasks(self) -> Tuple[loop.AwaitableTask, ...]:
+        return super().create_tasks() + (self.usb_checker_task(),)
+
+
+class Lockscreen(HomescreenBase):
+    RENDER_INDICATOR = storage_cache.LOCKSCREEN_ON
+    BACKLIGHT_LEVEL = ui.BACKLIGHT_LOW
+
+    def __init__(
+        self,
+        label: str | None,
+        bootscreen: bool = False,
+    ) -> None:
+        self.bootscreen = bootscreen
+        if bootscreen:
+            self.BACKLIGHT_LEVEL = ui.BACKLIGHT_NORMAL
+
+        skip = (
+            not bootscreen and storage_cache.homescreen_shown is self.RENDER_INDICATOR
+        )
+        super().__init__(
+            layout=trezorui2.show_lockscreen(
+                label=label or "My Trezor",
+                bootscreen=bootscreen,
+                skip_first_paint=skip,
+            ),
+        )
+
+    async def __iter__(self) -> Any:
+        result = await super().__iter__()
+        if self.bootscreen:
+            self.request_complete_repaint()
+        return result
+
+
+class Busyscreen(HomescreenBase):
+    RENDER_INDICATOR = storage_cache.BUSYSCREEN_ON
+
+    def __init__(self, delay_ms: int) -> None:
+        skip = storage_cache.homescreen_shown is self.RENDER_INDICATOR
+        super().__init__(
+            layout=trezorui2.show_busyscreen(
+                title="PLEASE WAIT",
+                description="Coinjoin in progress.\n\nDo not disconnect your\nTrezor.",
+                time_ms=delay_ms,
+                skip_first_paint=skip,
+            )
+        )
+
+    async def __iter__(self) -> Any:
+        from apps.base import set_homescreen
+
+        # Handle timeout.
+        result = await super().__iter__()
+        assert result == trezorui2.CANCELLED
+        storage_cache.delete(storage_cache.APP_COMMON_BUSY_DEADLINE_MS)
+        set_homescreen()
+        return result
diff --git a/core/src/trezor/ui/layouts/tt_v2/recovery.py b/core/src/trezor/ui/layouts/tt_v2/recovery.py
index 70650bcefd..9766c5dc8c 100644
--- a/core/src/trezor/ui/layouts/tt_v2/recovery.py
+++ b/core/src/trezor/ui/layouts/tt_v2/recovery.py
@@ -6,7 +6,7 @@ from trezor.wire import ActionCancelled
 import trezorui2
 
 from ..common import interact
-from . import _RustLayout
+from . import RustLayout
 
 if TYPE_CHECKING:
     from typing import Iterable, Callable
@@ -19,7 +19,7 @@ INFO = trezorui2.INFO  # global_import_cache
 
 async def _is_confirmed_info(
     ctx: GenericContext,
-    dialog: _RustLayout,
+    dialog: RustLayout,
     info_func: Callable,
 ) -> bool:
     while True:
@@ -32,7 +32,7 @@ async def _is_confirmed_info(
 
 
 async def request_word_count(ctx: GenericContext, dry_run: bool) -> int:
-    selector = _RustLayout(trezorui2.select_word_count(dry_run=dry_run))
+    selector = RustLayout(trezorui2.select_word_count(dry_run=dry_run))
     count = await interact(
         ctx, selector, "word_count", ButtonRequestType.MnemonicWordCount
     )
@@ -44,9 +44,9 @@ async def request_word(
 ) -> str:
     prompt = f"Type word {word_index + 1} of {word_count}:"
     if is_slip39:
-        keyboard = _RustLayout(trezorui2.request_slip39(prompt=prompt))
+        keyboard = RustLayout(trezorui2.request_slip39(prompt=prompt))
     else:
-        keyboard = _RustLayout(trezorui2.request_bip39(prompt=prompt))
+        keyboard = RustLayout(trezorui2.request_bip39(prompt=prompt))
 
     word: str = await ctx.wait(keyboard)
     return word
@@ -81,7 +81,7 @@ async def show_remaining_shares(
 
     result = await interact(
         ctx,
-        _RustLayout(trezorui2.show_remaining_shares(pages=pages)),
+        RustLayout(trezorui2.show_remaining_shares(pages=pages)),
         "show_shares",
         ButtonRequestType.Other,
     )
@@ -94,7 +94,7 @@ async def show_group_share_success(
 ) -> None:
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.show_group_share_success(
                 lines=[
                     "You have entered",
@@ -129,7 +129,7 @@ async def continue_recovery(
     description = "It is safe to eject Trezor\nand continue later"
 
     if info_func is not None:
-        homepage = _RustLayout(
+        homepage = RustLayout(
             trezorui2.confirm_recovery(
                 title=title,
                 description=description,
@@ -141,7 +141,7 @@ async def continue_recovery(
         await button_request(ctx, "recovery", ButtonRequestType.RecoveryHomepage)
         return await _is_confirmed_info(ctx, homepage, info_func)
     else:
-        homepage = _RustLayout(
+        homepage = RustLayout(
             trezorui2.confirm_recovery(
                 title=text,
                 description=description,
diff --git a/core/src/trezor/ui/layouts/tt_v2/reset.py b/core/src/trezor/ui/layouts/tt_v2/reset.py
index 56cf1bfac6..155f34534c 100644
--- a/core/src/trezor/ui/layouts/tt_v2/reset.py
+++ b/core/src/trezor/ui/layouts/tt_v2/reset.py
@@ -6,7 +6,7 @@ from trezor.wire import ActionCancelled
 import trezorui2
 
 from ..common import interact
-from . import _RustLayout
+from . import RustLayout
 
 if TYPE_CHECKING:
     from typing import Callable, Sequence, List
@@ -51,7 +51,7 @@ async def show_share_words(
 
     # result = await interact(
     #     ctx,
-    #     _RustLayout(
+    #     RustLayout(
     #         trezorui2.show_simple(
     #             title=title,
     #             description=f"Write down these {len(share_words)} words in the exact order:",
@@ -68,7 +68,7 @@ async def show_share_words(
 
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.show_share_words(
                 title=title,
                 pages=pages,
@@ -90,7 +90,6 @@ async def select_word(
     count: int,
     group_index: int | None = None,
 ) -> str:
-    assert len(words) == 3
     if share_index is None:
         title: str = "CHECK SEED"
     elif group_index is None:
@@ -98,8 +97,15 @@ async def select_word(
     else:
         title = f"CHECK G{group_index + 1} - SHARE {share_index + 1}"
 
+    # It may happen (with a very low probability)
+    # that there will be less than three unique words to choose from.
+    # In that case, duplicating the last word to make it three.
+    words = list(words)
+    while len(words) < 3:
+        words.append(words[-1])
+
     result = await ctx.wait(
-        _RustLayout(
+        RustLayout(
             trezorui2.select_word(
                 title=title,
                 description=f"Select word {checked_index + 1} of {count}:",
@@ -136,7 +142,7 @@ async def slip39_show_checklist(
 
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.show_checklist(
                 title="BACKUP CHECKLIST",
                 button="CONTINUE",
@@ -161,7 +167,7 @@ async def _prompt_number(
     max_count: int,
     br_name: str,
 ) -> int:
-    num_input = _RustLayout(
+    num_input = RustLayout(
         trezorui2.request_number(
             title=title.upper(),
             description=description,
@@ -190,7 +196,7 @@ async def _prompt_number(
             return value
 
         await ctx.wait(
-            _RustLayout(
+            RustLayout(
                 trezorui2.show_simple(
                     title=None, description=info(value), button="OK, I UNDERSTAND"
                 )
@@ -338,7 +344,7 @@ async def show_warning_backup(ctx: GenericContext, slip39: bool) -> None:
         )
     result = await interact(
         ctx,
-        _RustLayout(
+        RustLayout(
             trezorui2.show_info(
                 title=description,
                 button="OK, I UNDERSTAND",
diff --git a/core/src/trezor/ui/loader.py b/core/src/trezor/ui/loader.py
deleted file mode 100644
index 97c6ffd041..0000000000
--- a/core/src/trezor/ui/loader.py
+++ /dev/null
@@ -1,132 +0,0 @@
-import utime
-from micropython import const
-from typing import TYPE_CHECKING
-
-from trezor import res, ui, utils
-from trezor.ui import display
-
-
-class LoaderDefault:
-    class normal:
-        bg_color = ui.BG
-        fg_color = ui.GREEN
-        icon: str | None = None
-        icon_fg_color: int | None = None
-
-    class active(normal):
-        bg_color = ui.BG
-        fg_color = ui.GREEN
-        icon: str | None = ui.ICON_CHECK
-        icon_fg_color: int | None = ui.WHITE
-
-
-class LoaderNeutral(LoaderDefault):
-    class normal(LoaderDefault.normal):
-        fg_color = ui.FG
-
-    class active(LoaderDefault.active):
-        fg_color = ui.FG
-
-
-if TYPE_CHECKING:
-    LoaderStyleType = type[LoaderDefault]
-
-
-_TARGET_MS = const(1000)
-_OFFSET_Y = const(-24)
-_REVERSE_SPEEDUP = const(2)
-
-
-class Loader(ui.Component):
-    def __init__(
-        self,
-        style: LoaderStyleType = LoaderDefault,
-        target_ms: int = _TARGET_MS,
-        offset_y: int = _OFFSET_Y,
-        reverse_speedup: int = _REVERSE_SPEEDUP,
-    ) -> None:
-        super().__init__()
-        self.normal_style = style.normal
-        self.active_style = style.active
-        self.target_ms = target_ms
-        self.start_ms: int | None = None
-        self.stop_ms: int | None = None
-        self.offset_y = offset_y
-        self.reverse_speedup = reverse_speedup
-
-    def start(self) -> None:
-        if self.start_ms is not None and self.stop_ms is not None:
-            self.start_ms = utime.ticks_ms() - self.elapsed_ms()
-        else:
-            self.start_ms = utime.ticks_ms()
-        self.stop_ms = None
-        self.on_start()
-
-    def stop(self) -> None:
-        self.stop_ms = utime.ticks_ms()
-
-    def elapsed_ms(self) -> int:
-        start = self.start_ms
-        stop = self.stop_ms
-        now = utime.ticks_ms()
-        if start is None:
-            return 0
-        elif stop is not None:
-            return max(stop - start + (stop - now) * self.reverse_speedup, 0)
-        else:
-            return min(now - start, self.target_ms)
-
-    def on_render(self) -> None:
-        if self.start_ms is None:
-            return
-        target = self.target_ms
-        r = self.elapsed_ms()
-        if r != target:
-            s = self.normal_style
-        else:
-            s = self.active_style
-
-        progress = r * 1000 // target  # scale to 0-1000
-        if s.icon is None:
-            display.loader(progress, False, self.offset_y, s.fg_color, s.bg_color)
-        else:
-            display.loader(
-                progress,
-                False,
-                self.offset_y,
-                s.fg_color,
-                s.bg_color,
-                res.load(s.icon),
-                s.icon_fg_color,
-            )
-        if (r == 0) and (self.stop_ms is not None):
-            self.start_ms = None
-            self.stop_ms = None
-            self.on_start()
-        if r == target:
-            self.on_finish()
-
-    def on_start(self) -> None:
-        pass
-
-    def on_finish(self) -> None:
-        pass
-
-
-class LoadingAnimation(ui.Layout):
-    def __init__(self, style: LoaderStyleType = LoaderDefault) -> None:
-        super().__init__()
-        self.loader = Loader(style)
-        self.loader.on_finish = self.on_finish
-        self.loader.start()
-
-    def dispatch(self, event: int, x: int, y: int) -> None:
-        if not self.loader.elapsed_ms():
-            self.loader.start()
-        self.loader.dispatch(event, x, y)
-
-        if utils.DISABLE_ANIMATION:
-            self.on_finish()
-
-    def on_finish(self) -> None:
-        raise ui.Result(None)
diff --git a/core/src/trezor/ui/popup.py b/core/src/trezor/ui/popup.py
deleted file mode 100644
index db698ff322..0000000000
--- a/core/src/trezor/ui/popup.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from trezor import loop, ui, utils
-
-
-class Popup(ui.Layout):
-    def __init__(self, content: ui.Component, time_ms: int = 0) -> None:
-        super().__init__()
-        self.content = content
-        if utils.DISABLE_ANIMATION:
-            self.time_ms = 0
-        else:
-            self.time_ms = time_ms
-
-    def dispatch(self, event: int, x: int, y: int) -> None:
-        self.content.dispatch(event, x, y)
-
-    def create_tasks(self) -> tuple[loop.Task, ...]:
-        return self.handle_input(), self.handle_rendering(), self.handle_timeout()
-
-    def handle_timeout(self) -> loop.Task:  # type: ignore [awaitable-is-generator]
-        yield loop.sleep(self.time_ms)
-        raise ui.Result(None)
diff --git a/core/src/trezor/ui/style.py b/core/src/trezor/ui/style.py
index 5313759055..70b97d6eef 100644
--- a/core/src/trezor/ui/style.py
+++ b/core/src/trezor/ui/style.py
@@ -1,31 +1,8 @@
 from micropython import const
 
-from trezor.ui import rgb
-
 # backlight brightness
 BACKLIGHT_NORMAL = const(150)
 BACKLIGHT_LOW = const(45)
 BACKLIGHT_DIM = const(5)
-BACKLIGHT_NONE = const(2)
+BACKLIGHT_NONE = const(0)
 BACKLIGHT_MAX = const(255)
-
-# color palette
-RED = rgb(0xFF, 0x00, 0x00)
-BLUE = rgb(0x21, 0x96, 0xF3)
-GREEN = rgb(0x00, 0xAE, 0x0B)
-YELLOW = rgb(0xFF, 0xEB, 0x3B)
-BLACK = rgb(0x00, 0x00, 0x00)
-WHITE = rgb(0xFA, 0xFA, 0xFA)
-
-TITLE_GREY = rgb(0x9B, 0x9B, 0x9B)
-
-# common color styles
-BG = BLACK
-FG = WHITE
-
-# icons
-ICON_CONFIG = "trezor/res/header_icons/cog.toif"
-ICON_SEND = "trezor/res/header_icons/send.toif"
-ICON_CLICK = "trezor/res/click.toif"
-ICON_CHECK = "trezor/res/check.toif"
-ICON_DEFAULT = ICON_CONFIG
diff --git a/core/src/trezor/utils.py b/core/src/trezor/utils.py
index f79284ab34..fcd796a4ac 100644
--- a/core/src/trezor/utils.py
+++ b/core/src/trezor/utils.py
@@ -136,16 +136,6 @@ def chunks(items: Chunkable, size: int) -> Iterator[Chunkable]:
         yield items[i : i + size]
 
 
-def chunks_intersperse(items: str, size: int, sep: str = "\n") -> Iterator[str]:
-    first = True
-    for i in range(0, len(items), size):
-        if not first:
-            yield sep
-        else:
-            first = False
-        yield items[i : i + size]
-
-
 if TYPE_CHECKING:
 
     class HashContext(Protocol):
@@ -169,6 +159,42 @@ if TYPE_CHECKING:
             ...
 
 
+if False:  # noqa
+
+    class DebugHashContextWrapper:
+        """
+        Use this wrapper to debug hashing operations. When digest() is called,
+        it will log all of the data that was provided to update().
+
+        Example usage:
+        self.h_prevouts = HashWriter(DebugHashContextWrapper(sha256()))
+        """
+
+        def __init__(self, ctx: HashContext) -> None:
+            self.ctx = ctx
+            self.data = ""
+
+        def update(self, data: bytes) -> None:
+            from ubinascii import hexlify
+
+            self.ctx.update(data)
+            self.data += hexlify(data).decode() + " "
+
+        def digest(self) -> bytes:
+            from trezor import log
+            from ubinascii import hexlify
+
+            digest = self.ctx.digest()
+            log.debug(
+                __name__,
+                "%s hash: %s, data: %s",
+                self.ctx.__class__.__name__,
+                hexlify(digest).decode(),
+                self.data,
+            )
+            return digest
+
+
 class HashWriter:
     def __init__(self, ctx: HashContext) -> None:
         self.ctx = ctx
diff --git a/core/src/trezor/workflow.py b/core/src/trezor/workflow.py
index 7cae81f2c8..608fe7832f 100644
--- a/core/src/trezor/workflow.py
+++ b/core/src/trezor/workflow.py
@@ -97,7 +97,7 @@ def set_default(constructor: Callable[[], loop.Task]) -> None:
     default_constructor = constructor
 
 
-if False:
+if False:  # noqa
 
     def kill_default() -> None:
         """Forcefully shut down default task.
diff --git a/core/tests/test_apps.bitcoin.approver.py b/core/tests/test_apps.bitcoin.approver.py
index 0fa3518fd7..3645216f47 100644
--- a/core/tests/test_apps.bitcoin.approver.py
+++ b/core/tests/test_apps.bitcoin.approver.py
@@ -127,7 +127,7 @@ class TestApprover(unittest.TestCase):
             TxOutput(
                 address="",
                 amount=denomination-fees,
-                script_type=OutputScriptType.PAYTOWITNESS,
+                script_type=OutputScriptType.PAYTOTAPROOT,
                 payment_req_index=0,
             ) for i in range(99)
         ]
@@ -139,7 +139,7 @@ class TestApprover(unittest.TestCase):
                 address="",
                 address_n=[H_(10025), H_(0), H_(0), H_(1), 0, 2],
                 amount=denomination-fees,
-                script_type=OutputScriptType.PAYTOWITNESS,
+                script_type=OutputScriptType.PAYTOTAPROOT,
                 payment_req_index=0,
             )
         )
@@ -149,7 +149,7 @@ class TestApprover(unittest.TestCase):
             TxOutput(
                 address="",
                 amount=coordinator_fee * len(outputs),
-                script_type=OutputScriptType.PAYTOWITNESS,
+                script_type=OutputScriptType.PAYTOTAPROOT,
                 payment_req_index=0,
             )
         )
@@ -168,7 +168,7 @@ class TestApprover(unittest.TestCase):
 
         for txo in outputs:
             if txo.address_n:
-                approver.add_change_output(txo, script_pubkey=bytes(22))
+                await_result(approver.add_change_output(txo, script_pubkey=bytes(22)))
             else:
                 await_result(approver.add_external_output(txo, script_pubkey=bytes(22)))
 
diff --git a/core/tests/test_apps.bitcoin.ownership_proof.py b/core/tests/test_apps.bitcoin.ownership_proof.py
index ef02f621cc..2a4bfd1d96 100644
--- a/core/tests/test_apps.bitcoin.ownership_proof.py
+++ b/core/tests/test_apps.bitcoin.ownership_proof.py
@@ -46,7 +46,7 @@ class TestOwnershipProof(unittest.TestCase):
         coin = coins.by_name('Bitcoin')
         seed = bip39.seed(' '.join(['all'] * 12), '')
         keychain = Keychain(seed, coin.curve_name, [AlwaysMatchingSchema], slip21_namespaces=[[b"SLIP-0019"]])
-        commitment_data = b""
+        commitment_data = b"TREZOR"
 
         node = keychain.derive([49 | HARDENED, 0 | HARDENED, 0 | HARDENED, 1, 0])
         address = address_p2wpkh_in_p2sh(node.public_key(), coin)
@@ -60,13 +60,13 @@ class TestOwnershipProof(unittest.TestCase):
             script_type=InputScriptType.SPENDP2SHWITNESS,
             multisig=None,
             coin=coin,
-            user_confirmed=False,
+            user_confirmed=True,
             ownership_ids=[ownership_id],
             script_pubkey=script_pubkey,
             commitment_data=commitment_data,
         )
-        self.assertEqual(signature, unhexlify("30440220484072ca317663dd685d372115a9d2ff43d9afc6d352c10445a94e555e12154602202d3ffee5f780dbc74e67fcc4bcbc75a9816ed00df1142d571014724af9959355"))
-        self.assertEqual(proof, unhexlify("534c0019000192caf0b8daf78f1d388dbbceaec34bd2dabc31b217e32343663667f6694a3f4617160014e0cffbee1925a411844f44c3b8d81365ab51d036024730440220484072ca317663dd685d372115a9d2ff43d9afc6d352c10445a94e555e12154602202d3ffee5f780dbc74e67fcc4bcbc75a9816ed00df1142d571014724af9959355012103a961687895a78da9aef98eed8e1f2a3e91cfb69d2f3cf11cbd0bb1773d951928"))
+        self.assertEqual(signature, unhexlify("304402207f1003c59661ddf564af2e10d19ad8d6a1a47ad30e7052197d95fd65d186a67802205f0a804509980fec1b063554aadd8fb871d7c9fe934087cba2da09cbeff8531c"))
+        self.assertEqual(proof, unhexlify("534c0019010192caf0b8daf78f1d388dbbceaec34bd2dabc31b217e32343663667f6694a3f4617160014e0cffbee1925a411844f44c3b8d81365ab51d0360247304402207f1003c59661ddf564af2e10d19ad8d6a1a47ad30e7052197d95fd65d186a67802205f0a804509980fec1b063554aadd8fb871d7c9fe934087cba2da09cbeff8531c012103a961687895a78da9aef98eed8e1f2a3e91cfb69d2f3cf11cbd0bb1773d951928"))
         self.assertFalse(ownership.verify_nonownership(proof, script_pubkey, commitment_data, keychain, coin))
 
     def test_p2tr_gen_proof(self):
diff --git a/core/tests/test_apps.bitcoin.segwit.signtx.native_p2wpkh.py b/core/tests/test_apps.bitcoin.segwit.signtx.native_p2wpkh.py
index fef7c997aa..c69c715b95 100644
--- a/core/tests/test_apps.bitcoin.segwit.signtx.native_p2wpkh.py
+++ b/core/tests/test_apps.bitcoin.segwit.signtx.native_p2wpkh.py
@@ -235,6 +235,9 @@ class TestSignSegwitTxNativeP2WPKH(unittest.TestCase):
             TxRequest(request_type=TXOUTPUT, details=TxRequestDetailsType(request_index=1, tx_hash=None), serialized=EMPTY_SERIALIZED),
             TxAckOutput(tx=TxAckOutputWrapper(output=out2)),
 
+            helpers.UiConfirmForeignAddress(address_n=out2.address_n),
+            True,
+
             helpers.UiConfirmTotal(5000000 + 11000, 11000, fee_rate, coin, AmountUnit.BITCOIN),
             True,
 
diff --git a/core/tests/test_apps.ethereum.sign_typed_data.py b/core/tests/test_apps.ethereum.sign_typed_data.py
index 66f6cb883b..2c1bf90102 100644
--- a/core/tests/test_apps.ethereum.sign_typed_data.py
+++ b/core/tests/test_apps.ethereum.sign_typed_data.py
@@ -582,8 +582,8 @@ class TestEthereumSignTypedData(unittest.TestCase):
             ),
             (
                 EFT(data_type=EDT.STRING, size=None),
-                [b"\x7f", b"a" * 1024],
-                [b"\x80", b"a" * 1025],
+                [b"\x7f"],
+                [b"\x80"],
             ),
             (
                 EFT(data_type=EDT.ADDRESS, size=None),
diff --git a/core/tests/test_storage.cache.py b/core/tests/test_storage.cache.py
index a4e15b1feb..28df1e3cad 100644
--- a/core/tests/test_storage.cache.py
+++ b/core/tests/test_storage.cache.py
@@ -11,6 +11,11 @@ from apps.base import handle_Initialize, handle_EndSession
 KEY = 0
 
 
+# Function moved from cache.py, as it was not used there
+def is_session_started() -> bool:
+    return cache._active_session_idx is not None
+
+
 class TestStorageCache(unittest.TestCase):
     def setUp(self):
         cache.clear_all()
@@ -29,15 +34,15 @@ class TestStorageCache(unittest.TestCase):
 
     def test_end_session(self):
         session_id = cache.start_session()
-        self.assertTrue(cache.is_session_started())
+        self.assertTrue(is_session_started())
         cache.set(KEY, b"A")
         cache.end_current_session()
-        self.assertFalse(cache.is_session_started())
+        self.assertFalse(is_session_started())
         self.assertRaises(cache.InvalidSessionError, cache.get, KEY)
 
         # ending an ended session should be a no-op
         cache.end_current_session()
-        self.assertFalse(cache.is_session_started())
+        self.assertFalse(is_session_started())
 
         session_id_a = cache.start_session(session_id)
         # original session no longer exists
@@ -217,10 +222,10 @@ class TestStorageCache(unittest.TestCase):
     def test_EndSession(self):
         self.assertRaises(cache.InvalidSessionError, cache.get, KEY)
         session_id = cache.start_session()
-        self.assertTrue(cache.is_session_started())
+        self.assertTrue(is_session_started())
         self.assertIsNone(cache.get(KEY))
         await_result(handle_EndSession(DUMMY_CONTEXT, EndSession()))
-        self.assertFalse(cache.is_session_started())
+        self.assertFalse(is_session_started())
         self.assertRaises(cache.InvalidSessionError, cache.get, KEY)
 
 
diff --git a/core/tools/headertool.py b/core/tools/headertool.py
index 650a921a70..425f0aeb98 100755
--- a/core/tools/headertool.py
+++ b/core/tools/headertool.py
@@ -163,9 +163,6 @@ def cli(
     if replace_vendor_header:
         do_replace_vendorheader(fw, replace_vendor_header)
 
-    if rehash:
-        do_rehash(fw)
-
     if sign_dev_keys:
         if not isinstance(fw, firmware_headers.CosiSignedImage):
             raise click.ClickException("Can't use development keys on this image type.")
@@ -193,6 +190,9 @@ def cli(
             raise click.ClickException("Can't sign this image type.")
         fw.insert_signature(signature, sigmask)
 
+    if signature or rehash:
+        do_rehash(fw)
+
     click.echo(f"Detected image type: {fw.NAME}")
     click.echo(fw.format(verbose))
 
diff --git a/core/tools/keyctl-proxy b/core/tools/keyctl-proxy
deleted file mode 100755
index 3ac57e187d..0000000000
--- a/core/tools/keyctl-proxy
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import traceback
-
-import click
-import Pyro4
-from trezorlib import cosi
-from trezorlib.client import get_default_client
-from trezorlib.tools import parse_path
-from trezorlib._internal.firmware_headers import (
-    parse_image,
-    VendorHeader,
-    BootloaderImage,
-    FirmwareImage,
-)
-
-from typing import Tuple
-
-Pyro4.config.SERIALIZER = "marshal"
-
-PORT = 5001
-indexmap = {
-    "bootloader": BootloaderImage,
-    "vendorheader": VendorHeader,
-    "firmware": FirmwareImage,
-}
-
-PATH = "10018h/{}h"
-
-TREZOR = None
-
-
-def make_commit(image_type, digest, public_keys):
-    path = PATH.format(image_type.BIP32_INDEX)
-    address_n = parse_path(path)
-
-    # device information - show only first time
-    click.echo(
-        "\nUsing device {} ".format(click.style(TREZOR.features.label, bold=True)) +
-        "at path {}".format(TREZOR.transport.get_path())
-    )
-
-    while True:
-        # signing information - repeat every time
-        click.echo("Commiting to {} hash:".format(click.style(image_type.NAME, bold=True)))
-        for partid in range(4):
-            digest_part = digest[partid * 8 : (partid + 1) * 8]
-            color = "red" if partid % 2 else "cyan"
-            digest_str = click.style(digest_part.hex().upper(), fg=color)
-            click.echo("\t" + digest_str)
-        click.echo("Using path: {}".format(click.style(path, bold=True)))
-
-        try:
-            commit = cosi.commit(TREZOR, address_n, digest)
-            if public_keys is not None and commit.pubkey not in public_keys:
-                click.echo("\n\nPublic key {} is unknown.".format(commit.pubkey.hex()))
-                if click.confirm("Retry with a different passphrase?", default=True):
-                    TREZOR.init_device()
-                    continue
-
-            return commit.pubkey, commit.commitment
-        except Exception as e:
-            click.echo(e)
-            traceback.print_exc()
-            click.echo("Trying again ...\n\n")
-
-
-@Pyro4.expose
-class KeyctlProxy:
-    def __init__(
-        self, daemon, image_type, digest: bytes, commit: Tuple[bytes, bytes]
-    ) -> None:
-        self.daemon = daemon
-        self.name = image_type.NAME
-        self.address_n = parse_path(PATH.format(image_type.BIP32_INDEX))
-        self.digest = digest
-        self.commit = commit
-        self.signature = None
-        self.global_params = None
-
-    def _check_name_digest(self, name, digest):
-        if name != self.name or digest != self.digest:
-            click.echo("ERROR! Remote wants to sign {} with digest {}".format(name, digest.hex()))
-            click.echo("Expected: {} with digest {}".format(self.name, self.digest.hex()))
-            raise ValueError("Unexpected index/digest")
-
-    def get_commit(self, name, digest):
-        self._check_name_digest(name, digest)
-        click.echo("Sending commitment!")
-        return self.commit
-
-    def _make_signature(self, global_R, global_pk):
-        while True:
-            try:
-                click.echo("\n\n\nSigning...")
-                signature = cosi.sign(
-                    TREZOR, self.address_n, self.digest, global_R, global_pk
-                )
-                return signature.signature
-            except Exception as e:
-                click.echo(e)
-                traceback.print_exc()
-                click.echo("Trying again ...")
-
-
-    def get_signature(self, name, digest, global_R, global_pk):
-        self._check_name_digest(name, digest)
-        global_params = global_R, global_pk
-        if global_params != self.global_params:
-            self.signature = self._make_signature(global_R, global_pk)
-            self.global_params = global_params
-        click.echo("Sending signature!")
-        return self.signature
-
-    @Pyro4.oneway
-    def finish(self):
-        click.echo("Done! \\(^o^)/")
-        self.daemon.shutdown()
-
-
-@click.command()
-@click.option(
-    "-l", "--listen", "ipaddr", default="0.0.0.0", help="Bind to particular ip address"
-)
-@click.option("-t", "--image-type", type=click.Choice(indexmap.keys()))
-@click.option("-d", "--digest")
-@click.argument("fw_file", type=click.File("rb"), required=False)
-def cli(ipaddr, fw_file, image_type, digest):
-    """Participate in signing of firmware.
-
-    Specify either fw_file to auto-detect type and digest, or use -t and -d to specify
-    the type and digest manually.
-    """
-    global TREZOR
-
-    public_keys = None
-    if fw_file:
-        if image_type or digest:
-            raise click.ClickException("Do not specify fw_file together with -t/-d")
-
-        image_type = parse_image(fw_file.read())
-        digest = image_type.digest()
-        public_keys = image_type.public_keys
-
-        click.echo(image_type.format())
-
-    if not fw_file and (not image_type or not digest):
-        raise click.ClickException("Please specify either fw_file or -t and -d")
-
-    try:
-        TREZOR = get_default_client()
-        TREZOR.ui.always_prompt = True
-    except Exception as e:
-        raise click.ClickException("Please connect a Trezor and retry.") from e
-
-    pubkey, R = make_commit(image_type, digest, public_keys)
-
-    daemon = Pyro4.Daemon(host=ipaddr, port=PORT)
-    proxy = KeyctlProxy(daemon, image_type, digest, (pubkey, R))
-    uri = daemon.register(proxy, "keyctl")
-    click.echo("keyctl-proxy running at URI: {}".format(uri))
-    click.echo("Press Ctrl+C to abort.")
-    daemon.requestLoop()
-
-
-if __name__ == "__main__":
-    cli()
diff --git a/core/tools/make_cmakelists.py b/core/tools/make_cmakelists.py
new file mode 100644
index 0000000000..951aa2cc9e
--- /dev/null
+++ b/core/tools/make_cmakelists.py
@@ -0,0 +1,59 @@
+import argparse
+
+
+def gen(sources, dirs, defs):
+    target = "CMakeLists.txt"
+
+    with open(target, 'w') as f:
+
+        f.write("cmake_minimum_required(VERSION 3.20)\n")
+        f.write("project(core)\n")
+        f.write("\n")
+        f.write("set(CMAKE_CXX_STANDARD 14)\n")
+
+        f.write("\n")
+        f.write("\n")
+
+        f.write("add_definitions(\n")
+        for d in defs:
+            f.write(f'        -D{d}\n')
+        f.write(")\n")
+
+        f.write("\n")
+        f.write("\n")
+        for d in dirs:
+            f.write(f'include_directories({d})\n')
+
+        f.write("\n")
+        f.write("\n")
+        f.write("add_executable(core\n")
+
+        for s in sources:
+            f.write(f'        {s}\n')
+        f.write(")\n")
+        f.write("\n")
+
+
+if __name__ == "__main__":
+    CLI = argparse.ArgumentParser()
+    CLI.add_argument(
+        "--sources",
+        nargs="*",
+        type=str,
+        default=[],
+    )
+    CLI.add_argument(
+        "--dirs",
+        nargs="*",
+        type=str,
+        default=[],
+    )
+    CLI.add_argument(
+        "--defs",
+        nargs="*",
+        type=str,
+        default=[],
+    )
+
+    args = CLI.parse_args()
+    gen(args.sources, args.dirs, args.defs)
diff --git a/core/tools/toif_convert.py b/core/tools/toif_convert.py
index 36472d4142..2df587145d 100755
--- a/core/tools/toif_convert.py
+++ b/core/tools/toif_convert.py
@@ -17,6 +17,7 @@ def toif_convert(infile, outfile):
       toif_convert.py somefile.jpg outfile.toif
       toif_convert.py infile.toif outfile.png
 
+    \b
       # ensure gray-scale output TOIF
       mogrify -colorspace gray icon.png
       toif_convert.py icon.png icon.toif
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 4c472c7ec4..7031237d2f 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -12,19 +12,16 @@
   - [Debugging on hardware](core/embed_debug/index.md)
   - [SystemView instrumentation](core/systemview/index.md)
   - [Miscellaneous](core/misc/index.md)
+    - [Boot stages](core/misc/boot.md)
     - [Code style](core/misc/codestyle.md)
+    - [Memory layout](core/misc/memory.md)
     - [SLIP-39](core/misc/slip0039.md)
     - [Exceptions usage](core/misc/exceptions.md)
     - [Memory fragmentation management](core/misc/fragmentation.md)
 - [Legacy](legacy/index.md)
+    - [Firmware format](legacy/firmware-format.md)
 - [Python](python/index.md)
   - [trezorlib](python/trezorlib.md)
-- [Hardware](hardware/index.md)
-  - [Model T](hardware/model-t/index.md)
-    - [Boot stages](hardware/model-t/boot.md)
-    - [Memory layout](hardware/model-t/memory.md)
-  - [Model One](hardware/model-one/index.md)
-    - [Firmware format](hardware/model-one/firmware-format.md)
 - [Common](common/index.md)
   - [Communication](common/communication/index.md)
     - [Sessions](common/communication/sessions.md)
diff --git a/docs/ci/jobs.md b/docs/ci/jobs.md
index 389975cd73..72f6493d88 100644
--- a/docs/ci/jobs.md
+++ b/docs/ci/jobs.md
@@ -23,7 +23,7 @@ Almost all CI jobs run inside this docker image.
 ## PREBUILD stage - [prebuild.yml](https://github.com/trezor/trezor-firmware/blob/master/ci/prebuild.yml)
 Static checks on the code.
 
-Consists of **7 jobs** below:
+Consists of **6 jobs** below:
 
 ### [style prebuild](https://github.com/trezor/trezor-firmware/blob/master/ci/prebuild.yml#L16)
 Check the code for style correctness and perform some static code analysis.
@@ -40,13 +40,10 @@ Check validity of auto-generated files.
 ### [editor prebuild](https://github.com/trezor/trezor-firmware/blob/master/ci/prebuild.yml#L39)
 Checking format of .editorconfig files.
 
-### [yaml prebuild](https://github.com/trezor/trezor-firmware/blob/master/ci/prebuild.yml#L46)
-All .yml/.yaml files are checked for syntax validity and other correctness.
-
-### [release commit messages prebuild](https://github.com/trezor/trezor-firmware/blob/master/ci/prebuild.yml#L53)
+### [release commit messages prebuild](https://github.com/trezor/trezor-firmware/blob/master/ci/prebuild.yml#L46)
 Checking the format of release commit messages.
 
-### [changelog prebuild](https://github.com/trezor/trezor-firmware/blob/master/ci/prebuild.yml#L70)
+### [changelog prebuild](https://github.com/trezor/trezor-firmware/blob/master/ci/prebuild.yml#L63)
 Verifying that all commits changing some functionality have a changelog entry
 or contain `[no changelog]` in the commit message.
 
@@ -54,7 +51,7 @@ or contain `[no changelog]` in the commit message.
 ## BUILD stage - [build.yml](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml)
 All builds are published as artifacts so they can be downloaded and used.
 
-Consists of **27 jobs** below:
+Consists of **25 jobs** below:
 
 ### [core fw regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L20)
 Build of Core into firmware. Regular version.
@@ -74,72 +71,68 @@ Build of Core into firmware. Bitcoin-only version.
 
 ### [core fw btconly production build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L117)
 
-### [core fw btconly t1 build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L136)
-
-### [core unix regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L154)
+### [core unix regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L138)
 Non-frozen emulator build. This means you still need Python files
 present which get interpreted.
 
-### [core unix regular asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L166)
+### [core unix regular asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L150)
 
-### [core unix frozen regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L185)
+### [core unix frozen regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L169)
 Build of Core into UNIX emulator. Something you can run on your laptop.
 Frozen version. That means you do not need any other files to run it,
 it is just a single binary file that you can execute directly.
 
-### [core unix frozen btconly debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L202)
+### [core unix frozen btconly debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L186)
 Build of Core into UNIX emulator. Something you can run on your laptop.
 Frozen version. That means you do not need any other files to run it,
 it is just a single binary file that you can execute directly.
 See [Emulator](../core/emulator/index.md) for more info.
 Debug mode enabled, Bitcoin-only version.
 
-### [core unix frozen btconly debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L218)
+### [core unix frozen btconly debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L202)
 
-### [core unix frozen debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L241)
+### [core unix frozen debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L225)
 Build of Core into UNIX emulator. Something you can run on your laptop.
 Frozen version. That means you do not need any other files to run it,
 it is just a single binary file that you can execute directly.
 **Are you looking for a Trezor T emulator? This is most likely it.**
 
-### [core unix frozen debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L254)
+### [core unix frozen debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L238)
 
-### [core unix frozen debug build arm](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L270)
+### [core unix frozen debug build arm](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L254)
 
-### [core unix frozen btconly debug t1 build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L292)
+### [core macos frozen regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L276)
 
-### [core macos frozen regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L308)
-
-### [crypto build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L333)
+### [crypto build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L301)
 Build of our cryptographic library, which is then incorporated into the other builds.
 
-### [legacy fw regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L362)
+### [legacy fw regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L330)
 
-### [legacy fw regular debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L378)
+### [legacy fw regular debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L346)
 
-### [legacy fw btconly build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L395)
+### [legacy fw btconly build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L363)
 
-### [legacy fw btconly debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L414)
+### [legacy fw btconly debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L382)
 
-### [legacy emu regular debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L435)
+### [legacy emu regular debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L403)
 Regular version (not only Bitcoin) of above.
 **Are you looking for a Trezor One emulator? This is most likely it.**
 
-### [legacy emu regular debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L450)
+### [legacy emu regular debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L418)
 
-### [legacy emu regular debug build arm](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L468)
+### [legacy emu regular debug build arm](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L436)
 
-### [legacy emu btconly debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L494)
+### [legacy emu btconly debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L462)
 Build of Legacy into UNIX emulator. Use keyboard arrows to emulate button presses.
 Bitcoin-only version.
 
-### [legacy emu btconly debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L511)
+### [legacy emu btconly debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L479)
 
 ---
 ## TEST stage - [test.yml](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml)
 All the tests run test cases on the freshly built emulators from the previous `BUILD` stage.
 
-Consists of **34 jobs** below:
+Consists of **33 jobs** below:
 
 ### [core unit python test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L15)
 Python unit tests, checking core functionality.
@@ -149,37 +142,35 @@ Rust unit tests.
 
 ### [core unit asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L33)
 
-### [core unit t1 test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L50)
-
-### [core device test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L65)
+### [core device test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L54)
 Device tests for Core. Running device tests and also comparing screens
 with the expected UI result.
 See artifacts for a comprehensive report of UI.
 See [docs/tests/ui-tests](../tests/ui-tests.md) for more info.
 
-### [core device asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L94)
+### [core device asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L83)
 
-### [core btconly device test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L113)
+### [core btconly device test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L102)
 Device tests excluding altcoins, only for BTC.
 
-### [core btconly device asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L133)
+### [core btconly device asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L122)
 
-### [core monero test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L154)
+### [core monero test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L143)
 Monero tests.
 
-### [core monero asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L173)
+### [core monero asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L162)
 
-### [core u2f test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L195)
+### [core u2f test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L184)
 Tests for U2F and HID.
 
-### [core u2f asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L214)
+### [core u2f asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L203)
 
-### [core fido2 test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L232)
+### [core fido2 test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L221)
 FIDO2 device tests.
 
-### [core fido2 asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L255)
+### [core fido2 asan test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L244)
 
-### [core click test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L275)
+### [core click test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L264)
 Click tests.
 See [docs/tests/click-tests](../tests/click-tests.md) for more info.
 
@@ -264,7 +255,7 @@ Consists of **2 jobs** below:
 
 ### [core unix coverage posttest](https://github.com/trezor/trezor-firmware/blob/master/ci/posttest.yml#L10)
 
-### [unix ui changes](https://github.com/trezor/trezor-firmware/blob/master/ci/posttest.yml#L31)
+### [unix ui changes](https://github.com/trezor/trezor-firmware/blob/master/ci/posttest.yml#L32)
 
 ---
 ## DEPLOY stage - [deploy.yml](https://github.com/trezor/trezor-firmware/blob/master/ci/deploy.yml)
@@ -293,8 +284,8 @@ Consists of **13 jobs** below:
 
 ### [ui tests fixtures deploy](https://github.com/trezor/trezor-firmware/blob/master/ci/deploy.yml#L229)
 
-### [sync emulators to aws](https://github.com/trezor/trezor-firmware/blob/master/ci/deploy.yml#L251)
+### [sync emulators to aws](https://github.com/trezor/trezor-firmware/blob/master/ci/deploy.yml#L252)
 
-### [common sync](https://github.com/trezor/trezor-firmware/blob/master/ci/deploy.yml#L276)
+### [common sync](https://github.com/trezor/trezor-firmware/blob/master/ci/deploy.yml#L277)
 
 ---
diff --git a/docs/hardware/model-t/boot.md b/docs/core/misc/boot.md
similarity index 100%
rename from docs/hardware/model-t/boot.md
rename to docs/core/misc/boot.md
diff --git a/docs/hardware/model-t/memory.md b/docs/core/misc/memory.md
similarity index 100%
rename from docs/hardware/model-t/memory.md
rename to docs/core/misc/memory.md
diff --git a/docs/hardware/index.md b/docs/hardware/index.md
deleted file mode 100644
index 33c0dddc9d..0000000000
--- a/docs/hardware/index.md
+++ /dev/null
@@ -1 +0,0 @@
-# Hardware
diff --git a/docs/hardware/model-one/index.md b/docs/hardware/model-one/index.md
deleted file mode 100644
index bdcc15a83b..0000000000
--- a/docs/hardware/model-one/index.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Model One
-
-To be documented.
-
-In the meantime check out these great write-ups from @mcudev: https://mcudev.github.io.
diff --git a/docs/hardware/model-t/bom.txt b/docs/hardware/model-t/bom.txt
deleted file mode 100644
index f1a788fcc9..0000000000
--- a/docs/hardware/model-t/bom.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-Part Value                Device                                  Package                    Description
-C1   1n/50V               C_0402                                  0402
-C2   22p                  C_0402                                  0402
-C3   22p                  C_0402                                  0402
-C4   1u                   C_0603$REFLOW                           0603_REFLOW
-C5   1u                   C_0603                                  0603
-C6   10n                  C_0402                                  0402
-C7   100n                 C_0402                                  0402
-C8   10n                  C_0402                                  0402
-C9   100n                 C_0402                                  0402
-C10  100n                 C_0402                                  0402
-C11  1n                   C_0402                                  0402
-C12  2u2                  C_0805$REFLOW                           0805_REFLOW
-C13  2u2                  C_0805$REFLOW                           0805_REFLOW
-C14  4u7/16V              C_0805$REFLOW                           0805_REFLOW
-C15  4u7/16V              C_0805$REFLOW                           0805_REFLOW
-C16  100n                 C_0402                                  0402
-C18  100n                 C_0402                                  0402
-C19  1u                   C_0603                                  0603
-C20  100n                 C_0402                                  0402
-C21  100n                 C_0402                                  0402
-C22  1u                   C_0603                                  0603
-C23  10n                  C_0402                                  0402
-C24  100n                 C_0402                                  0402
-C25  1n/50V               C_0402                                  0402
-C26  10n                  C_0402                                  0402
-C27  100n                 C_0402                                  0402
-C28  100n                 C_0402                                  0402
-C29  100n                 C_0402                                  0402
-C30  10n                  C_0402                                  0402
-C31  100n                 C_0402                                  0402
-C32  10n                  C_0402                                  0402
-C33  1n                   C_0402                                  0402
-C34  2u2                  C_0805$REFLOW                           0805_REFLOW
-C36  47p                  C_0402                                  0402
-C37  47p                  C_0402                                  0402
-C38  47p                  C_0402                                  0402
-C39  47p                  C_0402                                  0402
-C40  47p                  C_0402                                  0402
-C41  100n                 C_0402                                  0402
-C42  1n                   C_0402                                  0402
-C43  47p                  C_0402                                  0402
-C44  100n                 C_0402                                  0402
-C45  2u2                  C_0805$REFLOW                           0805_REFLOW
-C46  1n                   C_0402                                  0402
-C47  1n                   C_0402                                  0402
-C48  10n                  C_0402                                  0402
-C49  10n                  C_0402                                  0402
-C50  10n                  C_0402                                  0402
-D1   PMEG3005             DS_SOD323F                              SOD323F
-D2   PESD5V0F1BLD         D_TRANSIL_BI_SOD882D                    SOD882D
-D3   PRTR5V0U2X           PRTR5V0_SOT143B$REFLOW                  SOT143B_REFLOW
-D4   PESD5V0F1BLD         D_TRANSIL_BI_SOD882D                    SOD882D
-D6   PMEG4005             DS_SOD323F                              SOD323F
-IC2  STM32F427VIT6        STM32F427_LQFP100                       LQFP100_NO_CENTER_NO_TDOCU
-IC5  TPS61043             TP6104X_WSON-8_3X3MM                    WSON-8_3X3MM
-IC6  XC6210B332PR         XC6210B_SOT89-5                         SOT89-5
-K1   DX07B024XJ1R1300     USB-C_JAE_DX07B024XJ1                   USB_C_JAE_DX07B024XJ1
-K3   ATTEND_112J-TDAR-R01 KON_µSD_CARD_ATTEND_112J_TXAR_R01_SMALL ATTEND_112J-TXAR-R01_SMALL
-K4   DF37NB-24DS-0.4V     DISPLEJ_154A2411CTP01                   DF37NB-24DS-0.4V
-K5   SWD                  SWD                                     SWD
-K6   DF37NB-10DS-0.4V     DISPLEJ_154A2411CTP01_TOUCH             DF37NB-10DS-0.4V
-L1   4u7 VLS252008ET-4R7M L_2.5X2.0                               L_2.5X2.0
-L2   BLM18AG102SN1D       L_0603$REFLOW                           0603_REFLOW
-L3   BLM18AG102SN1D       L_0603$REFLOW                           0603_REFLOW
-L4   BLM18AG102SN1D       L_0603$REFLOW                           0603_REFLOW
-LCD1                      LCD_DISPLEJ                             LCD
-MB1                       MB_1.27                                 MB1.27
-MB2                       MB_1.27                                 MB1.27
-MB3                       MB_1.50                                 MB1.5
-MB4                       MB_1.27                                 MB1.27
-MB5                       MB_1.50                                 MB1.5
-MB6                       MB_1.27                                 MB1.27
-MB7                       MB_1.27                                 MB1.27
-MB8                       MB_1.27                                 MB1.27
-MB9                       MB_1.27                                 MB1.27
-MB10                      MB_1.50                                 MB1.5
-MB11                      MB_1.50                                 MB1.5
-MB12                      MB_1.27                                 MB1.27
-MB13                      MB_1.27                                 MB1.27
-MB14                      MB_1.27                                 MB1.27
-MB15                      MB_1.00                                 MB_1.00
-MB16                      MB_1.00                                 MB_1.00
-MB17                      MB_1.00                                 MB_1.00
-MB18                      MB_1.27                                 MB1.27
-MB19                      MB_1.00                                 MB_1.00
-R1   22R                  R_0402                                  0402
-R4   5k1                  R_0402                                  0402
-R5   5k1                  R_0402                                  0402
-R6   1M                   R_0402                                  0402
-R7   1M                   R_0402                                  0402
-R8   MF-FSMF020X-2        POLYSWITCH_0603                         0603
-R9   100k                 R_0402                                  0402
-R10  3k3                  R_0402                                  0402
-R11  N.C.                 R_0402                                  0402
-R12  10k                  R_0402                                  0402
-R13  100R                 R_0402                                  0402
-R14  27R                  R_0402                                  0402
-R15  1k5                  R_0402                                  0402
-R16  1k5                  R_0402                                  0402
-R18  68R                  R_0402                                  0402
-R19  68R                  R_0402                                  0402
-R20  68R                  R_0402                                  0402
-R21  68R                  R_0402                                  0402
-R22  68R                  R_0402                                  0402
-R23  68R                  R_0402                                  0402
-R25  0R                   R_0402                                  0402
-R26  N.C.                 R_0402                                  0402
-X1   CTS406 8MHz          X_4V_6,0X3,5                            X6,0X3,5
diff --git a/docs/hardware/model-t/clock-tree.png b/docs/hardware/model-t/clock-tree.png
deleted file mode 100644
index daa0da3e4c..0000000000
Binary files a/docs/hardware/model-t/clock-tree.png and /dev/null differ
diff --git a/docs/hardware/model-t/dev-board-bottom-before.jpg b/docs/hardware/model-t/dev-board-bottom-before.jpg
deleted file mode 100644
index b71185c2a7..0000000000
Binary files a/docs/hardware/model-t/dev-board-bottom-before.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/dev-board-top-before.jpg b/docs/hardware/model-t/dev-board-top-before.jpg
deleted file mode 100644
index 0950d09850..0000000000
Binary files a/docs/hardware/model-t/dev-board-top-before.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/index.md b/docs/hardware/model-t/index.md
deleted file mode 100644
index dd314f9bff..0000000000
--- a/docs/hardware/model-t/index.md
+++ /dev/null
@@ -1,160 +0,0 @@
-
-# Trezor Model T Open Source Hardware Reference Documentation
-
-## Photo
-
-![Photo Front](photo-front.jpg)
-
-## Photo of assembled board (top)
-
-![Assembled Board Top](model-t-top-v12.jpg)
-
-## Photo of assembled board (bottom)
-
-![Assembled Board Bottom](model-t-bottom-v12.jpg)
-
-## Photo of assembled TFT LCD display + capacitive touch panel module (top)
-
-![Display Module Top](model-t-display-module-top.jpg)
-
-## Photo of assembled TFT LCD display + capacitive touch panel module (bottom)
-
-![Display Module Bottom](model-t-display-module-bottom.jpg)
-
-## Photo of disassembled TFT LCD display + capacitive touch panel module (top) (CTPM on left) (TFT LCD broken glass removed)
-
-![Display Module Disassembled Top](model-t-display-module-disassembled-top.jpg)
-
-## Photo of disassembled TFT LCD display + capacitive touch panel module (bottom) (CTPM on left) (TFT LCD broken glass removed)
-
-![Display Module Disassembled Bottom](model-t-display-module-disassembled-bottom.jpg)
-
-## Bill of Materials / BOM
-
-[BOM](bom.txt)
-
-## Schematic
-
-![Schematic](schematic.png)
-
-## Developer Kit
-
-* 1 x [STM32F429I-DISC1](https://www.st.com/en/evaluation-tools/32f429idiscovery.html) (note: [Manual with pin to dev board function mapping](https://www.st.com/content/ccc/resource/technical/document/user_manual/6b/25/05/23/a9/45/4d/6a/DM00093903.pdf/files/DM00093903.pdf/jcr:content/translations/en.DM00093903.pdf))
-* 1 x USB Cable Type A Plug/Male to Type Mini-B Plug/Male
-* 1 x USB Cable Type A Plug/Male to Type Micro-B Plug/Male
-* 1 x [ER-TFTM028-4 Display + Capacitive Touch Panel Module](https://www.ebay.com/itm/302049581340) (Note: specify 40-Pin Header, 8080 8-bit Parallel, VDD=3.3V, Capacitive Touch Panel) (note: [Manual](https://www.buydisplay.com/download/manual/ER-TFTM028-4_Datasheet.pdf))
-* 1 x [microSD Board](https://www.waveshare.com/micro-sd-storage-board.htm)
-* 1 x [Pack of 40 Female to female jumper wires with 0.1" header contacts](https://www.adafruit.com/product/266)
-
-### Display
-
-* Resolution: 240px x 240px -OR- 240px x 320px
-* Driver IC: ST7789V, GC9307, or ILI9341V (on-chip display data RAM of 240x320x18 bits)
-* 18-bit (262,144) RGB color graphic type TFT-LCD
-* Bus/Interface: 8080-I 8-bit parallel with 16-bit/pixel (RGB 5-6-5)
-
-#### Pinout
-
-|Description|MCU Pin|Notes|
-|-----------|-------|-----|
-|LCD_RST|PC14|display module pin 21. benign conflict with unpopulated OSC32_IN on dev board.|
-|LCD_FMARK|PD12|tearing effect input; display module pin 22|
-|LCD_PWM|PA7|backlight control (brightness); display module pin 29. benign conflict with I2C_EXT_RST on dev board.|
-|LCD_CS|PD7|display module pin 23|
-|LCD_RS|PD11|register select aka command/data; display module pin 24|
-|LCD_RD|PD4|display module pin 26|
-|LCD_WR|PD5|display module pin 25|
-|LCD_D0|PD14|display module pin 3|
-|LCD_D1|PD15|display module pin 4|
-|LCD_D2|PD0|display module pin 5|
-|LCD_D3|PD1|display module pin 6|
-|LCD_D4|PE7|display module pin 7|
-|LCD_D5|PE8|display module pin 8|
-|LCD_D6|PE9|display module pin 9|
-|LCD_D7|PE10|display module pin 10|
-|LCD_D8|PE11|not currently used|
-
-### Capacitive Touch Panel / Sensor
-
-* Bus/Interface: I2C
-* Driver IC: FT6236 or FT6206
-* single touch
-
-#### Pinout
-
-|Description|MCU Pin|Notes|
-|-----------|-------|-----|
-|TOUCH_ON|PB10|no mapped pin on display module|
-|I2C1_SCL|PB6|display module pin 30|
-|I2C1_SDA|PB7|display module pin 31|
-|EINT|PC4|not currently used. display module pin 39. conflict with USB OTG FS PSO on dev board.|
-|REST|PC5|benign conflict with USB OTG FS OC on dev board. no mapped pin on display module.|
-
-### microSD Socket
-
-* Bus/Interface: 4-bit
-
-#### Pinout
-
-|Description|MCU Pin|
-|-----------|-------|
-|SDIO_D0|PC8|
-|SDIO_D1|PC9|
-|SDIO_D2|PC10|
-|SDIO_D3|PC11|
-|SDIO_CK|PC12|
-|SDIO_CMD|PD2|
-|SD_CARDDETECT|PC13|
-|SD_ON|PC0|
-
-### USB Socket
-
-* USB HS (high-speed) peripheral in FS (full-speed) mode
-
-#### Pinout
-
-|Description|MCU Pin|Notes|
-|-----------|-------|-----|
-|OTG_HS_VBUS|PB13||
-|OTG_HS_ID|PB12||
-|OTG_HS_DM|PB14||
-|OTG_HS_DP|PB15||
-|SBU1|PA2|not currently used. conflict with L3GD20 Gyroscope MEMS on dev board.|
-|SBU2|PA3|not currently used|
-
-### Dev Board
-
-* [STM32F429ZIT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f429zi.html)
-* HSE / High-Speed External Crystal: 8 MHz
-* Integrated STMicroelectronics ST-LINK/V2.1 debugger
-
-Note: There are many conflicts between how the software maps GPIO pins and how the dev board maps them to its functions.
-Many of the conflicts are resolved by removing the external SDRAM chip and the TFT LCD display + resistive touch panel that come attached to the dev board.
-The unresolved conflicts are noted in the pinout descriptions above.
-Currently, testing has shown that it is not necessary to remove either the SDRAM or the TFT LCD display + resistive touch panel.
-If you choose to remove them, our experience is that the easiest way to remove the SDRAM chip is by first cutting the leads on one side of the chip (e.g.- with an X-Acto knife) and then lifting the chip and rocking it until the leads on the other side break. Be sure that no broken leads short to another pin as this can cause the dev board and/or display to malfunction. If some do, just clean them up so that they are separate again.
-This method reduces the amount of knife work, and the chance for slicing other things on the board (or yourself).
-To remove the TFT LCD display + resistive touch panel module, lift the module away from the metal tray, bend the metal tray out of the way, then cleanly pull/tear the flex PCB away from the solder connections to the main board (the connections usually break without much force).
-The metal tray is attached to the board with double stick tape. You just have to pull that up.
-
-## Photo of dev board before modifications (top)
-
-![Dev Board Top Before](dev-board-top-before.jpg)
-
-## Photo of dev board before modifications (bottom)
-
-![Dev Board Bottom Before](dev-board-bottom-before.jpg)
-
-Minimum MCU requirements:
-
-* STM32F4 family [STM32F427VIT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f427vi.html)
-* 168 MHz, 8 MHz HSE
-* 2048 KB Flash memory
-* 192 KB SRAM
-* 64 KB CCMRAM
-* FMC controller
-* TRNG
-
-### Clock Tree
-
-![Clock Tree](clock-tree.png)
diff --git a/docs/hardware/model-t/model-t-bottom-v10.jpg b/docs/hardware/model-t/model-t-bottom-v10.jpg
deleted file mode 100644
index f88442fab7..0000000000
Binary files a/docs/hardware/model-t/model-t-bottom-v10.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/model-t-bottom-v12.jpg b/docs/hardware/model-t/model-t-bottom-v12.jpg
deleted file mode 100644
index f545e4acbc..0000000000
Binary files a/docs/hardware/model-t/model-t-bottom-v12.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/model-t-display-module-bottom.jpg b/docs/hardware/model-t/model-t-display-module-bottom.jpg
deleted file mode 100644
index 761cfc063a..0000000000
Binary files a/docs/hardware/model-t/model-t-display-module-bottom.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/model-t-display-module-disassembled-bottom.jpg b/docs/hardware/model-t/model-t-display-module-disassembled-bottom.jpg
deleted file mode 100644
index d83835f1e4..0000000000
Binary files a/docs/hardware/model-t/model-t-display-module-disassembled-bottom.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/model-t-display-module-disassembled-top.jpg b/docs/hardware/model-t/model-t-display-module-disassembled-top.jpg
deleted file mode 100644
index 059dac5385..0000000000
Binary files a/docs/hardware/model-t/model-t-display-module-disassembled-top.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/model-t-display-module-top.jpg b/docs/hardware/model-t/model-t-display-module-top.jpg
deleted file mode 100644
index 1e3dee65be..0000000000
Binary files a/docs/hardware/model-t/model-t-display-module-top.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/model-t-top-v10.jpg b/docs/hardware/model-t/model-t-top-v10.jpg
deleted file mode 100644
index 45015129a7..0000000000
Binary files a/docs/hardware/model-t/model-t-top-v10.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/model-t-top-v12.jpg b/docs/hardware/model-t/model-t-top-v12.jpg
deleted file mode 100644
index e11d105639..0000000000
Binary files a/docs/hardware/model-t/model-t-top-v12.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/photo-front.jpg b/docs/hardware/model-t/photo-front.jpg
deleted file mode 100644
index 30c647aef6..0000000000
Binary files a/docs/hardware/model-t/photo-front.jpg and /dev/null differ
diff --git a/docs/hardware/model-t/schematic.png b/docs/hardware/model-t/schematic.png
deleted file mode 100644
index 4065b5a30e..0000000000
Binary files a/docs/hardware/model-t/schematic.png and /dev/null differ
diff --git a/docs/hardware/model-one/firmware-format.md b/docs/legacy/firmware-format.md
similarity index 100%
rename from docs/hardware/model-one/firmware-format.md
rename to docs/legacy/firmware-format.md
diff --git a/docs/legacy/index.md b/docs/legacy/index.md
index 276e43ee64..48ae4c0e4c 100644
--- a/docs/legacy/index.md
+++ b/docs/legacy/index.md
@@ -8,7 +8,7 @@ Ensure that you have Docker installed. You can follow [Docker's installation ins
 
 Clone this repository, then use `build-docker.sh` to build all images:
 ```sh
-git clone https://github.com/trezor/trezor-firmware.git
+git clone --recurse-submodules https://github.com/trezor/trezor-firmware.git
 cd trezor-firmware
 ./build-docker.sh
 ```
diff --git a/legacy/firmware/.changelog.d/1453.fixed b/legacy/firmware/.changelog.d/1453.fixed
new file mode 100644
index 0000000000..1672b03f08
--- /dev/null
+++ b/legacy/firmware/.changelog.d/1453.fixed
@@ -0,0 +1 @@
+Show full Stellar address and QR code.
diff --git a/legacy/firmware/.changelog.d/2373.fixed b/legacy/firmware/.changelog.d/2373.fixed
new file mode 100644
index 0000000000..631922d948
--- /dev/null
+++ b/legacy/firmware/.changelog.d/2373.fixed
@@ -0,0 +1 @@
+Wrap long Ethereum fee to next line if it does not fit.
diff --git a/legacy/firmware/.changelog.d/2682.added b/legacy/firmware/.changelog.d/2682.added
new file mode 100644
index 0000000000..265e0d1f31
--- /dev/null
+++ b/legacy/firmware/.changelog.d/2682.added
@@ -0,0 +1 @@
+Allow proposed Casa m/45' multisig paths for Bitcoin and Ethereum.
diff --git a/legacy/firmware/.changelog.d/2718.added b/legacy/firmware/.changelog.d/2718.added
new file mode 100644
index 0000000000..ba5e0de52a
--- /dev/null
+++ b/legacy/firmware/.changelog.d/2718.added
@@ -0,0 +1 @@
+Support native SegWit external inputs with non-ownership proof.
diff --git a/legacy/firmware/.changelog.d/2718.added.1 b/legacy/firmware/.changelog.d/2718.added.1
new file mode 100644
index 0000000000..2cbac75c01
--- /dev/null
+++ b/legacy/firmware/.changelog.d/2718.added.1
@@ -0,0 +1 @@
+Implement SLIP-0019 proofs of ownership for native SegWit.
diff --git a/legacy/firmware/.changelog.d/2718.added.2 b/legacy/firmware/.changelog.d/2718.added.2
new file mode 100644
index 0000000000..a7372ecde0
--- /dev/null
+++ b/legacy/firmware/.changelog.d/2718.added.2
@@ -0,0 +1 @@
+Implement `serialize` option in SignTx.
diff --git a/legacy/firmware/.changelog.d/2718.added.3 b/legacy/firmware/.changelog.d/2718.added.3
new file mode 100644
index 0000000000..38d0a16cc5
--- /dev/null
+++ b/legacy/firmware/.changelog.d/2718.added.3
@@ -0,0 +1 @@
+Implement SLIP-0025 coinjoin accounts.
diff --git a/legacy/firmware/.changelog.d/2718.added.4 b/legacy/firmware/.changelog.d/2718.added.4
new file mode 100644
index 0000000000..6146c8b2e5
--- /dev/null
+++ b/legacy/firmware/.changelog.d/2718.added.4
@@ -0,0 +1 @@
+Implement coinjoin signing.
diff --git a/legacy/firmware/.changelog.d/2743.changed b/legacy/firmware/.changelog.d/2743.changed
new file mode 100644
index 0000000000..88dc53d70f
--- /dev/null
+++ b/legacy/firmware/.changelog.d/2743.changed
@@ -0,0 +1 @@
+Increase 'SignIdentity.challenge_hidden' max_size to 512 bytes
diff --git a/legacy/firmware/.changelog.d/noissue.security b/legacy/firmware/.changelog.d/noissue.security
new file mode 100644
index 0000000000..7318011cc7
--- /dev/null
+++ b/legacy/firmware/.changelog.d/noissue.security
@@ -0,0 +1 @@
+Match and validate script type of change-outputs in Bitcoin signing.
diff --git a/legacy/firmware/config.c b/legacy/firmware/config.c
index cc1e5c759d..0bb3e59094 100644
--- a/legacy/firmware/config.c
+++ b/legacy/firmware/config.c
@@ -128,6 +128,8 @@ typedef struct {
   uint32_t last_use;
   uint8_t seed[64];
   secbool seedCached;
+  MessageType authorization_type;
+  AuthorizeCoinJoin coinjoin_authorization;
 } Session;
 
 static void session_clearCache(Session *session);
@@ -429,6 +431,9 @@ void session_clearCache(Session *session) {
   memzero(session->id, sizeof(session->id));
   memzero(session->seed, sizeof(session->seed));
   session->seedCached = false;
+  session->authorization_type = 0;
+  memzero(&session->coinjoin_authorization,
+          sizeof(session->coinjoin_authorization));
 }
 
 void config_lockDevice(void) {
@@ -641,6 +646,50 @@ const uint8_t *config_getSeed(void) {
   return NULL;
 }
 
+bool config_setCoinJoinAuthorization(const AuthorizeCoinJoin *authorization) {
+  if (activeSessionCache == NULL) {
+    fsm_sendFailure(FailureType_Failure_InvalidSession, "Invalid session");
+    return false;
+  }
+
+  if (authorization != NULL) {
+    activeSessionCache->authorization_type =
+        MessageType_MessageType_AuthorizeCoinJoin;
+    memcpy(&activeSessionCache->coinjoin_authorization, authorization,
+           sizeof(AuthorizeCoinJoin));
+  } else {
+    activeSessionCache->authorization_type = 0;
+    memzero(&activeSessionCache->coinjoin_authorization,
+            sizeof(AuthorizeCoinJoin));
+  }
+
+  return true;
+}
+
+MessageType config_getAuthorizationType(void) {
+  if (activeSessionCache == NULL) {
+    return 0;
+  }
+
+  return activeSessionCache->authorization_type;
+}
+
+const AuthorizeCoinJoin *config_getCoinJoinAuthorization(void) {
+  if (activeSessionCache == NULL) {
+    fsm_sendFailure(FailureType_Failure_InvalidSession, "Invalid session");
+    return NULL;
+  }
+
+  if (activeSessionCache->authorization_type !=
+      MessageType_MessageType_AuthorizeCoinJoin) {
+    fsm_sendFailure(FailureType_Failure_InvalidSession,
+                    "Coinjoin not authorized");
+    return NULL;
+  }
+
+  return &activeSessionCache->coinjoin_authorization;
+}
+
 static bool config_loadNode(const StorageHDNode *node, const char *curve,
                             HDNode *out) {
   return hdnode_from_xprv(node->depth, node->child_num, node->chain_code.bytes,
diff --git a/legacy/firmware/config.h b/legacy/firmware/config.h
index 94fa5b0e5b..fe523ada48 100644
--- a/legacy/firmware/config.h
+++ b/legacy/firmware/config.h
@@ -21,8 +21,10 @@
 #define __CONFIG_H__
 
 #include "bip32.h"
+#include "messages-bitcoin.pb.h"
 #include "messages-common.pb.h"
 #include "messages-management.pb.h"
+#include "messages.pb.h"
 
 #define STORAGE_FIELD(TYPE, NAME) \
   bool has_##NAME;                \
@@ -102,6 +104,10 @@ void config_loadDevice(const LoadDevice *msg);
 
 const uint8_t *config_getSeed(void);
 
+bool config_setCoinJoinAuthorization(const AuthorizeCoinJoin *authorization);
+MessageType config_getAuthorizationType(void);
+const AuthorizeCoinJoin *config_getCoinJoinAuthorization(void);
+
 bool config_getU2FRoot(HDNode *node);
 bool config_getRootNode(HDNode *node, const char *curve);
 
diff --git a/legacy/firmware/crypto.c b/legacy/firmware/crypto.c
index 1a1296d123..90e7b6a420 100644
--- a/legacy/firmware/crypto.c
+++ b/legacy/firmware/crypto.c
@@ -487,7 +487,7 @@ static bool check_cointype(const CoinInfo *coin, uint32_t slip44, bool full) {
 
 bool coin_path_check(const CoinInfo *coin, InputScriptType script_type,
                      uint32_t address_n_count, const uint32_t *address_n,
-                     bool has_multisig, bool full_check) {
+                     bool has_multisig, PathSchema unlock, bool full_check) {
   // This function checks that the path is a recognized path for the given coin.
   // Used by GetAddress to prevent ransom attacks where a user could be coerced
   // to use an address with an unenumerable path and used by SignTx to ensure
@@ -527,15 +527,25 @@ bool coin_path_check(const CoinInfo *coin, InputScriptType script_type,
       valid = valid && (address_n[2] <= PATH_MAX_CHANGE);
       valid = valid && (address_n[3] <= PATH_MAX_ADDRESS_INDEX);
     } else if (address_n_count == 5) {
-      // Unchained Capital compatibility pattern. Will be removed in the
-      // future.
-      // m / 45' / coin_type' / account' / [0-1000000] / address_index
-      valid = valid && check_cointype(coin, address_n[1], full_check);
-      valid = valid && (address_n[2] & PATH_HARDENED);
-      valid =
-          valid && ((address_n[2] & PATH_UNHARDEN_MASK) <= PATH_MAX_ACCOUNT);
-      valid = valid && (address_n[3] <= 1000000);
-      valid = valid && (address_n[4] <= PATH_MAX_ADDRESS_INDEX);
+      if (address_n[1] & PATH_HARDENED) {
+        // Unchained Capital compatibility pattern. Will be removed in the
+        // future.
+        // m / 45' / coin_type' / account' / [0-1000000] / address_index
+        valid = valid && check_cointype(coin, address_n[1], full_check);
+        valid = valid && (address_n[2] & PATH_HARDENED);
+        valid =
+            valid && ((address_n[2] & PATH_UNHARDEN_MASK) <= PATH_MAX_ACCOUNT);
+        valid = valid && (address_n[3] <= 1000000);
+        valid = valid && (address_n[4] <= PATH_MAX_ADDRESS_INDEX);
+      } else {
+        // Casa proposed "universal multisig" pattern with unhardened parts.
+        // m/45'/coin_type/account/change/address_index
+        valid = valid &&
+                check_cointype(coin, address_n[1] | PATH_HARDENED, full_check);
+        valid = valid && (address_n[2] <= PATH_MAX_ACCOUNT);
+        valid = valid && (address_n[3] <= PATH_MAX_CHANGE);
+        valid = valid && (address_n[4] <= PATH_MAX_ADDRESS_INDEX);
+      }
     } else if (address_n_count == 6) {
       // Unchained Capital compatibility pattern. Will be removed in the
       // future.
@@ -722,6 +732,127 @@ bool coin_path_check(const CoinInfo *coin, InputScriptType script_type,
     return valid;
   }
 
+  // m/10025' : SLIP25 CoinJoin
+  // m / purpose' / coin_type' / account' / script_type' / change /
+  // address_index
+  if (address_n[0] == PATH_SLIP25_PURPOSE) {
+    valid = valid && coin->has_taproot;
+    valid = valid && (coin->bech32_prefix != NULL);
+    valid = valid && (address_n_count == 6);
+    valid = valid && check_cointype(coin, address_n[1], full_check);
+    valid = valid && (address_n[2] == (PATH_HARDENED | 0));  // Only first acc.
+    valid = valid && (address_n[3] == (PATH_HARDENED | 1));  // Only SegWit v1.
+    valid = valid && (address_n[4] <= PATH_MAX_CHANGE);
+    valid = valid &&
+            ((unlock == SCHEMA_SLIP25_TAPROOT) ||
+             (unlock == SCHEMA_SLIP25_TAPROOT_EXTERNAL && address_n[4] == 0));
+    valid = valid && (address_n[5] <= PATH_MAX_ADDRESS_INDEX);
+    if (full_check) {
+      // we do not support Multisig for CoinJoin
+      valid = valid && !has_multisig;
+      valid = valid && (script_type == InputScriptType_SPENDTAPROOT);
+    }
+    return valid;
+  }
+
   // unknown path
   return false;
 }
+
+bool is_multisig_input_script_type(InputScriptType script_type) {
+  // we do not support Multisig with Taproot yet
+  if (script_type == InputScriptType_SPENDMULTISIG ||
+      script_type == InputScriptType_SPENDP2SHWITNESS ||
+      script_type == InputScriptType_SPENDWITNESS) {
+    return true;
+  }
+  return false;
+}
+
+bool is_multisig_output_script_type(OutputScriptType script_type) {
+  // we do not support Multisig with Taproot yet
+  if (script_type == OutputScriptType_PAYTOMULTISIG ||
+      script_type == OutputScriptType_PAYTOP2SHWITNESS ||
+      script_type == OutputScriptType_PAYTOWITNESS) {
+    return true;
+  }
+  return false;
+}
+
+bool is_internal_input_script_type(InputScriptType script_type) {
+  if (script_type == InputScriptType_SPENDADDRESS ||
+      script_type == InputScriptType_SPENDMULTISIG ||
+      script_type == InputScriptType_SPENDP2SHWITNESS ||
+      script_type == InputScriptType_SPENDWITNESS ||
+      script_type == InputScriptType_SPENDTAPROOT) {
+    return true;
+  }
+  return false;
+}
+
+bool is_change_output_script_type(OutputScriptType script_type) {
+  if (script_type == OutputScriptType_PAYTOADDRESS ||
+      script_type == OutputScriptType_PAYTOMULTISIG ||
+      script_type == OutputScriptType_PAYTOP2SHWITNESS ||
+      script_type == OutputScriptType_PAYTOWITNESS ||
+      script_type == OutputScriptType_PAYTOTAPROOT) {
+    return true;
+  }
+  return false;
+}
+
+bool is_segwit_input_script_type(InputScriptType script_type) {
+  if (script_type == InputScriptType_SPENDP2SHWITNESS ||
+      script_type == InputScriptType_SPENDWITNESS ||
+      script_type == InputScriptType_SPENDTAPROOT) {
+    return true;
+  }
+  return false;
+}
+
+bool is_segwit_output_script_type(OutputScriptType script_type) {
+  if (script_type == OutputScriptType_PAYTOP2SHWITNESS ||
+      script_type == OutputScriptType_PAYTOWITNESS ||
+      script_type == OutputScriptType_PAYTOTAPROOT) {
+    return true;
+  }
+  return false;
+}
+
+bool change_output_to_input_script_type(OutputScriptType output_script_type,
+                                        InputScriptType *input_script_type) {
+  switch (output_script_type) {
+    case OutputScriptType_PAYTOADDRESS:
+      *input_script_type = InputScriptType_SPENDADDRESS;
+      return true;
+    case OutputScriptType_PAYTOMULTISIG:
+      *input_script_type = InputScriptType_SPENDMULTISIG;
+      return true;
+    case OutputScriptType_PAYTOWITNESS:
+      *input_script_type = InputScriptType_SPENDWITNESS;
+      return true;
+    case OutputScriptType_PAYTOP2SHWITNESS:
+      *input_script_type = InputScriptType_SPENDP2SHWITNESS;
+      return true;
+    case OutputScriptType_PAYTOTAPROOT:
+      *input_script_type = InputScriptType_SPENDTAPROOT;
+      return true;
+    default:
+      return false;
+  }
+}
+
+void slip21_from_seed(const uint8_t *seed, int seed_len, Slip21Node *out) {
+  hmac_sha512((uint8_t *)"Symmetric key seed", 18, seed, seed_len, out->data);
+}
+
+void slip21_derive_path(Slip21Node *inout, const uint8_t *label,
+                        size_t label_len) {
+  HMAC_SHA512_CTX hctx = {0};
+  hmac_sha512_Init(&hctx, inout->data, 32);
+  hmac_sha512_Update(&hctx, (uint8_t *)"\0", 1);
+  hmac_sha512_Update(&hctx, label, label_len);
+  hmac_sha512_Final(&hctx, inout->data);
+}
+
+const uint8_t *slip21_key(const Slip21Node *node) { return &node->data[32]; }
diff --git a/legacy/firmware/crypto.h b/legacy/firmware/crypto.h
index 2ecb1acef4..9098730c6c 100644
--- a/legacy/firmware/crypto.h
+++ b/legacy/firmware/crypto.h
@@ -36,11 +36,26 @@
 #define PATH_UNHARDEN_MASK 0x7fffffff
 #define PATH_MAX_ACCOUNT 100
 #define PATH_MAX_CHANGE 1
+// The maximum allowed change address.  This should be large enough for normal
+// use and still allow to quickly brute-force the correct bip32 path.
 #define PATH_MAX_ADDRESS_INDEX 1000000
 #define PATH_SLIP25_PURPOSE (PATH_HARDENED | 10025)
 
+// The number of bip32 levels used in a wallet (chain and address)
+#define BIP32_WALLET_DEPTH 2
+
 #define ser_length_size(len) ((len) < 253 ? 1 : (len) < 0x10000 ? 3 : 5)
 
+typedef enum {
+  SCHEMA_NONE,
+  SCHEMA_SLIP25_TAPROOT,
+  SCHEMA_SLIP25_TAPROOT_EXTERNAL
+} PathSchema;
+
+typedef struct {
+  uint8_t data[64];
+} Slip21Node;
+
 uint32_t ser_length(uint32_t len, uint8_t *out);
 
 uint32_t ser_length_hash(Hasher *hasher, uint32_t len);
@@ -80,6 +95,20 @@ int cryptoIdentityFingerprint(const IdentityType *identity, uint8_t *hash);
 
 bool coin_path_check(const CoinInfo *coin, InputScriptType script_type,
                      uint32_t address_n_count, const uint32_t *address_n,
-                     bool has_multisig, bool full_check);
+                     bool has_multisig, PathSchema unlock, bool full_check);
+
+bool is_multisig_input_script_type(InputScriptType script_type);
+bool is_multisig_output_script_type(OutputScriptType script_type);
+bool is_internal_input_script_type(InputScriptType script_type);
+bool is_change_output_script_type(OutputScriptType script_type);
+bool is_segwit_input_script_type(InputScriptType script_type);
+bool is_segwit_output_script_type(OutputScriptType script_type);
+bool change_output_to_input_script_type(OutputScriptType output_script_type,
+                                        InputScriptType *input_script_type);
+
+void slip21_from_seed(const uint8_t *seed, int seed_len, Slip21Node *out);
+void slip21_derive_path(Slip21Node *inout, const uint8_t *label,
+                        size_t label_len);
+const uint8_t *slip21_key(const Slip21Node *node);
 
 #endif
diff --git a/legacy/firmware/ethereum.c b/legacy/firmware/ethereum.c
index a6a01ccf14..80fc2cf954 100644
--- a/legacy/firmware/ethereum.c
+++ b/legacy/firmware/ethereum.c
@@ -477,9 +477,8 @@ static void layoutEthereumFeeEIP1559(const char *description,
 
   ethereumFormatAmount(&amount_val, NULL, amount_str, sizeof(amount_str));
 
-  layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), NULL,
-                    _("Confirm fee"), description, amount_str, NULL, NULL,
-                    NULL);
+  layoutDialogSwipeWrapping(&bmp_icon_question, _("Cancel"), _("Confirm"),
+                            _("Confirm fee"), description, amount_str);
 }
 
 /*
@@ -1041,8 +1040,9 @@ bool ethereum_parse(const char *address, uint8_t pubkeyhash[20]) {
   return true;
 }
 
-bool ethereum_path_check(uint32_t address_n_count, const uint32_t *address_n,
-                         bool pubkey_export, uint64_t chain) {
+static bool ethereum_path_check_bip44(uint32_t address_n_count,
+                                      const uint32_t *address_n,
+                                      bool pubkey_export, uint64_t chain) {
   bool valid = (address_n_count >= 3);
   valid = valid && (address_n[0] == (PATH_HARDENED | 44));
   valid = valid && (address_n[1] & PATH_HARDENED);
@@ -1098,3 +1098,47 @@ bool ethereum_path_check(uint32_t address_n_count, const uint32_t *address_n,
 
   return valid;
 }
+
+static bool ethereum_path_check_casa45(uint32_t address_n_count,
+                                       const uint32_t *address_n,
+                                       uint64_t chain) {
+  bool valid = (address_n_count == 5);
+  valid = valid && (address_n[0] == (PATH_HARDENED | 45));
+  valid = valid && (address_n[1] < PATH_HARDENED);
+  valid = valid && (address_n[2] <= PATH_MAX_ACCOUNT);
+  valid = valid && (address_n[3] <= PATH_MAX_CHANGE);
+  valid = valid && (address_n[4] <= PATH_MAX_ADDRESS_INDEX);
+
+  uint32_t path_slip44 = address_n[1];
+  if (chain == CHAIN_ID_UNKNOWN) {
+    valid = valid && (is_ethereum_slip44(path_slip44));
+  } else {
+    uint32_t chain_slip44 = ethereum_slip44_by_chain_id(chain);
+    if (chain_slip44 == SLIP44_UNKNOWN) {
+      // Allow Ethereum or testnet paths for unknown networks.
+      valid = valid && (path_slip44 == 60 || path_slip44 == 1);
+    } else if (chain_slip44 != 60 && chain_slip44 != 1) {
+      // Allow cross-signing with Ethereum unless it's testnet.
+      valid = valid && (path_slip44 == chain_slip44 || path_slip44 == 60);
+    } else {
+      valid = valid && (path_slip44 == chain_slip44);
+    }
+  }
+
+  return valid;
+}
+
+bool ethereum_path_check(uint32_t address_n_count, const uint32_t *address_n,
+                         bool pubkey_export, uint64_t chain) {
+  if (address_n_count == 0) {
+    return false;
+  }
+  if (address_n[0] == (PATH_HARDENED | 44)) {
+    return ethereum_path_check_bip44(address_n_count, address_n, pubkey_export,
+                                     chain);
+  }
+  if (address_n[0] == (PATH_HARDENED | 45)) {
+    return ethereum_path_check_casa45(address_n_count, address_n, chain);
+  }
+  return false;
+}
diff --git a/legacy/firmware/fsm.c b/legacy/firmware/fsm.c
index 756a6a740d..9ad8a4cbbb 100644
--- a/legacy/firmware/fsm.c
+++ b/legacy/firmware/fsm.c
@@ -48,6 +48,7 @@
 #include "secp256k1.h"
 #include "signing.h"
 #include "supervise.h"
+#include "timer.h"
 #include "transaction.h"
 #include "trezor.h"
 #include "usb.h"
@@ -68,6 +69,11 @@
 
 static uint8_t msg_resp[MSG_OUT_DECODED_SIZE] __attribute__((aligned));
 
+// Authorization message type triggered by DoPreauthorized.
+static MessageType authorization_type = 0;
+
+static uint32_t unlock_path = 0;
+
 #define RESP_INIT(TYPE)                                                    \
   TYPE *resp = (TYPE *)(void *)msg_resp;                                   \
   _Static_assert(sizeof(msg_resp) >= sizeof(TYPE), #TYPE " is too large"); \
@@ -98,10 +104,11 @@ static uint8_t msg_resp[MSG_OUT_DECODED_SIZE] __attribute__((aligned));
     return;                 \
   }
 
-#define CHECK_UNLOCKED         \
-  if (!session_isUnlocked()) { \
-    layoutHome();              \
-    return;                    \
+#define CHECK_UNLOCKED                                              \
+  if (!session_isUnlocked()) {                                      \
+    fsm_sendFailure(FailureType_Failure_ProcessError, _("Locked")); \
+    layoutHome();                                                   \
+    return;                                                         \
   }
 
 #define CHECK_PARAM(cond, errormsg)                             \
@@ -241,6 +248,24 @@ static HDNode *fsm_getDerivedNode(const char *curve, const uint32_t *address_n,
   return &node;
 }
 
+static bool fsm_getSlip21Key(const char *path[], size_t path_count,
+                             uint8_t key[32]) {
+  const uint8_t *seed = config_getSeed();
+  if (seed == NULL) {
+    return false;
+  }
+
+  static CONFIDENTIAL Slip21Node node;
+  slip21_from_seed(seed, 64, &node);
+  for (size_t i = 0; i < path_count; ++i) {
+    slip21_derive_path(&node, (uint8_t *)path[i], strlen(path[i]));
+  }
+  memcpy(key, slip21_key(&node), 32);
+  memzero(&node, sizeof(node));
+
+  return true;
+}
+
 static bool fsm_layoutAddress(const char *address, const char *desc,
                               bool ignorecase, size_t prefixlen,
                               const uint32_t *address_n, size_t address_n_count,
@@ -353,6 +378,14 @@ bool fsm_layoutVerifyMessage(const uint8_t *msg, uint32_t len) {
   }
 }
 
+bool fsm_layoutCommitmentData(const uint8_t *msg, uint32_t len) {
+  if (is_valid_ascii(msg, len)) {
+    return fsm_layoutPaginated(_("Commitment data"), msg, len, true);
+  } else {
+    return fsm_layoutPaginated(_("Binary commitment data"), msg, len, false);
+  }
+}
+
 void fsm_msgRebootToBootloader(void) {
   layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), NULL,
                     _("Do you want to"), _("restart device in"),
@@ -377,12 +410,24 @@ void fsm_msgRebootToBootloader(void) {
 void fsm_abortWorkflows(void) {
   recovery_abort();
   signing_abort();
+  authorization_type = 0;
+  unlock_path = 0;
 #if !BITCOIN_ONLY
   ethereum_signing_abort();
   stellar_signingAbort();
 #endif
 }
 
+void fsm_postMsgCleanup(MessageType message_type) {
+  if (message_type != MessageType_MessageType_DoPreauthorized) {
+    authorization_type = 0;
+  }
+
+  if (message_type != MessageType_MessageType_UnlockPath) {
+    unlock_path = 0;
+  }
+}
+
 bool fsm_layoutPathWarning(void) {
   layoutDialogSwipe(&bmp_icon_warning, _("Abort"), _("Continue"), NULL,
                     _("Wrong address path"), _("for selected coin."), NULL,
diff --git a/legacy/firmware/fsm.h b/legacy/firmware/fsm.h
index eb8518fb8c..db7e878f8c 100644
--- a/legacy/firmware/fsm.h
+++ b/legacy/firmware/fsm.h
@@ -29,6 +29,9 @@
 #include "messages-nem.pb.h"
 #include "messages-stellar.pb.h"
 
+// CoinJoin fee rate multiplier.
+#define FEE_RATE_DECIMALS (1000000)
+
 // message functions
 
 void fsm_sendSuccess(const char *text);
@@ -71,6 +74,7 @@ void fsm_msgWordAck(const WordAck *msg);
 void fsm_msgSetU2FCounter(const SetU2FCounter *msg);
 void fsm_msgGetNextU2FCounter(void);
 void fsm_msgGetFirmwareHash(const GetFirmwareHash *msg);
+void fsm_msgSetBusy(const SetBusy *msg);
 
 // coin
 void fsm_msgGetPublicKey(const GetPublicKey *msg);
@@ -80,6 +84,12 @@ void fsm_msgTxAck(
 void fsm_msgGetAddress(const GetAddress *msg);
 void fsm_msgSignMessage(const SignMessage *msg);
 void fsm_msgVerifyMessage(const VerifyMessage *msg);
+void fsm_msgGetOwnershipId(const GetOwnershipId *msg);
+void fsm_msgGetOwnershipProof(const GetOwnershipProof *msg);
+void fsm_msgAuthorizeCoinJoin(const AuthorizeCoinJoin *msg);
+void fsm_msgCancelAuthorization(const CancelAuthorization *msg);
+void fsm_msgDoPreauthorized(const DoPreauthorized *msg);
+void fsm_msgUnlockPath(const UnlockPath *msg);
 
 // crypto
 void fsm_msgCipherKeyValue(const CipherKeyValue *msg);
@@ -146,8 +156,13 @@ bool fsm_layoutVerifyMessage(const uint8_t *msg, uint32_t len);
 bool fsm_layoutPathWarning(void);
 bool fsm_checkCoinPath(const CoinInfo *coin, InputScriptType script_type,
                        uint32_t address_n_count, const uint32_t *address_n,
-                       bool has_multisig, bool show_warning);
+                       bool has_multisig, MessageType message_type,
+                       bool show_warning);
+
+bool fsm_getOwnershipId(uint8_t *script_pubkey, size_t script_pubkey_size,
+                        uint8_t ownership_id[32]);
 
 void fsm_abortWorkflows(void);
+void fsm_postMsgCleanup(MessageType message_type);
 
 #endif
diff --git a/legacy/firmware/fsm_msg_coin.h b/legacy/firmware/fsm_msg_coin.h
index a7f0a05aa4..bca2a88a8e 100644
--- a/legacy/firmware/fsm_msg_coin.h
+++ b/legacy/firmware/fsm_msg_coin.h
@@ -35,12 +35,14 @@ void fsm_msgGetPublicKey(const GetPublicKey *msg) {
     curve = msg->ecdsa_curve_name;
   }
 
-  // Do not allow access to SLIP25 paths.
-  if (msg->address_n_count > 0 && msg->address_n[0] == PATH_SLIP25_PURPOSE &&
-      config_getSafetyCheckLevel() == SafetyCheckLevel_Strict) {
-    fsm_sendFailure(FailureType_Failure_DataError, _("Forbidden key path"));
-    layoutHome();
-    return;
+  // UnlockPath is required to access SLIP25 paths.
+  if (msg->address_n_count > 0 && msg->address_n[0] == PATH_SLIP25_PURPOSE) {
+    // Verify that the desired path lies in the unlocked subtree.
+    if (msg->address_n[0] != unlock_path) {
+      fsm_sendFailure(FailureType_Failure_DataError, _("Forbidden key path"));
+      layoutHome();
+      return;
+    }
   }
 
   // derive m/0' to obtain root_fingerprint
@@ -126,6 +128,36 @@ void fsm_msgGetPublicKey(const GetPublicKey *msg) {
   layoutHome();
 }
 
+static PathSchema fsm_getUnlockedSchema(MessageType message_type) {
+  if (message_type == MessageType_MessageType_AuthorizeCoinJoin) {
+    // Grant full access to SLIP-25 account.
+    return SCHEMA_SLIP25_TAPROOT;
+  }
+
+  if (authorization_type == MessageType_MessageType_AuthorizeCoinJoin) {
+    const AuthorizeCoinJoin *authorization = config_getCoinJoinAuthorization();
+    if (authorization == NULL ||
+        authorization->address_n[0] != PATH_SLIP25_PURPOSE) {
+      return SCHEMA_NONE;
+    }
+    // SLIP-25 access unlocked.
+  } else if (unlock_path == PATH_SLIP25_PURPOSE) {
+    // SLIP-25 access unlocked.
+  } else {
+    return SCHEMA_NONE;
+  }
+
+  switch (message_type) {
+    case MessageType_MessageType_GetOwnershipProof:
+    case MessageType_MessageType_SignTx:
+      // Grant full access to SLIP-25 account.
+      return SCHEMA_SLIP25_TAPROOT;
+    default:
+      // Grant access to SLIP-25 account's external chain.
+      return SCHEMA_SLIP25_TAPROOT_EXTERNAL;
+  }
+}
+
 void fsm_msgSignTx(const SignTx *msg) {
   CHECK_INITIALIZED
 
@@ -136,7 +168,17 @@ void fsm_msgSignTx(const SignTx *msg) {
   CHECK_PARAM(msg->inputs_count + msg->outputs_count >= msg->inputs_count,
               _("Value overflow"));
 
-  CHECK_PIN
+  const AuthorizeCoinJoin *authorization = NULL;
+  if (authorization_type == MessageType_MessageType_AuthorizeCoinJoin) {
+    authorization = config_getCoinJoinAuthorization();
+    if (authorization == NULL) {
+      return;
+    }
+  } else {
+    CHECK_PIN
+  }
+
+  PathSchema unlock = fsm_getUnlockedSchema(MessageType_MessageType_SignTx);
 
   const CoinInfo *coin = fsm_getCoin(msg->has_coin_name, msg->coin_name);
   if (!coin) return;
@@ -150,11 +192,13 @@ void fsm_msgSignTx(const SignTx *msg) {
   const HDNode *node = fsm_getDerivedNode(coin->curve_name, NULL, 0, NULL);
   if (!node) return;
 
-  signing_init(msg, coin, node);
+  signing_init(msg, coin, node, authorization, unlock);
 }
 
 void fsm_msgTxAck(TxAck *msg) {
-  CHECK_UNLOCKED
+  if (!signing_is_preauthorized()) {
+    CHECK_UNLOCKED
+  }
 
   CHECK_PARAM(msg->has_tx, _("No transaction provided"));
 
@@ -163,15 +207,18 @@ void fsm_msgTxAck(TxAck *msg) {
 
 bool fsm_checkCoinPath(const CoinInfo *coin, InputScriptType script_type,
                        uint32_t address_n_count, const uint32_t *address_n,
-                       bool has_multisig, bool show_warning) {
+                       bool has_multisig, MessageType message_type,
+                       bool show_warning) {
+  PathSchema unlock = fsm_getUnlockedSchema(message_type);
+
   if (coin_path_check(coin, script_type, address_n_count, address_n,
-                      has_multisig, true)) {
+                      has_multisig, unlock, true)) {
     return true;
   }
 
   if (config_getSafetyCheckLevel() == SafetyCheckLevel_Strict &&
       !coin_path_check(coin, script_type, address_n_count, address_n,
-                       has_multisig, false)) {
+                       has_multisig, unlock, false)) {
     fsm_sendFailure(FailureType_Failure_DataError, _("Forbidden key path"));
     return false;
   }
@@ -183,6 +230,27 @@ bool fsm_checkCoinPath(const CoinInfo *coin, InputScriptType script_type,
   return true;
 }
 
+bool fsm_checkScriptType(const CoinInfo *coin, InputScriptType script_type) {
+  if (!is_internal_input_script_type(script_type)) {
+    fsm_sendFailure(FailureType_Failure_DataError, _("Invalid script type"));
+    return false;
+  }
+
+  if (is_segwit_input_script_type(script_type) && !coin->has_segwit) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Segwit not enabled on this coin"));
+    return false;
+  }
+
+  if (script_type == InputScriptType_SPENDTAPROOT && !coin->has_taproot) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Taproot not enabled on this coin"));
+    return false;
+  }
+
+  return true;
+}
+
 void fsm_msgGetAddress(const GetAddress *msg) {
   RESP_INIT(Address);
 
@@ -195,6 +263,7 @@ void fsm_msgGetAddress(const GetAddress *msg) {
 
   if (!fsm_checkCoinPath(coin, msg->script_type, msg->address_n_count,
                          msg->address_n, msg->has_multisig,
+                         MessageType_MessageType_GetAddress,
                          msg->show_display)) {
     layoutHome();
     return;
@@ -281,7 +350,8 @@ void fsm_msgSignMessage(const SignMessage *msg) {
   if (!coin) return;
 
   if (!fsm_checkCoinPath(coin, msg->script_type, msg->address_n_count,
-                         msg->address_n, false, true)) {
+                         msg->address_n, false,
+                         MessageType_MessageType_SignMessage, true)) {
     layoutHome();
     return;
   }
@@ -373,3 +443,419 @@ void fsm_msgVerifyMessage(const VerifyMessage *msg) {
   }
   layoutHome();
 }
+
+bool fsm_getOwnershipId(uint8_t *script_pubkey, size_t script_pubkey_size,
+                        uint8_t ownership_id[OWNERSHIP_ID_SIZE]) {
+  const char *OWNERSHIP_ID_KEY_PATH[] = {"SLIP-0019",
+                                         "Ownership identification key"};
+
+  uint8_t ownership_id_key[32] = {0};
+  if (!fsm_getSlip21Key(OWNERSHIP_ID_KEY_PATH, 2, ownership_id_key)) {
+    return false;
+  }
+
+  hmac_sha256(ownership_id_key, sizeof(ownership_id_key), script_pubkey,
+              script_pubkey_size, ownership_id);
+
+  return true;
+}
+
+void fsm_msgGetOwnershipId(const GetOwnershipId *msg) {
+  RESP_INIT(OwnershipId);
+
+  CHECK_INITIALIZED
+
+  CHECK_PIN
+
+  const CoinInfo *coin = fsm_getCoin(msg->has_coin_name, msg->coin_name);
+  if (!coin) return;
+
+  if (!fsm_checkCoinPath(coin, msg->script_type, msg->address_n_count,
+                         msg->address_n, msg->has_multisig,
+                         MessageType_MessageType_GetOwnershipId, false)) {
+    layoutHome();
+    return;
+  }
+
+  if (!fsm_checkScriptType(coin, msg->script_type)) {
+    layoutHome();
+    return;
+  }
+
+  HDNode *node = fsm_getDerivedNode(coin->curve_name, msg->address_n,
+                                    msg->address_n_count, NULL);
+  if (!node) return;
+
+  uint8_t script_pubkey[520] = {0};
+  pb_size_t script_pubkey_size = 0;
+  if (!get_script_pubkey(coin, node, msg->has_multisig, &msg->multisig,
+                         msg->script_type, script_pubkey,
+                         &script_pubkey_size)) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Failed to derive scriptPubKey"));
+    layoutHome();
+    return;
+  }
+
+  if (!fsm_getOwnershipId(script_pubkey, script_pubkey_size,
+                          resp->ownership_id.bytes)) {
+    return;
+  }
+
+  resp->ownership_id.size = 32;
+
+  msg_write(MessageType_MessageType_OwnershipId, resp);
+  layoutHome();
+}
+
+void fsm_msgGetOwnershipProof(const GetOwnershipProof *msg) {
+  RESP_INIT(OwnershipProof);
+
+  CHECK_INITIALIZED
+
+  const CoinInfo *coin = fsm_getCoin(msg->has_coin_name, msg->coin_name);
+  if (!coin) return;
+
+  const AuthorizeCoinJoin *authorization = NULL;
+  if (authorization_type == MessageType_MessageType_AuthorizeCoinJoin) {
+    authorization = config_getCoinJoinAuthorization();
+    if (authorization == NULL) {
+      return;
+    }
+
+    // Check whether the authorization matches the parameters of the request.
+    size_t coordinator_len = strlen(authorization->coordinator);
+    if (msg->address_n_count !=
+            authorization->address_n_count + BIP32_WALLET_DEPTH ||
+        memcmp(msg->address_n, authorization->address_n,
+               sizeof(uint32_t) * authorization->address_n_count) != 0 ||
+        strcmp(msg->coin_name, authorization->coin_name) != 0 ||
+        msg->script_type != authorization->script_type ||
+        msg->commitment_data.size < coordinator_len + 1 ||
+        msg->commitment_data.bytes[0] != coordinator_len ||
+        memcmp(msg->commitment_data.bytes + 1, authorization->coordinator,
+               coordinator_len) != 0) {
+      fsm_sendFailure(FailureType_Failure_ProcessError,
+                      _("Unauthorized operation"));
+      layoutHome();
+      return;
+    }
+  } else {
+    CHECK_PIN
+    if (!fsm_checkCoinPath(coin, msg->script_type, msg->address_n_count,
+                           msg->address_n, msg->has_multisig,
+                           MessageType_MessageType_GetOwnershipProof, false)) {
+      layoutHome();
+      return;
+    }
+  }
+
+  if (msg->has_multisig) {
+    // The legacy implementation currently only supports singlesig native segwit
+    // v0 and v1, the bare minimum for CoinJoin.
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Multisig not supported."));
+    layoutHome();
+    return;
+  }
+
+  if (!fsm_checkScriptType(coin, msg->script_type)) {
+    layoutHome();
+    return;
+  }
+
+  HDNode *node = fsm_getDerivedNode(coin->curve_name, msg->address_n,
+                                    msg->address_n_count, NULL);
+  if (!node) return;
+
+  uint8_t script_pubkey[520] = {0};
+  pb_size_t script_pubkey_size = 0;
+  if (!get_script_pubkey(coin, node, msg->has_multisig, &msg->multisig,
+                         msg->script_type, script_pubkey,
+                         &script_pubkey_size)) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Failed to derive scriptPubKey"));
+    layoutHome();
+    return;
+  }
+
+  uint8_t ownership_id[OWNERSHIP_ID_SIZE] = {0};
+  if (!fsm_getOwnershipId(script_pubkey, script_pubkey_size, ownership_id)) {
+    return;
+  }
+
+  // Providing an ownership ID is optional in case of singlesig, but if one is
+  // provided, then it should match.
+  if (msg->ownership_ids_count) {
+    if (msg->ownership_ids_count != 1 ||
+        msg->ownership_ids[0].size != sizeof(ownership_id) ||
+        memcmp(ownership_id, msg->ownership_ids[0].bytes,
+               sizeof(ownership_id)) != 0) {
+      fsm_sendFailure(FailureType_Failure_DataError,
+                      _("Invalid ownership identifier"));
+      layoutHome();
+      return;
+    }
+  }
+
+  // In order to set the "user confirmation" bit in the proof, the user must
+  // actually confirm.
+  uint8_t flags = msg->user_confirmation;
+  if (!authorization && msg->user_confirmation) {
+    layoutConfirmOwnershipProof();
+    if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
+      fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
+      layoutHome();
+      return;
+    }
+
+    if (msg->has_commitment_data) {
+      if (!fsm_layoutCommitmentData(msg->commitment_data.bytes,
+                                    msg->commitment_data.size)) {
+        fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
+        layoutHome();
+        return;
+      }
+    }
+  }
+
+  if (!get_ownership_proof(coin, msg->script_type, node, flags, ownership_id,
+                           script_pubkey, script_pubkey_size,
+                           msg->commitment_data.bytes,
+                           msg->commitment_data.size, resp)) {
+    fsm_sendFailure(FailureType_Failure_ProcessError, _("Signing failed"));
+
+    layoutHome();
+    return;
+  }
+
+  msg_write(MessageType_MessageType_OwnershipProof, resp);
+  layoutHome();
+}
+
+void fsm_msgAuthorizeCoinJoin(const AuthorizeCoinJoin *msg) {
+  CHECK_INITIALIZED
+
+  CHECK_PIN
+
+  const size_t MAX_COORDINATOR_LEN = 36;
+  const uint64_t MAX_ROUNDS = 500;
+  const uint64_t MAX_COORDINATOR_FEE_RATE = 5 * FEE_RATE_DECIMALS;  // 5 %
+
+  const CoinInfo *coin = fsm_getCoin(msg->has_coin_name, msg->coin_name);
+  if (!coin) {
+    return;
+  }
+
+  if (strnlen(msg->coordinator, sizeof(msg->coordinator)) >
+      MAX_COORDINATOR_LEN) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Invalid coordinator name."));
+    layoutHome();
+    return;
+  }
+
+  for (size_t i = 0; msg->coordinator[i] != '\0'; ++i) {
+    if (msg->coordinator[i] < 32 || msg->coordinator[i] > 126) {
+      fsm_sendFailure(FailureType_Failure_DataError,
+                      _("Invalid coordinator name."));
+      layoutHome();
+      return;
+    }
+  }
+
+  if (msg->max_rounds < 1) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Invalid number of rounds."));
+    layoutHome();
+    return;
+  }
+
+  bool safety_checks_is_strict =
+      (config_getSafetyCheckLevel() == SafetyCheckLevel_Strict);
+
+  if (msg->max_rounds > MAX_ROUNDS && safety_checks_is_strict) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("The number of rounds is unexpectedly large."));
+    layoutHome();
+    return;
+  }
+
+  if (msg->max_coordinator_fee_rate > MAX_COORDINATOR_FEE_RATE &&
+      safety_checks_is_strict) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("The coordination fee rate is unexpectedly large."));
+    layoutHome();
+    return;
+  }
+
+  if (msg->max_fee_per_kvbyte > 10 * coin->maxfee_kb &&
+      safety_checks_is_strict) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("The fee per vbyte is unexpectedly large."));
+    layoutHome();
+    return;
+  }
+
+  if (msg->address_n_count == 0) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Empty path not allowed."));
+    layoutHome();
+    return;
+  }
+
+  if (msg->address_n[0] != PATH_SLIP25_PURPOSE && safety_checks_is_strict) {
+    fsm_sendFailure(FailureType_Failure_DataError, _("Forbidden key path."));
+    layoutHome();
+    return;
+  }
+
+  layoutAuthorizeCoinJoin(coin, msg->max_rounds, msg->max_fee_per_kvbyte);
+  if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
+    fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
+    layoutHome();
+    return;
+  }
+
+  bool path_warning_shown = false;
+  if (msg->address_n[0] != PATH_SLIP25_PURPOSE) {
+    if (!fsm_layoutPathWarning()) {
+      layoutHome();
+      return;
+    }
+    path_warning_shown = true;
+  }
+
+  // AuthorizeCoinJoin contains only the path prefix without change and index.
+  if ((size_t)(msg->address_n_count + 2) >
+      sizeof(msg->address_n) / sizeof(msg->address_n[0])) {
+    fsm_sendFailure(FailureType_Failure_DataError, _("Forbidden key path."));
+    layoutHome();
+    return;
+  }
+
+  if (!fsm_checkCoinPath(coin, msg->script_type, msg->address_n_count + 2,
+                         msg->address_n, false,
+                         MessageType_MessageType_AuthorizeCoinJoin,
+                         !path_warning_shown)) {
+    layoutHome();
+    return;
+  }
+
+  if (msg->max_fee_per_kvbyte > coin->maxfee_kb) {
+    layoutFeeRateOverThreshold(coin, msg->max_fee_per_kvbyte);
+    if (!protectButton(ButtonRequestType_ButtonRequest_FeeOverThreshold,
+                       false)) {
+      fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
+      layoutHome();
+      return;
+    }
+  }
+
+  // Cache the seed.
+  if (config_getSeed() == NULL) {
+    layoutHome();
+    return;
+  }
+
+  if (!config_setCoinJoinAuthorization(msg)) {
+    layoutHome();
+    return;
+  }
+
+  fsm_sendSuccess(_("Coinjoin authorized"));
+  layoutHome();
+}
+
+void fsm_msgCancelAuthorization(const CancelAuthorization *msg) {
+  (void)msg;
+
+  if (!config_setCoinJoinAuthorization(NULL)) {
+    layoutHome();
+    return;
+  }
+
+  fsm_sendSuccess(_("Authorization cancelled"));
+  layoutHome();
+}
+
+void fsm_msgDoPreauthorized(const DoPreauthorized *msg) {
+  (void)msg;
+
+  RESP_INIT(PreauthorizedRequest);
+
+  CHECK_INITIALIZED
+
+  authorization_type = config_getAuthorizationType();
+  if (authorization_type == 0) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("No preauthorized operation"));
+    layoutHome();
+    return;
+  }
+
+  msg_write(MessageType_MessageType_PreauthorizedRequest, resp);
+  layoutHome();
+}
+
+void fsm_msgUnlockPath(const UnlockPath *msg) {
+  (void)msg;
+
+  RESP_INIT(UnlockedPathRequest);
+
+  CHECK_INITIALIZED
+
+  CHECK_PIN
+
+  const char *KEYCHAIN_MAC_KEY_PATH[] = {"TREZOR", "Keychain MAC key"};
+
+  // UnlockPath is relevant only for SLIP-25 paths.
+  // Note: Currently we only allow unlocking the entire SLIP-25 purpose subtree
+  // instead of per-coin or per-account unlocking in order to avoid UI
+  // complexity.
+  if (msg->address_n_count != 1 || msg->address_n[0] != PATH_SLIP25_PURPOSE) {
+    fsm_sendFailure(FailureType_Failure_DataError, _("Invalid path"));
+    layoutHome();
+    return;
+  }
+
+  uint8_t keychain_mac_key[32] = {0};
+  if (!fsm_getSlip21Key(KEYCHAIN_MAC_KEY_PATH, 2, keychain_mac_key)) {
+    return;
+  }
+
+  HMAC_SHA256_CTX hctx;
+  hmac_sha256_Init(&hctx, keychain_mac_key, sizeof(keychain_mac_key));
+  for (size_t i = 0; i < msg->address_n_count; ++i) {
+    hmac_sha256_Update(&hctx, (const uint8_t *)&msg->address_n[i],
+                       sizeof(uint32_t));
+  }
+  hmac_sha256_Final(&hctx, resp->mac.bytes);
+
+  // Require confirmation to access SLIP25 paths unless already authorized.
+  if (msg->has_mac) {
+    uint8_t diff = 0;
+    for (size_t i = 0; i < SHA256_DIGEST_LENGTH; i++) {
+      diff |= (msg->mac.bytes[i] - resp->mac.bytes[i]);
+    }
+
+    if (msg->mac.size != SHA256_DIGEST_LENGTH || diff != 0) {
+      fsm_sendFailure(FailureType_Failure_DataError, _("Invalid MAC"));
+      layoutHome();
+      return;
+    }
+  } else {
+    layoutConfirmCoinjoinAccess();
+    if (!protectButton(ButtonRequestType_ButtonRequest_Other, false)) {
+      fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
+      layoutHome();
+      return;
+    }
+  }
+
+  unlock_path = msg->address_n[0];
+  resp->mac.size = SHA256_DIGEST_LENGTH;
+  resp->has_mac = true;
+  msg_write(MessageType_MessageType_UnlockedPathRequest, resp);
+  layoutHome();
+}
diff --git a/legacy/firmware/fsm_msg_common.h b/legacy/firmware/fsm_msg_common.h
index a0903bb215..5debd36ead 100644
--- a/legacy/firmware/fsm_msg_common.h
+++ b/legacy/firmware/fsm_msg_common.h
@@ -71,6 +71,8 @@ bool get_features(Features *resp) {
   strlcpy(resp->model, "1", sizeof(resp->model));
   resp->has_safety_checks = true;
   resp->safety_checks = config_getSafetyCheckLevel();
+  resp->has_busy = true;
+  resp->busy = (system_millis_busy_deadline > timer_ms());
   if (session_isUnlocked()) {
     resp->has_wipe_code_protection = true;
     resp->wipe_code_protection = config_hasWipeCode();
@@ -572,3 +574,14 @@ void fsm_msgGetFirmwareHash(const GetFirmwareHash *msg) {
   msg_write(MessageType_MessageType_FirmwareHash, resp);
   layoutHome();
 }
+
+void fsm_msgSetBusy(const SetBusy *msg) {
+  if (msg->has_expiry_ms) {
+    system_millis_busy_deadline = timer_ms() + msg->expiry_ms;
+  } else {
+    system_millis_busy_deadline = 0;
+  }
+  fsm_sendSuccess(NULL);
+  layoutHome();
+  return;
+}
diff --git a/legacy/firmware/fsm_msg_stellar.h b/legacy/firmware/fsm_msg_stellar.h
index b2ab413e61..267d423338 100644
--- a/legacy/firmware/fsm_msg_stellar.h
+++ b/legacy/firmware/fsm_msg_stellar.h
@@ -51,21 +51,17 @@ void fsm_msgStellarGetAddress(const StellarGetAddress *msg) {
     return;
   }
 
+  stellar_publicAddressAsStr(node->public_key + 1, resp->address,
+                             sizeof(resp->address));
+
   if (msg->has_show_display && msg->show_display) {
-    const char **str_addr_rows = stellar_lineBreakAddress(node->public_key + 1);
-    layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"),
-                      _("Share public account ID?"), str_addr_rows[0],
-                      str_addr_rows[1], str_addr_rows[2], NULL, NULL, NULL);
-    if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
-      fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
-      layoutHome();
+    if (!fsm_layoutAddress(resp->address, _("Public account ID"), false, 0,
+                           msg->address_n, msg->address_n_count, true, NULL, 0,
+                           0, NULL)) {
       return;
     }
   }
 
-  stellar_publicAddressAsStr(node->public_key + 1, resp->address,
-                             sizeof(resp->address));
-
   msg_write(MessageType_MessageType_StellarAddress, resp);
 
   layoutHome();
diff --git a/legacy/firmware/layout2.c b/legacy/firmware/layout2.c
index 8149930a38..9d2c5f9736 100644
--- a/legacy/firmware/layout2.c
+++ b/legacy/firmware/layout2.c
@@ -68,8 +68,6 @@ static const char *slip44_extras(uint32_t coin_type) {
 
 #endif
 
-#define BIP32_MAX_LAST_ELEMENT 1000000
-
 static const char *address_n_str(const uint32_t *address_n,
                                  size_t address_n_count,
                                  bool address_is_account) {
@@ -80,30 +78,47 @@ static const char *address_n_str(const uint32_t *address_n,
     return _("Path: m");
   }
 
+  enum {
+    ACCOUNT_NONE,
+    ACCOUNT_BIP44,
+    ACCOUNT_BIP49,
+    ACCOUNT_BIP84,
+    ACCOUNT_BIP86,
+    ACCOUNT_SLIP25
+  } account_type = ACCOUNT_NONE;
+
+  if ((address_n[1] & PATH_HARDENED) && (address_n[2] & PATH_HARDENED) &&
+      (address_n[address_n_count - 2] <= PATH_MAX_CHANGE) &&
+      (address_n[address_n_count - 1] <= PATH_MAX_ADDRESS_INDEX)) {
+    if (address_n_count == 5 && address_n[0] == PATH_HARDENED + 44) {
+      account_type = ACCOUNT_BIP44;
+    } else if (address_n_count == 5 && address_n[0] == PATH_HARDENED + 49) {
+      account_type = ACCOUNT_BIP49;
+    } else if (address_n_count == 5 && address_n[0] == PATH_HARDENED + 84) {
+      account_type = ACCOUNT_BIP84;
+    } else if (address_n_count == 5 && address_n[0] == PATH_HARDENED + 86) {
+      account_type = ACCOUNT_BIP86;
+    } else if (address_n_count == 6 && address_n[0] == PATH_SLIP25_PURPOSE &&
+               (address_n[3] & PATH_HARDENED)) {
+      account_type = ACCOUNT_SLIP25;
+    }
+  }
+
   // known BIP44/49/84/86 path
   static char path[100];
-  if (address_n_count == 5 &&
-      (address_n[0] == (PATH_HARDENED + 44) ||
-       address_n[0] == (PATH_HARDENED + 49) ||
-       address_n[0] == (PATH_HARDENED + 84) ||
-       address_n[0] == (PATH_HARDENED + 86)) &&
-      (address_n[1] & PATH_HARDENED) && (address_n[2] & PATH_HARDENED) &&
-      (address_n[3] <= 1) && (address_n[4] <= BIP32_MAX_LAST_ELEMENT)) {
-    bool taproot = (address_n[0] == (PATH_HARDENED + 86));
-    bool native_segwit = (address_n[0] == (PATH_HARDENED + 84));
-    bool p2sh_segwit = (address_n[0] == (PATH_HARDENED + 49));
+  if (account_type != ACCOUNT_NONE) {
     bool legacy = false;
     const CoinInfo *coin = coinBySlip44(address_n[1]);
     const char *abbr = 0;
-    if (taproot) {
+    if (account_type == ACCOUNT_BIP86 || account_type == ACCOUNT_SLIP25) {
       if (coin && coin->has_taproot && coin->bech32_prefix) {
         abbr = coin->coin_shortcut;
       }
-    } else if (native_segwit) {
+    } else if (account_type == ACCOUNT_BIP84) {
       if (coin && coin->has_segwit && coin->bech32_prefix) {
         abbr = coin->coin_shortcut;
       }
-    } else if (p2sh_segwit) {
+    } else if (account_type == ACCOUNT_BIP49) {
       if (coin && coin->has_segwit) {
         abbr = coin->coin_shortcut;
       }
@@ -125,34 +140,41 @@ static const char *address_n_str(const uint32_t *address_n,
     if (abbr && accnum < 100) {
       memzero(path, sizeof(path));
       strlcpy(path, abbr, sizeof(path));
-      // account naming:
-      // "Legacy", "Legacy SegWit", "SegWit" and "Taproot"
-      // for BIP44/P2PKH, BIP49/P2SH-P2WPKH, BIP84/P2WPKH and BIP86/P2TR
-      // respectively.
-      // For non-segwit coins we use only BIP44 with no special naming.
+      // Account naming:
+      // "Legacy", "Legacy SegWit", "SegWit", "Taproot" and "Coinjoin" for
+      // BIP44/P2PKH, BIP49/P2SH-P2WPKH, BIP84/P2WPKH, BIP86/P2TR, SLIP25/P2TR
+      // respectively. For non-segwit coins we use only BIP44 with no special
+      // naming.
       if (legacy) {
         strlcat(path, " Legacy", sizeof(path));
-      } else if (p2sh_segwit) {
+      } else if (account_type == ACCOUNT_BIP49) {
         strlcat(path, " L.SegWit", sizeof(path));
-      } else if (native_segwit) {
+      } else if (account_type == ACCOUNT_BIP84) {
         strlcat(path, " SegWit", sizeof(path));
-      } else if (taproot) {
+      } else if (account_type == ACCOUNT_BIP86) {
         strlcat(path, " Taproot", sizeof(path));
+      } else if (account_type == ACCOUNT_SLIP25) {
+        strlcat(path, " Coinjoin", sizeof(path));
       }
+
       if (address_is_account) {
-        strlcat(path, " address #", sizeof(path));
+        strlcat(path, " address", sizeof(path));
       } else {
-        strlcat(path, " account #", sizeof(path));
+        strlcat(path, " account", sizeof(path));
       }
-      char acc[3] = {0};
-      memzero(acc, sizeof(acc));
-      if (accnum < 10) {
-        acc[0] = '0' + accnum;
-      } else {
-        acc[0] = '0' + (accnum / 10);
-        acc[1] = '0' + (accnum % 10);
+
+      if (!(account_type == ACCOUNT_SLIP25 && accnum == 1)) {
+        char acc[5] = {' ', '#'};
+        if (accnum < 10) {
+          acc[2] = '0' + accnum;
+          acc[3] = '\0';
+        } else {
+          acc[2] = '0' + (accnum / 10);
+          acc[3] = '0' + (accnum % 10);
+          acc[4] = '\0';
+        }
+        strlcat(path, acc, sizeof(path));
       }
-      strlcat(path, acc, sizeof(path));
       return path;
     }
   }
@@ -236,7 +258,17 @@ const char **split_message_hex(const uint8_t *msg, uint32_t len) {
   return split_message((const uint8_t *)hex, size * 2, 16);
 }
 
-void *layoutLast = layoutHome;
+void *layoutLast = NULL;
+
+void layoutDialogSwipeWrapping(const BITMAP *icon, const char *btnNo,
+                               const char *btnYes, const char *heading,
+                               const char *description, const char *wrap_text) {
+  const uint32_t row_len = 20;
+  const char **str =
+      split_message((const uint8_t *)wrap_text, strlen(wrap_text), row_len);
+  layoutDialogSwipe(icon, btnNo, btnYes, NULL, heading, description, str[0],
+                    str[1], str[2], str[3]);
+}
 
 void layoutDialogSwipe(const BITMAP *icon, const char *btnNo,
                        const char *btnYes, const char *desc, const char *line1,
@@ -268,18 +300,36 @@ void layoutProgressSwipe(const char *desc, int permil) {
 }
 
 void layoutScreensaver(void) {
-  layoutLast = layoutScreensaver;
-  oledClear();
-  oledRefresh();
+  if (system_millis_busy_deadline > timer_ms()) {
+    // Busy screen overrides the screensaver.
+    layoutBusyscreen();
+  } else {
+    layoutLast = layoutScreensaver;
+    oledClear();
+    oledRefresh();
+  }
 }
 
 void layoutHome(void) {
-  if (layoutLast == layoutHome || layoutLast == layoutScreensaver) {
+  if (layoutLast != layoutHomescreen && layoutLast != layoutBusyscreen) {
+    // Reset lock screen timeout
+    system_millis_lock_start = timer_ms();
+  }
+
+  if (system_millis_busy_deadline > timer_ms()) {
+    layoutBusyscreen();
+  } else {
+    layoutHomescreen();
+  }
+}
+
+void layoutHomescreen(void) {
+  if (layoutLast == layoutHomescreen || layoutLast == layoutScreensaver) {
     oledClear();
   } else {
     layoutSwipe();
   }
-  layoutLast = layoutHome;
+  layoutLast = layoutHomescreen;
 
   char label[MAX_LABEL_LEN + 1] = _("Go to trezor.io/start");
   if (config_isInitialized()) {
@@ -321,9 +371,19 @@ void layoutHome(void) {
     oledDrawStringCenter(OLED_WIDTH / 2, 0, "NEEDS BACKUP!", FONT_STANDARD);
   }
   oledRefresh();
+}
 
-  // Reset lock screen timeout
-  system_millis_lock_start = timer_ms();
+void layoutBusyscreen(void) {
+  if (layoutLast == layoutBusyscreen || layoutLast == layoutScreensaver) {
+    oledClear();
+  } else {
+    layoutSwipe();
+  }
+  layoutLast = layoutBusyscreen;
+
+  layoutDialog(&bmp_icon_warning, NULL, NULL, NULL, _("Please wait"), NULL,
+               _("Coinjoin in progress."), NULL, _("Do not disconnect"),
+               _("your Trezor."));
 }
 
 static void render_address_dialog(const CoinInfo *coin, const char *address,
@@ -510,9 +570,10 @@ static uint64_t div_round(uint64_t numer, uint64_t denom) {
   return numer / denom + (2 * (numer % denom) >= denom);
 }
 
-static bool formatFeeRate(uint64_t fee, uint64_t tx_weight, char *output,
-                          size_t output_length, bool segwit) {
-  // Convert transaction weight to virtual transaction size, which is is defined
+static bool formatComputedFeeRate(uint64_t fee, uint64_t tx_weight,
+                                  char *output, size_t output_length,
+                                  bool segwit, bool parentheses) {
+  // Convert transaction weight to virtual transaction size, which is defined
   // as tx_weight / 4 rounded up to the next integer.
   // https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki#transaction-size-calculations
   uint64_t tx_size = (tx_weight + 3) / 4;
@@ -522,33 +583,61 @@ static bool formatFeeRate(uint64_t fee, uint64_t tx_weight, char *output,
   // two decimal digits.
   uint64_t fee_rate_multiplied = div_round(100 * fee, tx_size);
 
-  return bn_format_amount(fee_rate_multiplied, "(",
-                          segwit ? " sat/vB)" : " sat/B)", 2, output,
-                          output_length) != 0;
+  size_t length =
+      bn_format_amount(fee_rate_multiplied, parentheses ? "(" : NULL,
+                       segwit ? " sat/vB" : " sat/B", 2, output, output_length);
+  if (length == 0) {
+    return false;
+  }
+
+  if (parentheses) {
+    if (length + 2 > output_length) {
+      return false;
+    }
+    output[length] = ')';
+    output[length + 1] = '\0';
+  }
+  return true;
+}
+
+static bool formatFeeRate(uint64_t fee_per_kvbyte, char *output,
+                          size_t output_length, bool segwit) {
+  return formatComputedFeeRate(fee_per_kvbyte, 4000, output, output_length,
+                               segwit, false);
 }
 
 void layoutConfirmTx(const CoinInfo *coin, AmountUnit amount_unit,
-                     uint64_t total_in, uint64_t total_out, uint64_t change_out,
+                     uint64_t total_in, uint64_t external_in,
+                     uint64_t total_out, uint64_t change_out,
                      uint64_t tx_weight) {
   char str_out[32] = {0};
   formatAmountDifference(coin, amount_unit, total_in, change_out, str_out,
                          sizeof(str_out));
 
-  char str_fee[32] = {0};
-  formatAmountDifference(coin, amount_unit, total_in, total_out, str_fee,
-                         sizeof(str_fee));
+  if (external_in == 0) {
+    char str_fee[32] = {0};
+    formatAmountDifference(coin, amount_unit, total_in, total_out, str_fee,
+                           sizeof(str_fee));
 
-  char str_fee_rate[32] = {0};
-  bool show_fee_rate = total_in >= total_out;
+    char str_fee_rate[32] = {0};
+    bool show_fee_rate = total_in >= total_out;
 
-  if (show_fee_rate) {
-    formatFeeRate(total_in - total_out, tx_weight, str_fee_rate,
-                  sizeof(str_fee_rate), coin->has_segwit);
+    if (show_fee_rate) {
+      formatComputedFeeRate(total_in - total_out, tx_weight, str_fee_rate,
+                            sizeof(str_fee_rate), coin->has_segwit, true);
+    }
+
+    layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), NULL,
+                      _("Confirm sending:"), str_out, _("including fee:"),
+                      str_fee, show_fee_rate ? str_fee_rate : NULL, NULL);
+  } else {
+    char str_spend[32] = {0};
+    formatAmountDifference(coin, amount_unit, total_in - external_in,
+                           change_out, str_spend, sizeof(str_spend));
+    layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), NULL,
+                      _("You are contributing:"), str_spend,
+                      _("to the total amount:"), str_out, NULL, NULL);
   }
-
-  layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), NULL,
-                    _("Confirm sending:"), str_out, _("including fee:"),
-                    str_fee, show_fee_rate ? str_fee_rate : NULL, NULL);
 }
 
 void layoutConfirmReplacement(const char *description, uint8_t txid[32]) {
@@ -611,8 +700,8 @@ void layoutConfirmModifyFee(const CoinInfo *coin, AmountUnit amount_unit,
 
   char str_fee_rate[32] = {0};
 
-  formatFeeRate(fee_new, tx_weight, str_fee_rate, sizeof(str_fee_rate),
-                coin->has_segwit);
+  formatComputedFeeRate(fee_new, tx_weight, str_fee_rate, sizeof(str_fee_rate),
+                        coin->has_segwit, true);
 
   layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), NULL,
                     question, str_fee_change, _("Transaction fee:"),
@@ -628,6 +717,15 @@ void layoutFeeOverThreshold(const CoinInfo *coin, AmountUnit amount_unit,
                     _("Send anyway?"), NULL);
 }
 
+void layoutFeeRateOverThreshold(const CoinInfo *coin, uint32_t fee_per_kvbyte) {
+  char str_fee_rate[32] = {0};
+  formatFeeRate(fee_per_kvbyte, str_fee_rate, sizeof(str_fee_rate),
+                coin->has_segwit);
+  layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), NULL,
+                    _("Fee rate"), str_fee_rate, _("is unexpectedly high."),
+                    NULL, _("Proceed anyway?"), NULL);
+}
+
 void layoutChangeCountOverThreshold(uint32_t change_count) {
   char str_change[21] = {0};
   snprintf(str_change, sizeof(str_change), "There are %" PRIu32, change_count);
@@ -669,6 +767,26 @@ void layoutConfirmNondefaultLockTime(uint32_t lock_time,
   }
 }
 
+void layoutAuthorizeCoinJoin(const CoinInfo *coin, uint64_t max_rounds,
+                             uint32_t max_fee_per_kvbyte) {
+  char str_max_rounds[32] = {0};
+  char str_fee_rate[32] = {0};
+  bn_format_amount(max_rounds, NULL, NULL, 0, str_max_rounds,
+                   sizeof(str_max_rounds));
+  formatFeeRate(max_fee_per_kvbyte, str_fee_rate, sizeof(str_fee_rate),
+                coin->has_segwit);
+  layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"),
+                    _("Authorize coinjoin"), _("Maximum rounds:"),
+                    str_max_rounds, _("Maximum mining fee:"), str_fee_rate,
+                    NULL, NULL);
+}
+
+void layoutConfirmCoinjoinAccess(void) {
+  layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), NULL,
+                    _("Do you want to allow"), _("access to your"),
+                    _("coinjoin account?"), NULL, NULL, NULL);
+}
+
 void layoutVerifyAddress(const CoinInfo *coin, const char *address) {
   render_address_dialog(coin, address, _("Confirm address?"),
                         _("Message signed by:"), 0);
@@ -790,12 +908,8 @@ void layoutAddress(const char *address, const char *desc, bool qrcode,
     }
 
     oledInvert(0, 0, 63, 63);
-    if (side > 0 && side <= 33) {
-      // For QR code V4 (33x33), still maintaining two pixels per module
-      // so that it is nicely readable. Not showing the bottom row,
-      // which is not a problem thanks to the QR code's error correction.
-      // It is a use-case for BTC taproot addresses.
-      int offset = side <= 29 ? 32 - side : 0;
+    if (side > 0 && side <= 29) {
+      int offset = 32 - side;
       for (int i = 0; i < side; i++) {
         for (int j = 0; j < side; j++) {
           if (qrcodegen_getModule(codedata, i, j)) {
@@ -1319,3 +1433,9 @@ void layoutConfirmHash(const BITMAP *icon, const char *description,
   layoutButtonYes(_("Confirm"), &bmp_btn_confirm);
   oledRefresh();
 }
+
+void layoutConfirmOwnershipProof(void) {
+  layoutDialogSwipe(&bmp_icon_question, _("Cancel"), _("Confirm"), NULL,
+                    _("Do you want to"), _("create a proof of"),
+                    _("ownership?"), NULL, NULL, NULL);
+}
diff --git a/legacy/firmware/layout2.h b/legacy/firmware/layout2.h
index 6a0195680f..9c108f8b6c 100644
--- a/legacy/firmware/layout2.h
+++ b/legacy/firmware/layout2.h
@@ -48,16 +48,22 @@ void layoutDialogSwipeEx(const BITMAP *icon, const char *btnNo,
                          const char *line1, const char *line2,
                          const char *line3, const char *line4,
                          const char *line5, const char *line6, uint8_t font);
+void layoutDialogSwipeWrapping(const BITMAP *icon, const char *btnNo,
+                               const char *btnYes, const char *heading,
+                               const char *description, const char *wrap_text);
 void layoutProgressSwipe(const char *desc, int permil);
 
 void layoutScreensaver(void);
+void layoutHomescreen(void);
+void layoutBusyscreen(void);
 void layoutHome(void);
 void layoutConfirmOutput(const CoinInfo *coin, AmountUnit amount_unit,
                          const TxOutputType *out);
 void layoutConfirmOmni(const uint8_t *data, uint32_t size);
 void layoutConfirmOpReturn(const uint8_t *data, uint32_t size);
 void layoutConfirmTx(const CoinInfo *coin, AmountUnit amount_unit,
-                     uint64_t total_in, uint64_t total_out, uint64_t change_out,
+                     uint64_t total_in, uint64_t external_in,
+                     uint64_t total_out, uint64_t change_out,
                      uint64_t tx_weight);
 void layoutConfirmReplacement(const char *description, uint8_t txid[32]);
 void layoutConfirmModifyOutput(const CoinInfo *coin, AmountUnit amount_unit,
@@ -68,10 +74,14 @@ void layoutConfirmModifyFee(const CoinInfo *coin, AmountUnit amount_unit,
                             uint64_t tx_weight);
 void layoutFeeOverThreshold(const CoinInfo *coin, AmountUnit amount_unit,
                             uint64_t fee);
+void layoutFeeRateOverThreshold(const CoinInfo *coin, uint32_t fee_per_kvbyte);
 void layoutChangeCountOverThreshold(uint32_t change_count);
 void layoutConfirmUnverifiedExternalInputs(void);
 void layoutConfirmNondefaultLockTime(uint32_t lock_time,
                                      bool lock_time_disabled);
+void layoutAuthorizeCoinJoin(const CoinInfo *coin, uint64_t max_rounds,
+                             uint32_t max_fee_per_kvbyte);
+void layoutConfirmCoinjoinAccess(void);
 void layoutVerifyAddress(const CoinInfo *coin, const char *address);
 void layoutCipherKeyValue(bool encrypt, const char *key);
 void layoutEncryptMessage(const uint8_t *msg, uint32_t len, bool signing);
@@ -115,6 +125,8 @@ void layoutConfirmSafetyChecks(SafetyCheckLevel safety_checks_level);
 void layoutConfirmHash(const BITMAP *icon, const char *description,
                        const uint8_t *hash, uint32_t len);
 
+void layoutConfirmOwnershipProof(void);
+
 const char **split_message(const uint8_t *msg, uint32_t len, uint32_t rowlen);
 const char **split_message_hex(const uint8_t *msg, uint32_t len);
 
diff --git a/legacy/firmware/messages.c b/legacy/firmware/messages.c
index 634640db90..82b6e47bfc 100644
--- a/legacy/firmware/messages.c
+++ b/legacy/firmware/messages.c
@@ -62,6 +62,7 @@ void MessageProcessFunc(char type, char dir, uint16_t msg_id, void *ptr) {
   while (m->type) {
     if (type == m->type && dir == m->dir && msg_id == m->msg_id) {
       m->process_func(ptr);
+      fsm_postMsgCleanup(msg_id);
       return;
     }
     m++;
diff --git a/legacy/firmware/protob/Makefile b/legacy/firmware/protob/Makefile
index a00dd41a76..3857a3bd63 100644
--- a/legacy/firmware/protob/Makefile
+++ b/legacy/firmware/protob/Makefile
@@ -4,8 +4,7 @@ endif
 
 SKIPPED_MESSAGES := Binance Cardano DebugMonero Eos Monero Ontology Ripple SdProtect Tezos WebAuthn \
 	DebugLinkRecordScreen DebugLinkEraseSdCard DebugLinkWatchLayout \
-	GetOwnershipProof OwnershipProof GetOwnershipId OwnershipId AuthorizeCoinJoin DoPreauthorized \
-	CancelAuthorization DebugLinkLayout GetNonce SetBusy UnlockPath \
+	DebugLinkLayout GetNonce \
 	TxAckInput TxAckOutput TxAckPrev TxAckPaymentRequest \
 	EthereumSignTypedData EthereumTypedDataStructRequest EthereumTypedDataStructAck \
 	EthereumTypedDataValueRequest EthereumTypedDataValueAck
diff --git a/legacy/firmware/protob/messages-bitcoin.options b/legacy/firmware/protob/messages-bitcoin.options
index 020bb69c85..9768f4cadf 100644
--- a/legacy/firmware/protob/messages-bitcoin.options
+++ b/legacy/firmware/protob/messages-bitcoin.options
@@ -11,7 +11,6 @@ Address.address                                             max_size:130
 Address.mac                                                 type:FT_IGNORE
 
 SignTx.coin_name                                            max_size:21
-SignTx.coinjoin_request                                     type:FT_IGNORE
 
 SignMessage.address_n                                       max_count:8
 SignMessage.message                                         max_size:1024
@@ -34,8 +33,8 @@ TxInputType.address_n                                       max_count:8
 TxInputType.prev_hash                                       max_size:32
 TxInputType.script_sig                                      max_size:1650
 TxInputType.witness                                         max_size:109
-TxInputType.ownership_proof                                 max_size:171
-TxInputType.commitment_data                                 max_size:32
+TxInputType.ownership_proof                                 max_size:147
+TxInputType.commitment_data                                 max_size:70
 TxInputType.orig_hash                                       max_size:32
 TxInputType.script_pubkey                                   max_size:520
 
@@ -62,8 +61,8 @@ TxInput.address_n                                           max_count:8
 TxInput.prev_hash                                           max_size:32
 TxInput.script_sig                                          max_size:1650
 TxInput.witness                                             max_size:109
-TxInput.ownership_proof                                     max_size:171
-TxInput.commitment_data                                     max_size:32
+TxInput.ownership_proof                                     max_size:147
+TxInput.commitment_data                                     max_size:70
 TxInput.orig_hash                                           max_size:32
 TxInput.script_pubkey                                       max_size:520
 
@@ -79,12 +78,26 @@ PrevOutput.script_pubkey                                    max_size:520
 
 TxAckPrevExtraDataWrapper.extra_data_chunk                  type:FT_IGNORE
 
+GetOwnershipId.address_n                                    max_count:8
+GetOwnershipId.coin_name                                    max_size:21
+
+OwnershipId.ownership_id                                    max_size:32
+
+GetOwnershipProof.address_n                                 max_count:8
+GetOwnershipProof.coin_name                                 max_size:21
+GetOwnershipProof.ownership_ids                             max_count:15 max_size:32
+GetOwnershipProof.commitment_data                           max_size:70
+
+OwnershipProof.ownership_proof                              max_size:147
+OwnershipProof.signature                                    max_size:71
+
+AuthorizeCoinJoin.coordinator                               max_size:37
+AuthorizeCoinJoin.address_n                                 max_count:8
+AuthorizeCoinJoin.coin_name                                 max_size:21
+
+CoinJoinRequest.mask_public_key                             max_size:33
+CoinJoinRequest.signature                                   max_size:64
+
 # Unused messages.
-AuthorizeCoinJoin                                           skip_message:true
-GetOwnershipId                                              skip_message:true
-OwnershipId                                                 skip_message:true
-GetOwnershipProof                                           skip_message:true
-OwnershipProof                                              skip_message:true
 TxAckPaymentRequest                                         skip_message:true
 PaymentRequestMemo                                          skip_message:true
-CoinJoinRequest                                             skip_message:true
diff --git a/legacy/firmware/protob/messages-crypto.options b/legacy/firmware/protob/messages-crypto.options
index c4774819c3..120d14b080 100644
--- a/legacy/firmware/protob/messages-crypto.options
+++ b/legacy/firmware/protob/messages-crypto.options
@@ -18,7 +18,7 @@ CosiSign.global_pubkey                  max_size:32
 
 CosiSignature.signature                 max_size:32
 
-SignIdentity.challenge_hidden           max_size:256
+SignIdentity.challenge_hidden           max_size:512
 SignIdentity.challenge_visual           max_size:256
 SignIdentity.ecdsa_curve_name           max_size:32
 
diff --git a/legacy/firmware/signing.c b/legacy/firmware/signing.c
index dcdc6806eb..82914edb24 100644
--- a/legacy/firmware/signing.c
+++ b/legacy/firmware/signing.c
@@ -34,10 +34,15 @@
 #ifdef USE_SECP256K1_ZKP_ECDSA
 #include "zkp_ecdsa.h"
 #endif
+#if DEBUG_LINK
+#include <inttypes.h>
+#include <stdio.h>
+#endif
 
 static uint32_t change_count;
 static const CoinInfo *coin;
 static AmountUnit amount_unit;
+static bool serialize;
 static CONFIDENTIAL HDNode root;
 static CONFIDENTIAL HDNode node;
 static bool signing = false;
@@ -71,8 +76,9 @@ enum {
 } signing_stage;
 static bool foreign_address_confirmed;  // indicates that user approved warning
 static bool taproot_only;  // indicates whether all internal inputs are Taproot
-static uint32_t idx1;      // The index of the input or output in the current tx
-                           // which is being processed, signed or serialized.
+static bool has_unverified_external_input;
+static uint32_t idx1;  // The index of the input or output in the current tx
+                       // which is being processed, signed or serialized.
 static uint32_t idx2;  // The index of the input or output in the original tx
                        // (Phase 1), in the previous tx (Phase 2) or in the
                        // current tx when computing the legacy digest (Phase 2).
@@ -97,14 +103,25 @@ static uint8_t sig[64];     // Used in Phase 1 to store signature of original tx
 #if !BITCOIN_ONLY
 static uint8_t decred_hash_prefix[32];
 #endif
-static uint64_t total_in, total_out, change_out;
-static uint64_t orig_total_in, orig_total_out, orig_change_out;
-static uint32_t progress, progress_step, progress_meta_step;
-static uint32_t tx_weight;
+static uint64_t total_in, external_in, total_out, change_out;
+static uint64_t orig_total_in, orig_external_in, orig_total_out,
+    orig_change_out;
+static uint32_t progress_step, progress_steps, progress_substep,
+    progress_substeps, progress_midpoint, progress_update;
+static const char *progress_label;
+static uint32_t tx_weight, tx_base_weight, our_weight, our_inputs_len;
+PathSchema unlocked_schema;
+
+typedef enum _MatchState {
+  MatchState_UNDEFINED = 0,
+  MatchState_MATCH = 1,
+  MatchState_MISMATCH = 2,
+} MatchState;
 
 typedef struct {
   uint32_t inputs_count;
   uint32_t outputs_count;
+  uint32_t segwit_count;
   uint32_t next_legacy_input;
   uint32_t min_sequence;
   bool multisig_fp_set;
@@ -112,6 +129,8 @@ typedef struct {
   uint8_t multisig_fp[32];
   uint32_t in_address_n[8];
   size_t in_address_n_count;
+  InputScriptType in_script_type;
+  MatchState in_script_type_state;
   uint32_t version;
   uint32_t lock_time;
   uint32_t expiry;
@@ -145,16 +164,16 @@ static bool is_replacement;  // Is this a replacement transaction?
 static TxInfo orig_info;
 static uint8_t orig_hash[32];  // TXID of the original transaction.
 
+/* Variables specific to CoinJoin transactions. */
+static secbool is_coinjoin;  // Is this a CoinJoin transaction?
+static uint64_t coinjoin_coordination_fee_base;
+static AuthorizeCoinJoin coinjoin_authorization;
+static CoinJoinRequest coinjoin_request;
+static Hasher coinjoin_request_hasher;
+
 /* A marker for in_address_n_count to indicate a mismatch in bip32 paths in
    input */
 #define BIP32_NOCHANGEALLOWED 1
-/* The number of bip32 levels used in a wallet (chain and address) */
-#define BIP32_WALLET_DEPTH 2
-/* The chain id used for change */
-#define BIP32_CHANGE_CHAIN 1
-/* The maximum allowed change address.  This should be large enough for normal
-   use and still allow to quickly brute-force the correct bip32 path. */
-#define BIP32_MAX_LAST_ELEMENT 1000000
 
 /* transaction header size: 4 byte version */
 #define TXSIZE_HEADER 4
@@ -178,19 +197,8 @@ static uint8_t orig_hash[32];  // TXID of the original transaction.
    transaction disables replace-by-fee opt-in. */
 #define MAX_BIP125_RBF_SEQUENCE 0xFFFFFFFD
 
-enum {
-  // Signature hash type with the same semantics as SIGHASH_ALL, but instead of
-  // having to include the byte in the signature, it is implied.
-  SIGHASH_ALL_TAPROOT = 0,
-
-  // Default signature hash type in Bitcoin which signs all inputs and all
-  // outputs of the transaction.
-  SIGHASH_ALL = 1,
-
-  // Signature hash flag used in some Bitcoin-like altcoins for replay
-  // protection.
-  SIGHASH_FORKID = 0x40,
-};
+/* supported version of Decred script_version */
+#define DECRED_SCRIPT_VERSION 0
 
 enum {
   DECRED_SERIALIZE_FULL = 0,
@@ -375,12 +383,133 @@ static bool is_external_input(uint32_t i) {
   return external_inputs[i / 32] & (1 << (i % 32));
 }
 
-static bool has_external_input(void) {
-  uint32_t sum = 0;
-  for (size_t i = 0; i < sizeof(external_inputs) / sizeof(uint32_t); ++i) {
-    sum |= external_inputs[i];
+static void report_progress(bool force) {
+  static uint32_t update_ctr = 0;
+  if (!force && update_ctr < progress_update) {
+    update_ctr++;
+    return;
   }
-  return sum != 0;
+
+  uint32_t progress = 0;
+  if (progress_midpoint != 0) {
+    if (progress_step < progress_midpoint) {
+      // Checking previous transactions.
+      progress =
+          (500 * progress_step + 500 * progress_substep / progress_substeps) /
+          progress_midpoint;
+    } else {
+      // Signing transaction after checking. No substeps.
+      progress = 500 + 500 * (progress_step - progress_midpoint) /
+                           (progress_steps - progress_midpoint);
+    }
+  } else {
+    // Loading transaction or signing transaction without checking. No substeps.
+    progress = 1000 * progress_step / progress_steps;
+  }
+
+  layoutProgress(progress_label, progress);
+  update_ctr = 0;
+}
+
+#if DEBUG_LINK
+static bool assert_progress_finished(void) {
+  char line[54] = {0};
+  if (progress_step != progress_steps) {
+    snprintf(line, sizeof(line), "%s finished at %" PRIu32 "/%" PRIu32,
+             progress_label, progress_step, progress_steps);
+  } else if (progress_substep != 0) {
+    snprintf(line, sizeof(line), "%s finished at substep %" PRIu32,
+             progress_label, progress_substep);
+  } else {
+    return true;
+  }
+  fsm_sendFailure(FailureType_Failure_FirmwareError, line);
+  signing_abort();
+  return false;
+}
+#endif
+
+static void init_loading_progress(void) {
+  progress_label = _("Loading transaction");
+  progress_step = 0;
+  progress_substep = 0;
+  progress_substeps = 1;  // no substeps in tx loading
+  progress_midpoint = 0;  // no midpoint in tx loading
+  progress_update = 10;   // update screen every 10 steps
+
+  // Stage 1 and 2 - load inputs and outputs
+  progress_steps = info.inputs_count + info.outputs_count;
+
+  report_progress(true);
+}
+
+static void init_signing_progress(void) {
+  progress_label = _("Signing transaction");
+  progress_step = 0;
+  progress_steps = 0;
+  progress_update = 20;  // update screen every 20 steps
+
+  // Verify previous transactions (STAGE_REQUEST_3_PREV_*).
+  // We don't know how long it will take to fetch the previous transactions. If
+  // they need to be checked, then we will reserve 50 % of the progress for
+  // this. Once we fetch a prev_tx's metadata, we subdivide the reserved space
+  // into substeps which represent the progress of fetching one prev_tx input or
+  // output.
+  if (!taproot_only && !(coin->overwintered && info.version == 5)) {
+    progress_steps += info.inputs_count;
+    progress_midpoint = progress_steps;
+  }
+
+  uint32_t external_count = 0;
+  for (size_t i = 0; i < info.inputs_count; ++i) {
+    external_count += is_external_input(i);
+  }
+
+  // Process inputs.
+  if (!(coin->force_bip143 || coin->overwintered || coin->decred)) {
+    // Sign and optionally serialize legacy inputs (STAGE_REQUEST_4_*).
+    progress_steps += (info.inputs_count - info.segwit_count - external_count) *
+                      (info.inputs_count + info.outputs_count);
+
+    if (serialize) {
+      // Serialize non-legacy inputs (STAGE_REQUEST_NONLEGACY_INPUT).
+      progress_steps += info.segwit_count + external_count;
+    }
+
+    if (is_replacement) {
+      // Verify original input signatures (STAGE_REQUEST_3_ORIG_*).
+      progress_steps +=
+          (orig_info.inputs_count - orig_info.segwit_count - external_count) *
+          (orig_info.inputs_count + orig_info.outputs_count);
+      progress_steps += orig_info.segwit_count;
+    }
+  } else {
+    // Sign and optionally serialize each input (STAGE_REQUEST_NONLEGACY_INPUT,
+    // or in case of Decred STAGE_REQUEST_DECRED_WITNESS).
+    progress_steps += info.inputs_count;
+    if (is_replacement) {
+      // Verify each original input (STAGE_REQUEST_3_ORIG_NONLEGACY_INPUT).
+      progress_steps += orig_info.inputs_count;
+    }
+  }
+
+  if (to.is_segwit) {
+    if (serialize) {
+      // Serialize witnesses for all inputs (STAGE_REQUEST_SEGWIT_WITNESS).
+      progress_steps += info.inputs_count;
+    } else {
+      // Process witnesses for all internal inputs
+      // (STAGE_REQUEST_SEGWIT_WITNESS).
+      progress_steps += info.inputs_count - external_count;
+    }
+  }
+
+  // Serialize outputs (STAGE_REQUEST_5_OUTPUT).
+  if (serialize && !coin->decred) {
+    progress_steps += info.outputs_count;
+  }
+
+  report_progress(true);
 }
 
 void send_req_1_input(void) {
@@ -629,6 +758,11 @@ void send_req_5_output(void) {
 }
 
 void send_req_finished(void) {
+#if DEBUG_LINK
+  if (!assert_progress_finished()) {
+    return;
+  }
+#endif
   resp.has_request_type = true;
   resp.request_type = RequestType_TXFINISHED;
   msg_write(MessageType_MessageType_TxRequest, &resp);
@@ -667,6 +801,12 @@ void phase1_request_next_input(void) {
       idx2 = 0;
     }
 
+    if (to.is_segwit) {
+      tx_base_weight += TXSIZE_SEGWIT_OVERHEAD;
+      tx_weight += TXSIZE_SEGWIT_OVERHEAD + to.inputs_len;
+      our_weight += TXSIZE_SEGWIT_OVERHEAD + our_inputs_len;
+    }
+
     send_req_2_output();
   }
 }
@@ -705,12 +845,86 @@ void phase1_request_orig_input(void) {
   }
 }
 
-void phase2_request_next_input(void) {
-  if (idx1 == info.next_legacy_input) {
-    idx2 = 0;
-    send_req_4_input();
+void phase2_request_next_witness(bool first) {
+  if (first) {
+    idx1 = 0;
+    if (!to.is_segwit) {
+      send_req_finished();
+      signing_abort();
+      return;
+    }
+  } else if (idx1 < info.inputs_count - 1) {
+    idx1++;
   } else {
-    send_req_nonlegacy_input();
+    send_req_finished();
+    signing_abort();
+    return;
+  }
+
+  if (!serialize) {
+    // Skip external inputs when serialization is disabled.
+    while (is_external_input(idx1)) {
+      if (idx1 >= info.inputs_count - 1) {
+        send_req_finished();
+        signing_abort();
+        return;
+      }
+      idx1++;
+    }
+  }
+
+  send_req_segwit_witness();
+  return;
+}
+
+void phase2_request_next_output(bool first) {
+  if (first) {
+    if (serialize) {
+      idx1 = 0;
+      send_req_5_output();
+      return;
+    }
+  } else if (idx1 < info.outputs_count - 1) {
+    idx1++;
+    send_req_5_output();
+    return;
+  }
+
+  // Output serialization is finished. Generate witnesses.
+  phase2_request_next_witness(true);
+}
+
+void phase2_request_next_input(bool first) {
+  if (first) {
+    idx1 = 0;
+  } else if (idx1 < info.inputs_count - 1) {
+    idx1++;
+  } else {
+    // Input processing is finished. Serialize outputs.
+    phase2_request_next_output(true);
+    return;
+  }
+
+  if (serialize || coin->force_bip143 || coin->overwintered) {
+    // We are processing all inputs.
+    if (idx1 == info.next_legacy_input) {
+      idx2 = 0;
+      send_req_4_input();
+    } else {
+      send_req_nonlegacy_input();
+    }
+  } else {
+    // We are only signing legacy inputs.
+    if (info.next_legacy_input == 0xffffffff || idx1 > info.next_legacy_input) {
+      // There are no legacy inputs or no more legacy inputs, so serialize
+      // outputs.
+      phase2_request_next_output(true);
+    } else {
+      // Sign next legacy input.
+      idx1 = info.next_legacy_input;
+      idx2 = 0;
+      send_req_4_input();
+    }
   }
 }
 
@@ -739,8 +953,7 @@ void phase2_request_orig_input(void) {
       return;
     }
 
-    idx1 = 0;
-    phase2_request_next_input();
+    phase2_request_next_input(true);
   }
 }
 
@@ -777,6 +990,47 @@ bool check_change_multisig_fp(const TxInfo *tx_info,
          memcmp(tx_info->multisig_fp, h, 32) == 0;
 }
 
+static InputScriptType simple_script_type(InputScriptType script_type) {
+  // SPENDMULTISIG is used only for non-SegWit and is effectively the same as
+  // SPENDADDRESS. For SegWit inputs and outputs multisig is indicated by the
+  // presence of the multisig structure. for both SegWit and non-SegWit we can
+  // rely on multisig_fp to check the multisig structure.
+  if (script_type == InputScriptType_SPENDMULTISIG) {
+    script_type = InputScriptType_SPENDADDRESS;
+  }
+
+  return script_type;
+}
+
+void extract_input_script_type(TxInfo *tx_info, const TxInputType *tinput) {
+  switch (tx_info->in_script_type_state) {
+    case MatchState_UNDEFINED:
+      // initialize in_script_type on first input seen
+      tx_info->in_script_type = simple_script_type(tinput->script_type);
+      tx_info->in_script_type_state = MatchState_MATCH;
+      break;
+    case MatchState_MATCH:
+      // check that all input script types are the same
+      if (tx_info->in_script_type != simple_script_type(tinput->script_type)) {
+        tx_info->in_script_type_state = MatchState_MISMATCH;
+      }
+      break;
+    default:
+      break;
+  }
+}
+
+bool check_change_script_type(const TxInfo *tx_info,
+                              const TxOutputType *toutput) {
+  InputScriptType input_script_type = 0;
+  if (!change_output_to_input_script_type(toutput->script_type,
+                                          &input_script_type)) {
+    return false;
+  }
+  return tx_info->in_script_type_state == MatchState_MATCH &&
+         tx_info->in_script_type == simple_script_type(input_script_type);
+}
+
 void extract_input_bip32_path(TxInfo *tx_info, const TxInputType *tinput) {
   if (tx_info->in_address_n_count == BIP32_NOCHANGEALLOWED) {
     return;
@@ -821,8 +1075,8 @@ bool check_change_bip32_path(const TxInfo *tx_info,
   return (count >= BIP32_WALLET_DEPTH && count == tx_info->in_address_n_count &&
           0 == memcmp(tx_info->in_address_n, toutput->address_n,
                       (count - BIP32_WALLET_DEPTH) * sizeof(uint32_t)) &&
-          toutput->address_n[count - 2] <= BIP32_CHANGE_CHAIN &&
-          toutput->address_n[count - 1] <= BIP32_MAX_LAST_ELEMENT);
+          toutput->address_n[count - 2] <= PATH_MAX_CHANGE &&
+          toutput->address_n[count - 1] <= PATH_MAX_ADDRESS_INDEX);
 }
 
 static bool fill_input_script_sig(TxInputType *tinput) {
@@ -853,31 +1107,85 @@ static bool fill_input_script_sig(TxInputType *tinput) {
   return true;
 }
 
-static bool derive_node(TxInputType *tinput) {
-  if (!coin_path_check(coin, tinput->script_type, tinput->address_n_count,
-                       tinput->address_n, tinput->has_multisig, false) &&
+static bool fill_input_script_pubkey(TxInputType *in) {
+  if (!get_script_pubkey(coin, &node, in->has_multisig, &in->multisig,
+                         in->script_type, in->script_pubkey.bytes,
+                         &in->script_pubkey.size)) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Failed to derive scriptPubKey"));
+    signing_abort();
+    return false;
+  }
+  in->has_script_pubkey = true;
+  return true;
+}
+
+static bool validate_path(InputScriptType script_type,
+                          pb_size_t address_n_count, const uint32_t *address_n,
+                          bool has_multisig) {
+  if (is_coinjoin == sectrue) {
+    // Check whether the authorization matches the parameters of the input.
+    if (address_n_count !=
+            coinjoin_authorization.address_n_count + BIP32_WALLET_DEPTH ||
+        memcmp(address_n, coinjoin_authorization.address_n,
+               sizeof(uint32_t) * coinjoin_authorization.address_n_count) !=
+            0 ||
+        script_type != coinjoin_authorization.script_type) {
+      fsm_sendFailure(FailureType_Failure_ProcessError, _("Unauthorized path"));
+      signing_abort();
+      return false;
+    }
+  } else {
+    // Sanity check not critical for security. The main reason for this is that
+    // we are not comfortable with using the same private key in multiple
+    // signature schemes (ECDSA and Schnorr) and we want to be sure that the
+    // user went through a warning screen before we sign the input.
+    if (!coin_path_check(coin, script_type, address_n_count, address_n,
+                         has_multisig, unlocked_schema, true)) {
+      if (config_getSafetyCheckLevel() == SafetyCheckLevel_Strict &&
+          !coin_path_check(coin, script_type, address_n_count, address_n,
+                           has_multisig, unlocked_schema, false)) {
+        fsm_sendFailure(FailureType_Failure_DataError, _("Forbidden key path"));
+        signing_abort();
+        return false;
+      }
+
+      if (!foreign_address_confirmed) {
+        if (signing_stage < STAGE_REQUEST_3_INPUT) {
+          if (!fsm_layoutPathWarning()) {
+            signing_abort();
+            return false;
+          }
+          foreign_address_confirmed = true;
+        } else {
+          fsm_sendFailure(FailureType_Failure_ProcessError,
+                          _("Transaction has changed during signing"));
+          signing_abort();
+          return false;
+        }
+      }
+    }
+  }
+  return true;
+}
+
+static bool input_validate_path(const TxInputType *txi) {
+  return validate_path(txi->script_type, txi->address_n_count, txi->address_n,
+                       txi->has_multisig);
+}
+
+static bool derive_node(InputScriptType script_type, pb_size_t address_n_count,
+                        const uint32_t *address_n, bool has_multisig) {
+  if (!coin_path_check(coin, script_type, address_n_count, address_n,
+                       has_multisig, unlocked_schema, false) &&
       config_getSafetyCheckLevel() == SafetyCheckLevel_Strict) {
     fsm_sendFailure(FailureType_Failure_DataError, _("Forbidden key path"));
     signing_abort();
     return false;
   }
 
-  // Sanity check not critical for security. The main reason for this is that we
-  // are not comfortable with using the same private key in multiple signature
-  // schemes (ECDSA and Schnorr) and we want to be sure that the user went
-  // through a warning screen before we sign the input.
-  if (!foreign_address_confirmed &&
-      !coin_path_check(coin, tinput->script_type, tinput->address_n_count,
-                       tinput->address_n, tinput->has_multisig, true)) {
-    fsm_sendFailure(FailureType_Failure_ProcessError,
-                    _("Transaction has changed during signing"));
-    signing_abort();
-    return false;
-  }
-
   memcpy(&node, &root, sizeof(HDNode));
-  if (hdnode_private_ckd_cached(&node, tinput->address_n,
-                                tinput->address_n_count, NULL) == 0) {
+  if (hdnode_private_ckd_cached(&node, address_n, address_n_count, NULL) == 0) {
     fsm_sendFailure(FailureType_Failure_ProcessError,
                     _("Failed to derive private key."));
     signing_abort();
@@ -887,6 +1195,11 @@ static bool derive_node(TxInputType *tinput) {
   return true;
 }
 
+static bool input_derive_node(const TxInputType *txi) {
+  return derive_node(txi->script_type, txi->address_n_count, txi->address_n,
+                     txi->has_multisig);
+}
+
 static bool tx_info_init(TxInfo *tx_info, uint32_t inputs_count,
                          uint32_t outputs_count, uint32_t version,
                          uint32_t lock_time, bool has_expiry, uint32_t expiry,
@@ -931,11 +1244,14 @@ static bool tx_info_init(TxInfo *tx_info, uint32_t inputs_count,
 
   tx_info->inputs_count = inputs_count;
   tx_info->outputs_count = outputs_count;
+  tx_info->segwit_count = 0;
   tx_info->next_legacy_input = 0xffffffff;
   tx_info->min_sequence = SEQUENCE_FINAL;
   tx_info->multisig_fp_set = false;
   tx_info->multisig_fp_mismatch = false;
   tx_info->in_address_n_count = 0;
+  tx_info->in_script_type = 0;
+  tx_info->in_script_type_state = MatchState_UNDEFINED;
   tx_info->version = version;
   tx_info->lock_time = lock_time;
 
@@ -1031,10 +1347,50 @@ static bool tx_info_init(TxInfo *tx_info, uint32_t inputs_count,
   return true;
 }
 
-void signing_init(const SignTx *msg, const CoinInfo *_coin,
-                  const HDNode *_root) {
+static bool init_coinjoin(const SignTx *msg,
+                          const AuthorizeCoinJoin *authorization) {
+  if (!msg->has_coinjoin_request) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Missing coinjoin request."));
+    signing_abort();
+    return false;
+  }
+
+  if (strcmp(coin->coin_name, authorization->coin_name) != 0) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Unauthorized operation."));
+  }
+
+  memcpy(&coinjoin_authorization, authorization,
+         sizeof(coinjoin_authorization));
+  memcpy(&coinjoin_request, &msg->coinjoin_request, sizeof(coinjoin_request));
+
+  // Begin hashing the CoinJoin request.
+  hasher_Init(&coinjoin_request_hasher, HASHER_SHA2);
+  hasher_Update(&coinjoin_request_hasher, (const uint8_t *)"CJR1", 4);
+  size_t coordinator_len =
+      strnlen(authorization->coordinator, sizeof(authorization->coordinator));
+  tx_script_hash(&coinjoin_request_hasher, coordinator_len,
+                 (const uint8_t *)authorization->coordinator);
+  uint32_t slip44 = coin->coin_type & PATH_UNHARDEN_MASK;
+  hasher_Update(&coinjoin_request_hasher, (uint8_t *)&slip44, sizeof(slip44));
+  hasher_Update(&coinjoin_request_hasher,
+                (const uint8_t *)&coinjoin_request.fee_rate, 4);
+  hasher_Update(&coinjoin_request_hasher,
+                (const uint8_t *)&coinjoin_request.no_fee_threshold, 8);
+  hasher_Update(&coinjoin_request_hasher,
+                (const uint8_t *)&coinjoin_request.min_registrable_amount, 8);
+  hasher_Update(&coinjoin_request_hasher,
+                coinjoin_request.mask_public_key.bytes, 33);
+  ser_length_hash(&coinjoin_request_hasher, msg->inputs_count);
+  return true;
+}
+
+void signing_init(const SignTx *msg, const CoinInfo *_coin, const HDNode *_root,
+                  const AuthorizeCoinJoin *authorization, PathSchema unlock) {
   coin = _coin;
   amount_unit = msg->has_amount_unit ? msg->amount_unit : AmountUnit_BITCOIN;
+  serialize = msg->has_serialize ? msg->serialize : true;
   memcpy(&root, _root, sizeof(HDNode));
 
   if (msg->inputs_count > MAX_INPUTS_COUNT) {
@@ -1061,29 +1417,42 @@ void signing_init(const SignTx *msg, const CoinInfo *_coin,
   }
 #endif
 
-  tx_weight = 4 * size;
+  tx_base_weight = 4 * size;
+  tx_weight = tx_base_weight;
+  our_weight = tx_base_weight;
+  our_inputs_len = 0;
 
   foreign_address_confirmed = false;
   taproot_only = true;
+  has_unverified_external_input = false;
   signatures = 0;
   idx1 = 0;
   total_in = 0;
+  external_in = 0;
   total_out = 0;
   change_out = 0;
   change_count = 0;
   orig_total_in = 0;
+  orig_external_in = 0;
   orig_total_out = 0;
   orig_change_out = 0;
+  coinjoin_coordination_fee_base = 0;
   memzero(external_inputs, sizeof(external_inputs));
   memzero(&input, sizeof(TxInputType));
   memzero(&output, sizeof(TxOutputType));
   memzero(&resp, sizeof(TxRequest));
+  memzero(&coinjoin_authorization, sizeof(coinjoin_authorization));
+  memzero(&coinjoin_request, sizeof(coinjoin_request));
+  memzero(&coinjoin_request_hasher, sizeof(coinjoin_request_hasher));
   is_replacement = false;
+  unlocked_schema = unlock;
   signing = true;
-  progress = 0;
-  // we step by 500/inputs_count per input in phase1 and phase2
-  // this means 50 % per phase.
-  progress_step = (500 << PROGRESS_PRECISION) / info.inputs_count;
+  is_coinjoin = (authorization != NULL) ? sectrue : secfalse;
+  if (is_coinjoin == sectrue) {
+    if (!init_coinjoin(msg, authorization)) {
+      return;
+    }
+  }
 
   uint32_t branch_id = 0;
 #if !BITCOIN_ONLY
@@ -1109,89 +1478,45 @@ void signing_init(const SignTx *msg, const CoinInfo *_coin,
 
   hasher_Init(&hasher_check, HASHER_SHA2);
 
-  layoutProgressSwipe(_("Signing transaction"), 0);
+  init_loading_progress();
 
   send_req_1_input();
 }
 
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 
-static bool is_multisig_input_script_type(const TxInputType *txinput) {
-  // we do not support Multisig with Taproot yet
-  if (txinput->script_type == InputScriptType_SPENDMULTISIG ||
-      txinput->script_type == InputScriptType_SPENDP2SHWITNESS ||
-      txinput->script_type == InputScriptType_SPENDWITNESS) {
-    return true;
-  }
-  return false;
-}
-
-static bool is_multisig_output_script_type(const TxOutputType *txoutput) {
-  // we do not support Multisig with Taproot yet
-  if (txoutput->script_type == OutputScriptType_PAYTOMULTISIG ||
-      txoutput->script_type == OutputScriptType_PAYTOP2SHWITNESS ||
-      txoutput->script_type == OutputScriptType_PAYTOWITNESS) {
-    return true;
-  }
-  return false;
-}
-
-static bool is_internal_input_script_type(const TxInputType *txinput) {
-  if (txinput->script_type == InputScriptType_SPENDADDRESS ||
-      txinput->script_type == InputScriptType_SPENDMULTISIG ||
-      txinput->script_type == InputScriptType_SPENDP2SHWITNESS ||
-      txinput->script_type == InputScriptType_SPENDWITNESS ||
-      txinput->script_type == InputScriptType_SPENDTAPROOT) {
-    return true;
-  }
-  return false;
-}
-
-static bool is_change_output_script_type(const TxOutputType *txoutput) {
-  if (txoutput->script_type == OutputScriptType_PAYTOADDRESS ||
-      txoutput->script_type == OutputScriptType_PAYTOMULTISIG ||
-      txoutput->script_type == OutputScriptType_PAYTOP2SHWITNESS ||
-      txoutput->script_type == OutputScriptType_PAYTOWITNESS ||
-      txoutput->script_type == OutputScriptType_PAYTOTAPROOT) {
-    return true;
-  }
-  return false;
-}
-
-static bool is_segwit_input_script_type(const TxInputType *txinput) {
-  if (txinput->script_type == InputScriptType_SPENDP2SHWITNESS ||
-      txinput->script_type == InputScriptType_SPENDWITNESS ||
-      txinput->script_type == InputScriptType_SPENDTAPROOT) {
-    return true;
-  }
-  return false;
-}
-
-static bool is_segwit_output_script_type(const TxOutputType *txoutput) {
-  if (txoutput->script_type == OutputScriptType_PAYTOP2SHWITNESS ||
-      txoutput->script_type == OutputScriptType_PAYTOWITNESS ||
-      txoutput->script_type == OutputScriptType_PAYTOTAPROOT) {
-    return true;
-  }
-  return false;
-}
-
 static bool signing_validate_input(const TxInputType *txinput) {
   if (txinput->prev_hash.size != 32) {
-    fsm_sendFailure(FailureType_Failure_ProcessError,
-                    _("Encountered invalid prevhash"));
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Provided prev_hash is invalid."));
     signing_abort();
     return false;
   }
 
-  if (txinput->has_multisig && !is_multisig_input_script_type(txinput)) {
+  if (txinput->has_multisig &&
+      !is_multisig_input_script_type(txinput->script_type)) {
     fsm_sendFailure(FailureType_Failure_DataError,
                     _("Multisig field provided but not expected."));
     signing_abort();
     return false;
   }
 
-  if (is_internal_input_script_type(txinput)) {
+  if (!txinput->has_multisig &&
+      txinput->script_type == InputScriptType_SPENDMULTISIG) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Multisig details required."));
+    signing_abort();
+    return false;
+  }
+
+  if (is_internal_input_script_type(txinput->script_type)) {
+    if (txinput->address_n_count == 0) {
+      fsm_sendFailure(FailureType_Failure_DataError,
+                      _("Missing address_n field."));
+      signing_abort();
+      return false;
+    }
+
     if (txinput->has_script_pubkey) {
       // scriptPubKey should only be provided for external inputs
       fsm_sendFailure(FailureType_Failure_DataError,
@@ -1199,6 +1524,13 @@ static bool signing_validate_input(const TxInputType *txinput) {
       signing_abort();
       return false;
     }
+
+    if (txinput->has_ownership_proof) {
+      fsm_sendFailure(FailureType_Failure_DataError,
+                      _("Ownership proof provided but not expected."));
+      signing_abort();
+      return false;
+    }
   } else if (txinput->script_type == InputScriptType_EXTERNAL) {
     if (txinput->address_n_count != 0) {
       fsm_sendFailure(FailureType_Failure_DataError,
@@ -1221,7 +1553,15 @@ static bool signing_validate_input(const TxInputType *txinput) {
     return false;
   }
 
-  if (is_segwit_input_script_type(txinput)) {
+  if (!coin->decred && txinput->has_decred_tree) {
+    fsm_sendFailure(
+        FailureType_Failure_DataError,
+        _("Decred details provided but Decred coin not specified."));
+    signing_abort();
+    return false;
+  }
+
+  if (is_segwit_input_script_type(txinput->script_type)) {
     if (!coin->has_segwit) {
       fsm_sendFailure(FailureType_Failure_DataError,
                       _("Segwit not enabled on this coin"));
@@ -1238,6 +1578,13 @@ static bool signing_validate_input(const TxInputType *txinput) {
     return false;
   }
 
+  if (txinput->has_commitment_data && !txinput->has_ownership_proof) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("commitment_data field provided but not expected."));
+    signing_abort();
+    return false;
+  }
+
   if (txinput->has_orig_hash) {
     if (!txinput->has_orig_index) {
       fsm_sendFailure(FailureType_Failure_DataError,
@@ -1247,8 +1594,8 @@ static bool signing_validate_input(const TxInputType *txinput) {
     }
 
     if (txinput->orig_hash.size != 32) {
-      fsm_sendFailure(FailureType_Failure_ProcessError,
-                      _("Encountered invalid orig_hash"));
+      fsm_sendFailure(FailureType_Failure_DataError,
+                      _("Provided orig_hash is invalid."));
       signing_abort();
       return false;
     }
@@ -1257,8 +1604,28 @@ static bool signing_validate_input(const TxInputType *txinput) {
   return true;
 }
 
+static bool signing_validate_prev_input(const TxInputType *txinput) {
+  if (txinput->prev_hash.size != 32) {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Provided prev_hash is invalid."));
+    signing_abort();
+    return false;
+  }
+
+  if (!coin->decred && txinput->has_decred_tree) {
+    fsm_sendFailure(
+        FailureType_Failure_DataError,
+        _("Decred details provided but Decred coin not specified."));
+    signing_abort();
+    return false;
+  }
+
+  return true;
+}
+
 static bool signing_validate_output(TxOutputType *txoutput) {
-  if (txoutput->has_multisig && !is_multisig_output_script_type(txoutput)) {
+  if (txoutput->has_multisig &&
+      !is_multisig_output_script_type(txoutput->script_type)) {
     fsm_sendFailure(FailureType_Failure_DataError,
                     _("Multisig field provided but not expected."));
     signing_abort();
@@ -1266,7 +1633,7 @@ static bool signing_validate_output(TxOutputType *txoutput) {
   }
 
   if (txoutput->address_n_count > 0 &&
-      !is_change_output_script_type(txoutput)) {
+      !is_change_output_script_type(txoutput->script_type)) {
     fsm_sendFailure(FailureType_Failure_DataError,
                     _("Output's address_n provided but not expected."));
     signing_abort();
@@ -1307,7 +1674,7 @@ static bool signing_validate_output(TxOutputType *txoutput) {
     }
   }
 
-  if (is_segwit_output_script_type(txoutput)) {
+  if (is_segwit_output_script_type(txoutput->script_type)) {
     if (!coin->has_segwit) {
       fsm_sendFailure(FailureType_Failure_DataError,
                       _("Segwit not enabled on this coin"));
@@ -1367,11 +1734,19 @@ static bool tx_info_add_input(TxInfo *tx_info, const TxInputType *txinput) {
       return false;
     }
 
+    // Remember the input's script type. Change-outputs must use the same script
+    // type as all inputs.
+    extract_input_script_type(tx_info, txinput);
+
     // Remember the input's BIP-32 path. Change-outputs must use the same path
     // as all inputs.
     extract_input_bip32_path(tx_info, txinput);
   }
 
+  if (is_segwit_input_script_type(txinput->script_type)) {
+    tx_info->segwit_count++;
+  }
+
   // Remember the minimum nSequence value.
   if (txinput->sequence < tx_info->min_sequence) {
     tx_info->min_sequence = txinput->sequence;
@@ -1388,31 +1763,41 @@ static bool tx_info_add_input(TxInfo *tx_info, const TxInputType *txinput) {
 }
 
 static bool tx_info_check_input(TxInfo *tx_info, TxInputType *tinput) {
+  bool result = true;
+
   if (!tx_info->multisig_fp_mismatch) {
     // check that this is still multisig
     uint8_t h[32] = {0};
     if (!tinput->has_multisig ||
         cryptoMultisigFingerprint(&(tinput->multisig), h) == 0 ||
         memcmp(tx_info->multisig_fp, h, 32) != 0) {
-      fsm_sendFailure(FailureType_Failure_ProcessError,
-                      _("Transaction has changed during signing"));
-      signing_abort();
-      return false;
+      result = false;
     }
   }
+
+  if (tx_info->in_script_type_state == MatchState_MATCH) {
+    // check that input script type didn't change
+    if (simple_script_type(tinput->script_type) != tx_info->in_script_type) {
+      result = false;
+    }
+  }
+
   if (tx_info->in_address_n_count != BIP32_NOCHANGEALLOWED) {
     // check that input address didn't change
     size_t count = tinput->address_n_count;
     if (count < 2 || count != tx_info->in_address_n_count ||
         0 != memcmp(tx_info->in_address_n, tinput->address_n,
                     (count - 2) * sizeof(uint32_t))) {
-      fsm_sendFailure(FailureType_Failure_ProcessError,
-                      _("Transaction has changed during signing"));
-      signing_abort();
-      return false;
+      result = false;
     }
   }
-  return true;
+
+  if (result == false) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Transaction has changed during signing"));
+    signing_abort();
+  }
+  return result;
 }
 
 static bool tx_info_add_output(TxInfo *tx_info,
@@ -1500,6 +1885,62 @@ static bool tx_info_check_outputs_hash(TxInfo *tx_info) {
   return true;
 }
 
+static bool coinjoin_add_input(TxInputType *txi) {
+  // Masks for the signable and no_fee bits in coinjoin_flags.
+  const uint8_t COINJOIN_FLAGS_SIGNABLE = 0x01;
+  const uint8_t COINJOIN_FLAGS_NO_FEE = 0x02;
+
+  hasher_Update(&coinjoin_request_hasher, (uint8_t *)&txi->coinjoin_flags, 1);
+
+  if (txi->script_type == InputScriptType_EXTERNAL) {
+    return true;
+  }
+
+  // Compute the masking bit for the signable bit in coinjoin flags.
+  static CONFIDENTIAL uint8_t output_private_key[32] = {0};
+  uint8_t shared_secret[65] = {0};
+  bool res = (zkp_bip340_tweak_private_key(node.private_key, NULL,
+                                           output_private_key) == 0);
+  res = res && (ecdh_multiply(&secp256k1, output_private_key,
+                              coinjoin_request.mask_public_key.bytes,
+                              shared_secret) == 0);
+  memzero(&output_private_key, sizeof(output_private_key));
+  if (!res) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Failed to derive shared secret."));
+    signing_abort();
+    return false;
+  }
+
+  Hasher mask_hasher = {0};
+  uint8_t mask[SHA256_DIGEST_LENGTH] = {0};
+  hasher_Init(&mask_hasher, HASHER_SHA2);
+  hasher_Update(&mask_hasher, shared_secret + 1, 32);
+  tx_prevout_hash(&mask_hasher, txi);
+  hasher_Final(&mask_hasher, mask);
+
+  // Ensure that the input can be signed.
+  bool signable = (txi->coinjoin_flags ^ mask[0]) & COINJOIN_FLAGS_SIGNABLE;
+  if (!signable) {
+    fsm_sendFailure(FailureType_Failure_ProcessError, _("Unauthorized input"));
+    signing_abort();
+    return false;
+  }
+
+  // Add to coordination_fee_base, except for remixes and small inputs which are
+  // not charged a coordination fee.
+  bool no_fee = txi->coinjoin_flags & COINJOIN_FLAGS_NO_FEE;
+  if (txi->amount > coinjoin_request.no_fee_threshold && !no_fee) {
+    if (!add_amount(&coinjoin_coordination_fee_base, txi->amount)) {
+      return false;
+    }
+  }
+
+  // Since this took a longer time, update progress.
+  report_progress(true);
+  return true;
+}
+
 static bool signing_add_input(TxInputType *txinput) {
   // hash all input data to check it later (relevant for fee computation)
   if (!tx_input_check_hash(&info.hasher_check, txinput)) {
@@ -1509,31 +1950,12 @@ static bool signing_add_input(TxInputType *txinput) {
     return false;
   }
 
-  if (txinput->script_type != InputScriptType_EXTERNAL &&
-      !coin_path_check(coin, txinput->script_type, txinput->address_n_count,
-                       txinput->address_n, txinput->has_multisig, true)) {
-    if (config_getSafetyCheckLevel() == SafetyCheckLevel_Strict &&
-        !coin_path_check(coin, txinput->script_type, txinput->address_n_count,
-                         txinput->address_n, txinput->has_multisig, false)) {
-      fsm_sendFailure(FailureType_Failure_DataError, _("Forbidden key path"));
-      signing_abort();
+  if (txinput->script_type != InputScriptType_EXTERNAL) {
+    // External inputs should have scriptPubKey set by the host.
+    if (!input_validate_path(txinput) || !input_derive_node(txinput) ||
+        !fill_input_script_pubkey(txinput)) {
       return false;
     }
-
-    if (!foreign_address_confirmed) {
-      if (!fsm_layoutPathWarning()) {
-        signing_abort();
-        return false;
-      }
-      foreign_address_confirmed = true;
-    }
-  }
-
-  if (!fill_input_script_pubkey(coin, &root, txinput)) {
-    fsm_sendFailure(FailureType_Failure_ProcessError,
-                    _("Failed to derive scriptPubKey"));
-    signing_abort();
-    return false;
   }
 
   // Add input to BIP-143/BIP-341 computation.
@@ -1541,13 +1963,21 @@ static bool signing_add_input(TxInputType *txinput) {
     return false;
   }
 
+  if (is_coinjoin == sectrue) {
+    if (!coinjoin_add_input(txinput)) {
+      return false;
+    }
+  }
+
 #if !BITCOIN_ONLY
   if (coin->decred) {
-    // serialize Decred prefix in Phase 1
-    resp.has_serialized = true;
-    resp.serialized.has_serialized_tx = true;
-    resp.serialized.serialized_tx.size =
-        tx_serialize_input(&to, txinput, resp.serialized.serialized_tx.bytes);
+    if (serialize) {
+      // serialize Decred prefix in Phase 1
+      resp.has_serialized = true;
+      resp.serialized.has_serialized_tx = true;
+      resp.serialized.serialized_tx.size =
+          tx_serialize_input(&to, txinput, resp.serialized.serialized_tx.bytes);
+    }
 
     // compute Decred hashPrefix
     tx_serialize_input_hash(&ti, txinput);
@@ -1567,6 +1997,10 @@ static bool signing_check_prevtx_hash(void) {
     return false;
   }
 
+  // prevtx is checked
+  progress_step++;
+  progress_substep = 0;
+
   if (idx1 < info.inputs_count - 1) {
     idx1++;
     send_req_3_input();
@@ -1575,10 +2009,6 @@ static bool signing_check_prevtx_hash(void) {
       return false;
     }
 
-    // Everything was checked, now phase 2 begins and the transaction is signed.
-    progress_meta_step =
-        progress_step / (info.inputs_count + info.outputs_count);
-    layoutProgress(_("Signing transaction"), progress);
     idx1 = 0;
 #if !BITCOIN_ONLY
     if (coin->decred) {
@@ -1592,7 +2022,7 @@ static bool signing_check_prevtx_hash(void) {
         phase2_request_orig_input();
       } else {
         // Proceed to transaction signing.
-        phase2_request_next_input();
+        phase2_request_next_input(true);
       }
     }
   }
@@ -1600,9 +2030,95 @@ static bool signing_check_prevtx_hash(void) {
   return true;
 }
 
+static bool compile_output(TxOutputType *in, TxOutputBinType *out,
+                           bool needs_confirm) {
+  memzero(out, sizeof(TxOutputBinType));
+  out->amount = in->amount;
+  out->decred_script_version = DECRED_SCRIPT_VERSION;
+
+  if (in->script_type == OutputScriptType_PAYTOOPRETURN) {
+    // only 0 satoshi allowed for OP_RETURN
+    if (in->amount != 0 || in->has_address || (in->address_n_count > 0) ||
+        in->has_multisig) {
+      fsm_sendFailure(FailureType_Failure_ProcessError,
+                      _("Failed to compile output"));
+      signing_abort();
+      return false;
+    }
+    if (needs_confirm) {
+      if (in->op_return_data.size >= 8 &&
+          memcmp(in->op_return_data.bytes, "omni", 4) ==
+              0) {  // OMNI transaction
+        layoutConfirmOmni(in->op_return_data.bytes, in->op_return_data.size);
+      } else {
+        layoutConfirmOpReturn(in->op_return_data.bytes,
+                              in->op_return_data.size);
+      }
+      if (!protectButton(ButtonRequestType_ButtonRequest_ConfirmOutput,
+                         false)) {
+        fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
+        signing_abort();
+        return false;
+      }
+    }
+    op_return_to_script_pubkey(
+        in->op_return_data.bytes, in->op_return_data.size,
+        out->script_pubkey.bytes, &out->script_pubkey.size);
+    return true;
+  }
+
+  if (in->address_n_count > 0) {
+    InputScriptType input_script_type = 0;
+
+    if (!change_output_to_input_script_type(in->script_type,
+                                            &input_script_type)) {
+      fsm_sendFailure(FailureType_Failure_ProcessError,
+                      _("Failed to compile output"));
+      signing_abort();
+      return false;
+    }
+    if (!derive_node(input_script_type, in->address_n_count, in->address_n,
+                     in->has_multisig)) {
+      return false;
+    }
+    if (hdnode_fill_public_key(&node) != 0 ||
+        !compute_address(coin, input_script_type, &node, in->has_multisig,
+                         &in->multisig, in->address)) {
+      fsm_sendFailure(FailureType_Failure_ProcessError,
+                      _("Failed to compile output"));
+      signing_abort();
+      return false;
+    }
+  } else if (!in->has_address) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Failed to compile output"));
+    signing_abort();
+    return false;
+  }
+
+  if (!address_to_script_pubkey(coin, in->address, out->script_pubkey.bytes,
+                                &out->script_pubkey.size)) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Failed to compile output"));
+    signing_abort();
+    return false;
+  }
+
+  if (needs_confirm) {
+    layoutConfirmOutput(coin, amount_unit, in);
+    if (!protectButton(ButtonRequestType_ButtonRequest_ConfirmOutput, false)) {
+      fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
+      signing_abort();
+      return false;
+    }
+  }
+
+  return true;
+}
+
 static bool is_change_output(const TxInfo *tx_info,
                              const TxOutputType *txoutput) {
-  if (!is_change_output_script_type(txoutput)) {
+  if (!is_change_output_script_type(txoutput->script_type)) {
     return false;
   }
 
@@ -1611,12 +2127,21 @@ static bool is_change_output(const TxInfo *tx_info,
   }
 
   /*
-   * For multisig check that all inputs are multisig
+   * Check the multisig fingerprint only for multisig outputs. This means that
+   * a transfer from a multisig account to a singlesig account is treated as a
+   * change-output as long as all other change-output conditions are satisfied.
+   * This goes a bit against the concept of a multisig account, but the other
+   * cosigners will notice that they are relinquishing control of the funds, so
+   * there is no security risk.
    */
   if (txoutput->has_multisig && !check_change_multisig_fp(tx_info, txoutput)) {
     return false;
   }
 
+  if (!check_change_script_type(tx_info, txoutput)) {
+    return false;
+  }
+
   return check_change_bip32_path(tx_info, txoutput);
 }
 
@@ -1627,6 +2152,12 @@ static bool signing_add_output(TxOutputType *txoutput) {
 
   bool is_change = is_change_output(&info, txoutput);
 
+  uint32_t output_weight = tx_output_weight(coin, txoutput);
+  tx_weight += output_weight;
+  if (is_change) {
+    our_weight += output_weight;
+  }
+
   // Don't allow adding new external outputs in replacement transactions. There
   // is actually nothing wrong with adding new external outputs, but the only
   // way to pay for them would be by supplying a new (verified) external input,
@@ -1658,31 +2189,41 @@ static bool signing_add_output(TxOutputType *txoutput) {
     }
   }
 
+  // If address_n is specified, then check that the script type matches.
+  if (txoutput->address_n_count != 0) {
+    InputScriptType script_type = 0;
+    if (!change_output_to_input_script_type(txoutput->script_type,
+                                            &script_type)) {
+      fsm_sendFailure(FailureType_Failure_DataError,
+                      _("Unsupported script type."));
+      signing_abort();
+      return false;
+    }
+
+    if (!validate_path(script_type, txoutput->address_n_count,
+                       txoutput->address_n, txoutput->has_multisig)) {
+      return false;
+    }
+  }
+
   // Skip confirmation of change-outputs and skip output confirmation altogether
   // in replacement transactions.
-  bool skip_confirm = is_change || is_replacement;
-  int co = compile_output(coin, amount_unit, &root, txoutput, &bin_output,
-                          !skip_confirm);
-  if (!skip_confirm) {
-    layoutProgress(_("Signing transaction"), progress);
+  bool skip_confirm = is_change || is_replacement || (is_coinjoin == sectrue);
+  if (!compile_output(txoutput, &bin_output, !skip_confirm)) {
+    return false;
   }
-  if (co < 0) {
-    fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
-    signing_abort();
-    return false;
-  } else if (co == 0) {
-    fsm_sendFailure(FailureType_Failure_ProcessError,
-                    _("Failed to compile output"));
-    signing_abort();
-    return false;
+  if (!skip_confirm) {
+    report_progress(true);
   }
 #if !BITCOIN_ONLY
   if (coin->decred) {
-    // serialize Decred prefix in Phase 1
-    resp.has_serialized = true;
-    resp.serialized.has_serialized_tx = true;
-    resp.serialized.serialized_tx.size = tx_serialize_output(
-        &to, &bin_output, resp.serialized.serialized_tx.bytes);
+    if (serialize) {
+      // serialize Decred prefix in Phase 1
+      resp.has_serialized = true;
+      resp.serialized.has_serialized_tx = true;
+      resp.serialized.serialized_tx.size = tx_serialize_output(
+          &to, &bin_output, resp.serialized.serialized_tx.bytes);
+    }
 
     // compute Decred hashPrefix
     tx_serialize_output_hash(&ti, &bin_output);
@@ -1749,11 +2290,12 @@ static bool signing_add_orig_input(TxInputType *orig_input) {
     return false;
   }
 
-  if (!fill_input_script_pubkey(coin, &root, orig_input)) {
-    fsm_sendFailure(FailureType_Failure_ProcessError,
-                    _("Failed to derive scriptPubKey"));
-    signing_abort();
-    return false;
+  if (orig_input->script_type != InputScriptType_EXTERNAL) {
+    // External inputs should have scriptPubKey set by the host.
+    if (!input_derive_node(orig_input) ||
+        !fill_input_script_pubkey(orig_input)) {
+      return false;
+    }
   }
 
   // Verify that the original input matches the current input.
@@ -1810,11 +2352,7 @@ static bool signing_add_orig_input(TxInputType *orig_input) {
 static bool signing_add_orig_output(TxOutputType *orig_output) {
   // Compute scriptPubKey.
   TxOutputBinType orig_bin_output;
-  if (compile_output(coin, amount_unit, &root, orig_output, &orig_bin_output,
-                     false) <= 0) {
-    fsm_sendFailure(FailureType_Failure_ProcessError,
-                    _("Failed to compile output"));
-    signing_abort();
+  if (!compile_output(orig_output, &orig_bin_output, false)) {
     return false;
   }
 
@@ -1910,8 +2448,8 @@ static bool signing_add_orig_output(TxOutputType *orig_output) {
   return true;
 }
 
-static bool signing_confirm_tx(void) {
-  if (has_external_input()) {
+static bool payment_confirm_tx(void) {
+  if (has_unverified_external_input) {
     layoutConfirmUnverifiedExternalInputs();
     if (!protectButton(ButtonRequestType_ButtonRequest_SignTx, false)) {
       fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
@@ -1971,12 +2509,23 @@ static bool signing_confirm_tx(void) {
     }
     uint64_t orig_fee = orig_total_in - orig_total_out;
 
+    // Reject adding external inputs to the original transaction, so that we
+    // don't have to deal with the UI implications. This could be used for
+    // BIP-78 Payjoins when we support presigned external inputs.
+    if (external_in != orig_external_in) {
+      fsm_sendFailure(FailureType_Failure_ProcessError,
+                      _("Adding external inputs is not supported."));
+      signing_abort();
+      return false;
+    }
+
     // Sanity check. Replacement transactions are only allowed to make
     // amendments which do not increase the amount that we are spending on
     // external outputs. Additional funds can only go towards the fee, which is
     // confirmed by the user. The check may fail if the replacement transaction
     // starts mixing accounts and breaks change-output identification.
-    if (total_out - change_out > orig_total_out - orig_change_out) {
+    if (total_out - change_out - external_in >
+        orig_total_out - orig_change_out - orig_external_in) {
       fsm_sendFailure(FailureType_Failure_ProcessError,
                       _("Invalid replacement transaction."));
       signing_abort();
@@ -2019,8 +2568,8 @@ static bool signing_confirm_tx(void) {
     }
 
     // last confirmation
-    layoutConfirmTx(coin, amount_unit, total_in, total_out, change_out,
-                    tx_weight);
+    layoutConfirmTx(coin, amount_unit, total_in, external_in, total_out,
+                    change_out, tx_weight);
     if (!protectButton(ButtonRequestType_ButtonRequest_SignTx, false)) {
       fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);
       signing_abort();
@@ -2031,6 +2580,129 @@ static bool signing_confirm_tx(void) {
   return true;
 }
 
+static bool coinjoin_confirm_tx(void) {
+  // Minimum registrable output amount accepted by the CoinJoin coordinator. The
+  // CoinJoin request may specify an even lower amount.
+  const uint64_t MIN_REGISTRABLE_OUTPUT_AMOUNT = 5000;
+
+  // Largest possible weight of an output supported by Trezor (P2TR or P2WSH).
+  const uint64_t MAX_OUTPUT_WEIGHT = 4 * (8 + 1 + 1 + 1 + 32);
+
+  // The public key used for verifying coinjoin requests in production on
+  // mainnet.
+  const uint8_t COINJOIN_REQ_PUBKEY[] = {
+      0x02, 0x57, 0x03, 0xbb, 0xe1, 0x5b, 0xb0, 0x8e, 0x98, 0x21, 0xfe,
+      0x64, 0xaf, 0xf6, 0xb2, 0xef, 0x1a, 0x31, 0x60, 0xe3, 0x79, 0x9d,
+      0xd8, 0xf0, 0xce, 0xbf, 0x2c, 0x79, 0xe8, 0x67, 0xdd, 0x12, 0x5d};
+
+  // The public key used for verifying coinjoin requests on testnet and in debug
+  // mode. secp256k1 public key of m/0h for "all all ... all" seed.
+  const uint8_t COINJOIN_REQ_PUBKEY_TEST[] = {
+      0x03, 0x0f, 0xdf, 0x5e, 0x28, 0x9b, 0x5a, 0xef, 0x53, 0x62, 0x90,
+      0x95, 0x3a, 0xe8, 0x1c, 0xe6, 0x0e, 0x84, 0x1f, 0xf9, 0x56, 0xf3,
+      0x66, 0xac, 0x12, 0x3f, 0xa6, 0x9d, 0xb3, 0xc7, 0x9f, 0x21, 0xb0};
+
+  // Finish hashing the CoinJoin request.
+  hasher_Update(&coinjoin_request_hasher, info.hash_prevouts,
+                sizeof(info.hash_prevouts));
+  hasher_Update(&coinjoin_request_hasher, info.hash_outputs,
+                sizeof(info.hash_outputs));
+
+  // Verify the CoinJoin request signature.
+  uint8_t coinjoin_request_digest[SHA256_DIGEST_LENGTH] = {0};
+  hasher_Final(&coinjoin_request_hasher, coinjoin_request_digest);
+  if ((DEBUG_LINK || coin->coin_type == SLIP44_TESTNET) &&
+      ecdsa_verify_digest(&secp256k1, COINJOIN_REQ_PUBKEY_TEST,
+                          coinjoin_request.signature.bytes,
+                          coinjoin_request_digest) == 0) {
+    // success
+  } else if (ecdsa_verify_digest(&secp256k1, COINJOIN_REQ_PUBKEY,
+                                 coinjoin_request.signature.bytes,
+                                 coinjoin_request_digest) == 0) {
+    // success
+  } else {
+    fsm_sendFailure(FailureType_Failure_DataError,
+                    _("Invalid signature in coinjoin request."));
+    signing_abort();
+    return false;
+  }
+
+  if (has_unverified_external_input) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Unverifiable external input."));
+    signing_abort();
+    return false;
+  }
+
+  uint64_t mining_fee = 0;
+  if (total_out <= total_in) {
+    mining_fee = total_in - total_out;
+  }
+
+  // The maximum mining fee that the user should be paying.
+  uint64_t our_max_mining_fee =
+      coinjoin_authorization.max_fee_per_kvbyte * ((our_weight + 3) / 4) / 1000;
+
+  // The coordination fee for the user's inputs.
+  uint64_t our_coordination_fee =
+      MIN(coinjoin_request.fee_rate,
+          coinjoin_authorization.max_coordinator_fee_rate) *
+      coinjoin_coordination_fee_base / FEE_RATE_DECIMALS / 100;
+
+  // Total fees that the user is paying.
+  uint64_t our_fees = 0;
+  if (change_out <= total_in - external_in) {
+    our_fees = total_in - external_in - change_out;
+  }
+
+  // For the next step we need to estimate an upper bound on the mining fee used
+  // by the coordinator. The coordinator does not include the base weight of the
+  // transaction when computing the mining fee, so we take this into account.
+  uint64_t max_fee_per_output =
+      MAX_OUTPUT_WEIGHT * mining_fee / (tx_weight - tx_base_weight);
+
+  // Calculate the minimum registrable output amount in a CoinJoin plus the
+  // mining fee that it would cost to register. Amounts below this value are
+  // left to the coordinator or miners and effectively constitute an extra fee
+  // for the user.
+  uint64_t min_allowed_output_amount_plus_fee =
+      MIN(coinjoin_request.min_registrable_amount,
+          MIN_REGISTRABLE_OUTPUT_AMOUNT) +
+      max_fee_per_output;
+
+  if (our_fees > our_coordination_fee + our_max_mining_fee +
+                     min_allowed_output_amount_plus_fee) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Total fee over threshold."));
+    signing_abort();
+    return false;
+  }
+
+  if (coinjoin_authorization.max_rounds < 1) {
+    fsm_sendFailure(FailureType_Failure_ProcessError,
+                    _("Exceeded number of coinjoin rounds."));
+    signing_abort();
+    return false;
+  }
+
+  coinjoin_authorization.max_rounds -= 1;
+  if (coinjoin_authorization.max_rounds >= 1) {
+    config_setCoinJoinAuthorization(&coinjoin_authorization);
+  } else {
+    config_setCoinJoinAuthorization(NULL);
+  }
+
+  return true;
+}
+
+static bool signing_confirm_tx(void) {
+  if (is_coinjoin == sectrue) {
+    return coinjoin_confirm_tx();
+  } else {
+    return payment_confirm_tx();
+  }
+}
+
 static uint32_t signing_hash_type(const TxInputType *txinput) {
   uint32_t hash_type = SIGHASH_ALL;
   if (txinput->script_type == InputScriptType_SPENDTAPROOT) {
@@ -2246,7 +2918,7 @@ static bool signing_verify_orig_nonlegacy_input(TxInputType *orig_input) {
   // Derive node.public_key and fill script_sig with the legacy scriptPubKey
   // (aka BIP-143 script code), which is what our code expects here in order
   // to properly compute the BIP-143 transaction digest.
-  if (!derive_node(orig_input) || !fill_input_script_sig(orig_input)) {
+  if (!input_derive_node(orig_input) || !fill_input_script_sig(orig_input)) {
     return false;
   }
 
@@ -2302,13 +2974,12 @@ static bool signing_verify_orig_legacy_input(void) {
   bool valid = false;
 #ifdef USE_SECP256K1_ZKP_ECDSA
   if (coin->curve->params == &secp256k1) {
-    valid = zkp_ecdsa_verify_digest(coin->curve->params, node.public_key, sig,
-                                    hash) == 0;
+    valid =
+        zkp_ecdsa_verify_digest(coin->curve->params, pubkey, sig, hash) == 0;
   } else
 #endif
   {
-    valid = ecdsa_verify_digest(coin->curve->params, node.public_key, sig,
-                                hash) == 0;
+    valid = ecdsa_verify_digest(coin->curve->params, pubkey, sig, hash) == 0;
   }
 
   if (!valid) {
@@ -2358,10 +3029,11 @@ static bool signing_hash_orig_input(TxInputType *orig_input) {
     // Derive node.public_key and fill script_sig with the legacy
     // scriptPubKey which is what our code expects here in order to properly
     // compute the transaction digest.
-    if (!derive_node(orig_input) || !fill_input_script_sig(orig_input)) {
+    if (!input_derive_node(orig_input) || !fill_input_script_sig(orig_input)) {
       return false;
     }
 
+    memcpy(pubkey, node.public_key, sizeof(pubkey));
     memcpy(&input, orig_input, sizeof(input));
   } else {
     if (orig_info.next_legacy_input == idx1 && idx2 > idx1 &&
@@ -2385,11 +3057,7 @@ static bool signing_hash_orig_input(TxInputType *orig_input) {
 }
 
 static bool signing_hash_orig_output(TxOutputType *orig_output) {
-  if (compile_output(coin, amount_unit, &root, orig_output, &bin_output,
-                     false) <= 0) {
-    fsm_sendFailure(FailureType_Failure_ProcessError,
-                    _("Failed to compile output"));
-    signing_abort();
+  if (!compile_output(orig_output, &bin_output, false)) {
     return false;
   }
 
@@ -2448,6 +3116,14 @@ static void phase1_finish(void) {
     return;
   }
 
+#if DEBUG_LINK
+  if (!assert_progress_finished()) {
+    return;
+  }
+#endif
+  // Now phase 2 begins and the transaction is signed.
+  init_signing_progress();
+
   if (taproot_only) {
     // All internal inputs are Taproot. We do not need to verify that their
     // parameters match previous transactions. We can trust the amounts and
@@ -2458,12 +3134,12 @@ static void phase1_finish(void) {
       phase2_request_orig_input();
     } else {
       // Proceed directly to transaction signing.
-      phase2_request_next_input();
+      phase2_request_next_input(true);
     }
 #if !BITCOIN_ONLY
   } else if (coin->overwintered && info.version == 5) {
     // ZIP-244 transactions are treated same as Taproot.
-    phase2_request_next_input();
+    phase2_request_next_input(true);
 #endif
   } else {
     // There are internal non-Taproot inputs. We need to verify all inputs,
@@ -2542,31 +3218,19 @@ static void signing_hash_decred(const TxInputType *txinput,
 
 static bool signing_sign_ecdsa(TxInputType *txinput, const uint8_t *private_key,
                                const uint8_t *public_key, const uint8_t *hash) {
+  resp.has_serialized = true;
   resp.serialized.has_signature_index = true;
   resp.serialized.signature_index = idx1;
   resp.serialized.has_signature = true;
-  resp.serialized.has_serialized_tx = true;
 
-  int ret = 0;
-#ifdef USE_SECP256K1_ZKP_ECDSA
-  if (coin->curve->params == &secp256k1) {
-    ret = zkp_ecdsa_sign_digest(coin->curve->params, private_key, hash, sig,
-                                NULL, NULL);
-  } else
-#endif
-  {
-    ret = ecdsa_sign_digest(coin->curve->params, private_key, hash, sig, NULL,
-                            NULL);
-  }
-  if (ret != 0) {
+  if (!tx_sign_ecdsa(coin->curve->params, private_key, hash,
+                     resp.serialized.signature.bytes,
+                     &resp.serialized.signature.size)) {
     fsm_sendFailure(FailureType_Failure_ProcessError, _("Signing failed"));
     signing_abort();
     return false;
   }
 
-  resp.serialized.signature.size =
-      ecdsa_sig_to_der(sig, resp.serialized.signature.bytes);
-
   uint8_t sighash = signing_hash_type(txinput) & 0xff;
   if (txinput->has_multisig) {
     // fill in the signature
@@ -2604,23 +3268,15 @@ static bool signing_sign_bip340(const uint8_t *private_key,
   resp.serialized.has_signature_index = true;
   resp.serialized.signature_index = idx1;
   resp.serialized.has_signature = true;
-  resp.serialized.has_serialized_tx = true;
-  resp.serialized.signature.size = 64;
 
-  uint8_t output_private_key[32] = {0};
-  bool ret = (zkp_bip340_tweak_private_key(private_key, NULL,
-                                           output_private_key) == 0);
-  ret = ret &&
-        (zkp_bip340_sign_digest(output_private_key, hash,
-                                resp.serialized.signature.bytes, NULL) == 0);
-  memzero(output_private_key, sizeof(output_private_key));
-
-  if (!ret) {
+  if (!tx_sign_bip340(private_key, hash, resp.serialized.signature.bytes,
+                      &resp.serialized.signature.size)) {
     fsm_sendFailure(FailureType_Failure_ProcessError, _("Signing failed"));
     signing_abort();
+    return false;
   }
 
-  return ret;
+  return true;
 }
 
 static bool signing_sign_legacy_input(void) {
@@ -2631,10 +3287,13 @@ static bool signing_sign_legacy_input(void) {
   // Compute the digest and generate signature.
   uint8_t hash[32] = {0};
   tx_hash_final(&ti, hash, false);
-  resp.has_serialized = true;
   if (!signing_sign_ecdsa(&input, privkey, pubkey, hash)) return false;
-  resp.serialized.serialized_tx.size =
-      tx_serialize_input(&to, &input, resp.serialized.serialized_tx.bytes);
+  if (serialize) {
+    resp.has_serialized = true;
+    resp.serialized.has_serialized_tx = true;
+    resp.serialized.serialized_tx.size =
+        tx_serialize_input(&to, &input, resp.serialized.serialized_tx.bytes);
+  }
   return true;
 }
 
@@ -2653,18 +3312,19 @@ static bool signing_sign_segwit_input(TxInputType *txinput) {
   if (txinput->script_type == InputScriptType_SPENDTAPROOT) {
     signing_hash_bip341(&info, idx1, signing_hash_type(txinput), hash);
 
-    if (!tx_info_check_input(&info, txinput) || !derive_node(txinput) ||
+    if (!input_validate_path(txinput) || !tx_info_check_input(&info, txinput) ||
+        !input_derive_node(txinput) ||
         !signing_sign_bip340(node.private_key, hash)) {
       return false;
     }
 
-    uint32_t r = 0;
-    // write witness (number of stack items followed by signature)
-    r += ser_length(1, resp.serialized.serialized_tx.bytes + r);
-    r += tx_serialize_script(resp.serialized.signature.size,
-                             resp.serialized.signature.bytes,
-                             resp.serialized.serialized_tx.bytes + r);
-    resp.serialized.serialized_tx.size = r;
+    if (serialize) {
+      resp.has_serialized = true;
+      resp.serialized.has_serialized_tx = true;
+      resp.serialized.serialized_tx.size = serialize_p2tr_witness(
+          resp.serialized.signature.bytes, resp.serialized.signature.size, 0,
+          resp.serialized.serialized_tx.bytes);
+    }
   } else if (txinput->script_type == InputScriptType_SPENDP2SHWITNESS ||
              txinput->script_type == InputScriptType_SPENDWITNESS) {
     if (!txinput->has_amount) {
@@ -2681,73 +3341,72 @@ static bool signing_sign_segwit_input(TxInputType *txinput) {
       return false;
     }
 
-    if (!tx_info_check_input(&info, txinput) || !derive_node(txinput) ||
-        !fill_input_script_sig(txinput)) {
+    if (!input_validate_path(txinput) || !tx_info_check_input(&info, txinput) ||
+        !input_derive_node(txinput) || !fill_input_script_sig(txinput)) {
       return false;
     }
 
     signing_hash_bip143(&info, txinput, hash);
 
-    resp.has_serialized = true;
     if (!signing_sign_ecdsa(txinput, node.private_key, node.public_key, hash))
       return false;
 
-    uint8_t sighash = signing_hash_type(txinput) & 0xff;
-    if (txinput->has_multisig) {
-      uint32_t r = 1;  // skip number of items (filled in later)
-      resp.serialized.serialized_tx.bytes[r] = 0;
-      r++;
-      int nwitnesses = 2;
-      for (uint32_t i = 0; i < txinput->multisig.signatures_count; i++) {
-        if (txinput->multisig.signatures[i].size == 0) {
-          continue;
-        }
-        nwitnesses++;
-        txinput->multisig.signatures[i]
-            .bytes[txinput->multisig.signatures[i].size] = sighash;
-        r += tx_serialize_script(txinput->multisig.signatures[i].size + 1,
-                                 txinput->multisig.signatures[i].bytes,
-                                 resp.serialized.serialized_tx.bytes + r);
-      }
-      uint32_t script_len =
-          compile_script_multisig(coin, &txinput->multisig, 0);
-      r += ser_length(script_len, resp.serialized.serialized_tx.bytes + r);
-      r += compile_script_multisig(coin, &txinput->multisig,
+    if (serialize) {
+      resp.has_serialized = true;
+      resp.serialized.has_serialized_tx = true;
+      uint8_t sighash = signing_hash_type(txinput) & 0xff;
+      if (txinput->has_multisig) {
+        uint32_t r = 1;  // skip number of items (filled in later)
+        resp.serialized.serialized_tx.bytes[r] = 0;
+        r++;
+        int nwitnesses = 2;
+        for (uint32_t i = 0; i < txinput->multisig.signatures_count; i++) {
+          if (txinput->multisig.signatures[i].size == 0) {
+            continue;
+          }
+          nwitnesses++;
+          txinput->multisig.signatures[i]
+              .bytes[txinput->multisig.signatures[i].size] = sighash;
+          r += tx_serialize_script(txinput->multisig.signatures[i].size + 1,
+                                   txinput->multisig.signatures[i].bytes,
                                    resp.serialized.serialized_tx.bytes + r);
-      resp.serialized.serialized_tx.bytes[0] = nwitnesses;
-      resp.serialized.serialized_tx.size = r;
-    } else {  // single signature
-      uint32_t r = 0;
-      r += ser_length(2, resp.serialized.serialized_tx.bytes + r);
-      resp.serialized.signature.bytes[resp.serialized.signature.size] = sighash;
-      r += tx_serialize_script(resp.serialized.signature.size + 1,
-                               resp.serialized.signature.bytes,
-                               resp.serialized.serialized_tx.bytes + r);
-      r += tx_serialize_script(33, node.public_key,
-                               resp.serialized.serialized_tx.bytes + r);
-      resp.serialized.serialized_tx.size = r;
+        }
+        uint32_t script_len =
+            compile_script_multisig(coin, &txinput->multisig, 0);
+        r += ser_length(script_len, resp.serialized.serialized_tx.bytes + r);
+        r += compile_script_multisig(coin, &txinput->multisig,
+                                     resp.serialized.serialized_tx.bytes + r);
+        resp.serialized.serialized_tx.bytes[0] = nwitnesses;
+        resp.serialized.serialized_tx.size = r;
+      } else {  // single signature
+        resp.serialized.serialized_tx.size = serialize_p2wpkh_witness(
+            resp.serialized.signature.bytes, resp.serialized.signature.size,
+            node.public_key, 33, sighash, resp.serialized.serialized_tx.bytes);
+      }
     }
   } else {
-    // no signature to be generated
-    resp.has_serialized = true;
-    resp.serialized.has_signature_index = false;
-    resp.serialized.has_signature = false;
-    resp.serialized.has_serialized_tx = true;
-    if (txinput->script_type == InputScriptType_EXTERNAL &&
-        txinput->has_witness) {
-      // fill in the provided witness
-      memcpy(resp.serialized.serialized_tx.bytes, txinput->witness.bytes,
-             txinput->witness.size);
-      resp.serialized.serialized_tx.size = txinput->witness.size;
-    } else {
-      // empty witness
-      resp.serialized.serialized_tx.bytes[0] = 0;
-      resp.serialized.serialized_tx.size = 1;
+    if (serialize) {
+      // no signature to be generated
+      resp.has_serialized = true;
+      resp.serialized.has_signature_index = false;
+      resp.serialized.has_signature = false;
+      resp.serialized.has_serialized_tx = true;
+      if (txinput->script_type == InputScriptType_EXTERNAL &&
+          txinput->has_witness) {
+        // fill in the provided witness
+        memcpy(resp.serialized.serialized_tx.bytes, txinput->witness.bytes,
+               txinput->witness.size);
+        resp.serialized.serialized_tx.size = txinput->witness.size;
+      } else {
+        // empty witness
+        resp.serialized.serialized_tx.bytes[0] = 0;
+        resp.serialized.serialized_tx.size = 1;
+      }
     }
   }
 
   //  if last witness add tx footer
-  if (idx1 == info.inputs_count - 1) {
+  if (serialize && idx1 == info.inputs_count - 1) {
     uint32_t r = resp.serialized.serialized_tx.size;
     r += tx_serialize_footer(&to, resp.serialized.serialized_tx.bytes + r);
     resp.serialized.serialized_tx.size = r;
@@ -2761,11 +3420,14 @@ static bool signing_sign_decred_input(TxInputType *txinput) {
   uint8_t hash[32] = {}, hash_witness[32] = {};
   tx_hash_final(&ti, hash_witness, false);
   signing_hash_decred(txinput, hash_witness, hash);
-  resp.has_serialized = true;
   if (!signing_sign_ecdsa(txinput, node.private_key, node.public_key, hash))
     return false;
-  resp.serialized.serialized_tx.size = tx_serialize_decred_witness(
-      &to, txinput, resp.serialized.serialized_tx.bytes);
+  if (serialize) {
+    resp.has_serialized = true;
+    resp.serialized.has_serialized_tx = true;
+    resp.serialized.serialized_tx.size = tx_serialize_decred_witness(
+        &to, txinput, resp.serialized.serialized_tx.bytes);
+  }
   return true;
 }
 
@@ -2781,16 +3443,13 @@ void signing_txack(TransactionType *tx) {
     return;
   }
 
-  static int update_ctr = 0;
-  if (update_ctr++ == 20) {
-    layoutProgress(_("Signing transaction"), progress);
-    update_ctr = 0;
-  }
+  report_progress(false);
 
   memzero(&resp, sizeof(TxRequest));
 
   switch (signing_stage) {
     case STAGE_REQUEST_1_INPUT:
+      progress_step++;
       if (!signing_validate_input(&tx->inputs[0]) ||
           !signing_add_input(&tx->inputs[0])) {
         return;
@@ -2807,12 +3466,17 @@ void signing_txack(TransactionType *tx) {
         return;
       }
 
-      tx_weight += tx_input_weight(coin, &tx->inputs[0]);
+      uint32_t input_weight = tx_input_weight(coin, &tx->inputs[0]);
 #if !BITCOIN_ONLY
       if (coin->decred) {
-        tx_weight += tx_decred_witness_weight(&tx->inputs[0]);
+        input_weight += tx_decred_witness_weight(&tx->inputs[0]);
       }
 #endif
+      tx_weight += input_weight;
+      if (is_internal_input_script_type(tx->inputs[0].script_type)) {
+        our_weight += input_weight;
+        our_inputs_len += 1;
+      }
 
       if (tx->inputs[0].script_type != InputScriptType_SPENDTAPROOT &&
           tx->inputs[0].script_type != InputScriptType_EXTERNAL) {
@@ -2839,10 +3503,7 @@ void signing_txack(TransactionType *tx) {
             info.next_legacy_input = idx1;
           }
         }
-      } else if (is_segwit_input_script_type(&tx->inputs[0])) {
-        if (!to.is_segwit) {
-          tx_weight += TXSIZE_SEGWIT_OVERHEAD + to.inputs_len;
-        }
+      } else if (is_segwit_input_script_type(tx->inputs[0].script_type)) {
 #if !ENABLE_SEGWIT_NONSEGWIT_MIXING
         // don't mix segwit and non-segwit inputs
         if (idx1 == 0) {
@@ -2858,11 +3519,39 @@ void signing_txack(TransactionType *tx) {
         to.is_segwit = true;
 #endif
       } else if (tx->inputs[0].script_type == InputScriptType_EXTERNAL) {
-        if (config_getSafetyCheckLevel() == SafetyCheckLevel_Strict) {
-          fsm_sendFailure(FailureType_Failure_ProcessError,
-                          _("External inputs not allowed."));
-          signing_abort();
-          return;
+        if (tx->inputs[0].has_ownership_proof) {
+          uint8_t ownership_id[OWNERSHIP_ID_SIZE] = {0};
+          if (!fsm_getOwnershipId(tx->inputs[0].script_pubkey.bytes,
+                                  tx->inputs[0].script_pubkey.size,
+                                  ownership_id)) {
+            signing_abort();
+            return;
+          }
+
+          if (!tx_input_verify_nonownership(coin, tx->inputs, ownership_id)) {
+            fsm_sendFailure(FailureType_Failure_DataError,
+                            _("Invalid external input."));
+            signing_abort();
+            return;
+          }
+
+          if (!add_amount(&external_in, tx->inputs[0].amount)) {
+            return;
+          }
+
+          if (tx->inputs[0].has_orig_hash) {
+            if (!add_amount(&orig_external_in, tx->inputs[0].amount)) {
+              return;
+            }
+          }
+        } else {
+          has_unverified_external_input = true;
+          if (config_getSafetyCheckLevel() == SafetyCheckLevel_Strict) {
+            fsm_sendFailure(FailureType_Failure_ProcessError,
+                            _("Unverifiable external input."));
+            signing_abort();
+            return;
+          }
         }
         set_external_input(idx1);
       } else {
@@ -2930,11 +3619,11 @@ void signing_txack(TransactionType *tx) {
       phase1_request_next_input();
       return;
     case STAGE_REQUEST_2_OUTPUT:
+      progress_step++;
       if (!signing_validate_output(&tx->outputs[0]) ||
           !signing_add_output(&tx->outputs[0])) {
         return;
       }
-      tx_weight += tx_output_weight(coin, &tx->outputs[0]);
 
       if (tx->outputs[0].has_orig_hash) {
         memcpy(&output, &tx->outputs[0], sizeof(output));
@@ -3008,11 +3697,11 @@ void signing_txack(TransactionType *tx) {
 
       memcpy(&input, tx->inputs, sizeof(TxInputType));
 
-      if (!fill_input_script_pubkey(coin, &root, &input)) {
-        fsm_sendFailure(FailureType_Failure_ProcessError,
-                        _("Failed to derive scriptPubKey"));
-        signing_abort();
-        return;
+      if (input.script_type != InputScriptType_EXTERNAL) {
+        // External inputs should have scriptPubKey set by the host.
+        if (!input_derive_node(&input) || !fill_input_script_pubkey(&input)) {
+          return;
+        }
       }
 
       send_req_3_prev_meta();
@@ -3091,7 +3780,7 @@ void signing_txack(TransactionType *tx) {
         tp.is_decred = true;
       }
 #endif
-      progress_meta_step = progress_step / (tp.inputs_len + tp.outputs_len);
+      progress_substeps = tp.inputs_len + tp.outputs_len;
       idx2 = 0;
       if (tp.inputs_len > 0) {
         send_req_3_prev_input();
@@ -3101,11 +3790,10 @@ void signing_txack(TransactionType *tx) {
       }
       return;
     case STAGE_REQUEST_3_PREV_INPUT:
-      if (!signing_validate_input(&tx->inputs[0])) {
+      if (!signing_validate_prev_input(&tx->inputs[0])) {
         return;
       }
-      progress = (idx1 * progress_step + idx2 * progress_meta_step) >>
-                 PROGRESS_PRECISION;
+      progress_substep++;
       if (!tx_serialize_input_hash(&tp, tx->inputs)) {
         fsm_sendFailure(FailureType_Failure_ProcessError,
                         _("Failed to serialize input"));
@@ -3124,9 +3812,7 @@ void signing_txack(TransactionType *tx) {
       if (!signing_validate_bin_output(&tx->bin_outputs[0])) {
         return;
       }
-      progress = (idx1 * progress_step +
-                  (tp.inputs_len + idx2) * progress_meta_step) >>
-                 PROGRESS_PRECISION;
+      progress_substep++;
       if (!tx_serialize_output_hash(&tp, tx->bin_outputs)) {
         fsm_sendFailure(FailureType_Failure_ProcessError,
                         _("Failed to serialize output"));
@@ -3160,7 +3846,7 @@ void signing_txack(TransactionType *tx) {
 #endif
       }
       if (idx2 < tp.outputs_len - 1) {
-        /* Check prevtx of next input */
+        /* Check next output of prevtx */
         idx2++;
         send_req_3_prev_output();
 #if !BITCOIN_ONLY
@@ -3201,6 +3887,7 @@ void signing_txack(TransactionType *tx) {
       if (!signing_validate_input(tx->inputs)) {
         return;
       }
+      progress_step++;
 
       // Add input to the outer transaction check.
       if (!tx_input_check_hash(&hasher_check, tx->inputs)) {
@@ -3223,6 +3910,7 @@ void signing_txack(TransactionType *tx) {
           !signing_hash_orig_input(tx->inputs)) {
         return;
       }
+      progress_step++;
 
       idx2++;
       if (idx2 < orig_info.inputs_count) {
@@ -3247,6 +3935,7 @@ void signing_txack(TransactionType *tx) {
           !signing_hash_orig_output(tx->outputs)) {
         return;
       }
+      progress_step++;
 
       idx2++;
       if (idx2 < orig_info.outputs_count) {
@@ -3273,9 +3962,8 @@ void signing_txack(TransactionType *tx) {
       if (!signing_validate_input(&tx->inputs[0])) {
         return;
       }
-      progress =
-          500 + ((signatures * progress_step + idx2 * progress_meta_step) >>
-                 PROGRESS_PRECISION);
+      progress_step++;
+
       if (idx2 == 0) {
         tx_init(&ti, info.inputs_count, info.outputs_count, info.version,
                 info.lock_time, info.expiry, tx->branch_id, 0,
@@ -3292,7 +3980,7 @@ void signing_txack(TransactionType *tx) {
       }
       if (idx2 == idx1) {
         if (!tx_info_check_input(&info, &tx->inputs[0]) ||
-            !derive_node(&tx->inputs[0]) ||
+            !input_derive_node(&tx->inputs[0]) ||
             !fill_input_script_sig(&tx->inputs[0])) {
           return;
         }
@@ -3330,14 +4018,9 @@ void signing_txack(TransactionType *tx) {
       if (!signing_validate_output(&tx->outputs[0])) {
         return;
       }
-      progress = 500 + ((signatures * progress_step +
-                         (info.inputs_count + idx2) * progress_meta_step) >>
-                        PROGRESS_PRECISION);
-      if (compile_output(coin, amount_unit, &root, tx->outputs, &bin_output,
-                         false) <= 0) {
-        fsm_sendFailure(FailureType_Failure_ProcessError,
-                        _("Failed to compile output"));
-        signing_abort();
+      progress_step++;
+
+      if (!compile_output(tx->outputs, &bin_output, false)) {
         return;
       }
       //  check hashOutputs
@@ -3356,18 +4039,10 @@ void signing_txack(TransactionType *tx) {
             !signing_sign_legacy_input()) {
           return;
         }
-        // since this took a longer time, update progress
         signatures++;
-        progress = 500 + ((signatures * progress_step) >> PROGRESS_PRECISION);
-        layoutProgress(_("Signing transaction"), progress);
-        update_ctr = 0;
-        if (idx1 < info.inputs_count - 1) {
-          idx1++;
-          phase2_request_next_input();
-        } else {
-          idx1 = 0;
-          send_req_5_output();
-        }
+        // since this took a longer time, update progress
+        report_progress(true);
+        phase2_request_next_input(false);
       }
       return;
 
@@ -3375,6 +4050,7 @@ void signing_txack(TransactionType *tx) {
       if (!signing_validate_input(&tx->inputs[0])) {
         return;
       }
+      progress_step++;
 
       if (is_external_input(idx1) !=
           (tx->inputs[0].script_type == InputScriptType_EXTERNAL)) {
@@ -3387,7 +4063,6 @@ void signing_txack(TransactionType *tx) {
       resp.has_serialized = true;
       resp.serialized.has_signature_index = false;
       resp.serialized.has_signature = false;
-      resp.serialized.has_serialized_tx = true;
       if (tx->inputs[0].script_type == InputScriptType_SPENDMULTISIG ||
           tx->inputs[0].script_type == InputScriptType_SPENDADDRESS) {
         if (!(coin->force_bip143 || coin->overwintered) || taproot_only) {
@@ -3397,7 +4072,7 @@ void signing_txack(TransactionType *tx) {
           return;
         }
         if (!tx_info_check_input(&info, &tx->inputs[0]) ||
-            !derive_node(&tx->inputs[0]) ||
+            !input_derive_node(&tx->inputs[0]) ||
             !fill_input_script_sig(&tx->inputs[0])) {
           return;
         }
@@ -3414,10 +4089,7 @@ void signing_txack(TransactionType *tx) {
           if (info.version == 4) {
             signing_hash_zip243(&info, &tx->inputs[0], hash);
           } else if (info.version == 5) {
-            if (!fill_input_script_pubkey(coin, &root, &tx->inputs[0])) {
-              fsm_sendFailure(FailureType_Failure_ProcessError,
-                              _("Failed to derive scriptPubKey"));
-              signing_abort();
+            if (!fill_input_script_pubkey(&tx->inputs[0])) {
               return;
             }
             signing_hash_zip244(&info, &tx->inputs[0], hash);
@@ -3436,16 +4108,14 @@ void signing_txack(TransactionType *tx) {
         if (!signing_sign_ecdsa(&tx->inputs[0], node.private_key,
                                 node.public_key, hash))
           return;
-        // since this took a longer time, update progress
         signatures++;
-        progress = 500 + ((signatures * progress_step) >> PROGRESS_PRECISION);
-        layoutProgress(_("Signing transaction"), progress);
-        update_ctr = 0;
+        // since this took a longer time, update progress
+        report_progress(true);
       } else if (tx->inputs[0].script_type ==
                      InputScriptType_SPENDP2SHWITNESS &&
                  !tx->inputs[0].has_multisig) {
         if (!tx_info_check_input(&info, &tx->inputs[0]) ||
-            !derive_node(&tx->inputs[0]) ||
+            !input_derive_node(&tx->inputs[0]) ||
             !fill_input_script_sig(&tx->inputs[0])) {
           return;
         }
@@ -3481,42 +4151,29 @@ void signing_txack(TransactionType *tx) {
         // direct witness scripts require zero scriptSig
         tx->inputs[0].script_sig.size = 0;
       }
-      resp.serialized.serialized_tx.size = tx_serialize_input(
-          &to, &tx->inputs[0], resp.serialized.serialized_tx.bytes);
-      if (idx1 < info.inputs_count - 1) {
-        idx1++;
-        phase2_request_next_input();
-      } else {
-        idx1 = 0;
-        send_req_5_output();
+      if (serialize) {
+        resp.has_serialized = true;
+        resp.serialized.has_serialized_tx = true;
+        resp.serialized.serialized_tx.size = tx_serialize_input(
+            &to, &tx->inputs[0], resp.serialized.serialized_tx.bytes);
       }
+      phase2_request_next_input(false);
       return;
 
     case STAGE_REQUEST_5_OUTPUT:
       if (!signing_validate_output(&tx->outputs[0])) {
         return;
       }
-      if (compile_output(coin, amount_unit, &root, tx->outputs, &bin_output,
-                         false) <= 0) {
-        fsm_sendFailure(FailureType_Failure_ProcessError,
-                        _("Failed to compile output"));
-        signing_abort();
+      progress_step++;
+
+      if (!compile_output(tx->outputs, &bin_output, false)) {
         return;
       }
       resp.has_serialized = true;
       resp.serialized.has_serialized_tx = true;
       resp.serialized.serialized_tx.size = tx_serialize_output(
           &to, &bin_output, resp.serialized.serialized_tx.bytes);
-      if (idx1 < info.outputs_count - 1) {
-        idx1++;
-        send_req_5_output();
-      } else if (to.is_segwit) {
-        idx1 = 0;
-        send_req_segwit_witness();
-      } else {
-        send_req_finished();
-        signing_abort();
-      }
+      phase2_request_next_output(false);
       return;
 
     case STAGE_REQUEST_SEGWIT_WITNESS:
@@ -3527,16 +4184,9 @@ void signing_txack(TransactionType *tx) {
         return;
       }
       signatures++;
-      progress = 500 + ((signatures * progress_step) >> PROGRESS_PRECISION);
-      layoutProgress(_("Signing transaction"), progress);
-      update_ctr = 0;
-      if (idx1 < info.inputs_count - 1) {
-        idx1++;
-        send_req_segwit_witness();
-      } else {
-        send_req_finished();
-        signing_abort();
-      }
+      progress_step++;
+      report_progress(true);
+      phase2_request_next_witness(false);
       return;
 
 #if !BITCOIN_ONLY
@@ -3545,9 +4195,6 @@ void signing_txack(TransactionType *tx) {
       if (!signing_validate_input(&tx->inputs[0])) {
         return;
       }
-      progress =
-          500 + ((signatures * progress_step + idx2 * progress_meta_step) >>
-                 PROGRESS_PRECISION);
       if (idx1 == 0) {
         // witness
         tx_init(&to, info.inputs_count, info.outputs_count, info.version,
@@ -3565,7 +4212,7 @@ void signing_txack(TransactionType *tx) {
       ti.version |= (DECRED_SERIALIZE_WITNESS_SIGNING << 16);
       ti.is_decred = true;
       if (!tx_info_check_input(&info, &tx->inputs[0]) ||
-          !derive_node(&tx->inputs[0]) ||
+          !input_derive_node(&tx->inputs[0]) ||
           !fill_input_script_sig(&tx->inputs[0])) {
         return;
       }
@@ -3589,11 +4236,10 @@ void signing_txack(TransactionType *tx) {
       if (!signing_sign_decred_input(&tx->inputs[0])) {
         return;
       }
-      // since this took a longer time, update progress
       signatures++;
-      progress = 500 + ((signatures * progress_step) >> PROGRESS_PRECISION);
-      layoutProgress(_("Signing transaction"), progress);
-      update_ctr = 0;
+      progress_step++;
+      // since this took a longer time, update progress
+      report_progress(true);
       if (idx1 < info.inputs_count - 1) {
         idx1++;
         send_req_decred_witness();
@@ -3618,3 +4264,7 @@ void signing_abort(void) {
   memzero(&root, sizeof(root));
   memzero(&node, sizeof(node));
 }
+
+bool signing_is_preauthorized(void) {
+  return signing && (is_coinjoin == sectrue);
+}
diff --git a/legacy/firmware/signing.h b/legacy/firmware/signing.h
index 7b55e181bf..4405bf7ec4 100644
--- a/legacy/firmware/signing.h
+++ b/legacy/firmware/signing.h
@@ -24,12 +24,14 @@
 #include <stdint.h>
 #include "bip32.h"
 #include "coins.h"
+#include "crypto.h"
 #include "hasher.h"
 #include "messages-bitcoin.pb.h"
 
-void signing_init(const SignTx *msg, const CoinInfo *_coin,
-                  const HDNode *_root);
+void signing_init(const SignTx *msg, const CoinInfo *_coin, const HDNode *_root,
+                  const AuthorizeCoinJoin *authorization, PathSchema unlock);
 void signing_abort(void);
 void signing_txack(TransactionType *tx);
+bool signing_is_preauthorized(void);
 
 #endif
diff --git a/legacy/firmware/transaction.c b/legacy/firmware/transaction.c
index aea5f8bb62..584c0f13eb 100644
--- a/legacy/firmware/transaction.c
+++ b/legacy/firmware/transaction.c
@@ -30,9 +30,13 @@
 #include "messages.pb.h"
 #include "protect.h"
 #include "ripemd160.h"
+#include "secp256k1.h"
 #include "segwit_addr.h"
 #include "util.h"
 #include "zkp_bip340.h"
+#ifdef USE_SECP256K1_ZKP_ECDSA
+#include "zkp_ecdsa.h"
+#endif
 
 #if !BITCOIN_ONLY
 #include "cash_addr.h"
@@ -70,11 +74,11 @@
 /* size of a Decred witness (without script): 8 amount, 4 block height, 4 block
  * index */
 #define TXSIZE_DECRED_WITNESS 16
-/* support version of Decred script_version */
-#define DECRED_SCRIPT_VERSION 0
 
 static const uint8_t segwit_header[2] = {0, 1};
 
+static const uint8_t SLIP19_VERSION_MAGIC[] = {0x53, 0x4c, 0x00, 0x19};
+
 static inline uint32_t op_push_size(uint32_t i) {
   if (i < 0x4C) {
     return 1;
@@ -206,8 +210,7 @@ bool compute_address(const CoinInfo *coin, InputScriptType script_type,
     ecdsa_get_address_segwit_p2sh(
         node->public_key, coin->address_type_p2sh, coin->curve->hasher_pubkey,
         coin->curve->hasher_base58, address, MAX_ADDR_SIZE);
-  } else if (script_type == InputScriptType_SPENDADDRESS ||
-             script_type == InputScriptType_SPENDMULTISIG) {
+  } else if (script_type == InputScriptType_SPENDADDRESS) {
 #if !BITCOIN_ONLY
     if (coin->cashaddr_prefix) {
       ecdsa_get_address_raw(node->public_key, CASHADDR_P2KH | CASHADDR_160,
@@ -229,8 +232,8 @@ bool compute_address(const CoinInfo *coin, InputScriptType script_type,
   return 1;
 }
 
-static int address_to_script_pubkey(const CoinInfo *coin, const char *address,
-                                    uint8_t *script_pubkey, pb_size_t *size) {
+int address_to_script_pubkey(const CoinInfo *coin, const char *address,
+                             uint8_t *script_pubkey, pb_size_t *size) {
   uint8_t addr_raw[MAX_ADDR_RAW_SIZE] = {0};
   size_t addr_raw_len = base58_decode_check(address, coin->curve->hasher_base58,
                                             addr_raw, MAX_ADDR_RAW_SIZE);
@@ -317,118 +320,29 @@ static int address_to_script_pubkey(const CoinInfo *coin, const char *address,
   return 0;
 }
 
-int compile_output(const CoinInfo *coin, AmountUnit amount_unit,
-                   const HDNode *root, TxOutputType *in, TxOutputBinType *out,
-                   bool needs_confirm) {
-  memzero(out, sizeof(TxOutputBinType));
-  out->amount = in->amount;
-  out->decred_script_version = DECRED_SCRIPT_VERSION;
-
-  if (in->script_type == OutputScriptType_PAYTOOPRETURN) {
-    // only 0 satoshi allowed for OP_RETURN
-    if (in->amount != 0 || in->has_address || (in->address_n_count > 0) ||
-        in->has_multisig) {
-      return 0;  // failed to compile output
-    }
-    if (needs_confirm) {
-      if (in->op_return_data.size >= 8 &&
-          memcmp(in->op_return_data.bytes, "omni", 4) ==
-              0) {  // OMNI transaction
-        layoutConfirmOmni(in->op_return_data.bytes, in->op_return_data.size);
-      } else {
-        layoutConfirmOpReturn(in->op_return_data.bytes,
-                              in->op_return_data.size);
-      }
-      if (!protectButton(ButtonRequestType_ButtonRequest_ConfirmOutput,
-                         false)) {
-        return -1;  // user aborted
-      }
-    }
-    uint32_t r = 0;
-    out->script_pubkey.bytes[0] = 0x6A;
-    r++;  // OP_RETURN
-    r += op_push(in->op_return_data.size, out->script_pubkey.bytes + r);
-    memcpy(out->script_pubkey.bytes + r, in->op_return_data.bytes,
-           in->op_return_data.size);
-    r += in->op_return_data.size;
-    out->script_pubkey.size = r;
-    return r;
-  }
-
-  if (in->address_n_count > 0) {
-    static CONFIDENTIAL HDNode node;
-    InputScriptType input_script_type = 0;
-
-    switch (in->script_type) {
-      case OutputScriptType_PAYTOADDRESS:
-        input_script_type = InputScriptType_SPENDADDRESS;
-        break;
-      case OutputScriptType_PAYTOMULTISIG:
-        input_script_type = InputScriptType_SPENDMULTISIG;
-        break;
-      case OutputScriptType_PAYTOWITNESS:
-        input_script_type = InputScriptType_SPENDWITNESS;
-        break;
-      case OutputScriptType_PAYTOP2SHWITNESS:
-        input_script_type = InputScriptType_SPENDP2SHWITNESS;
-        break;
-      case OutputScriptType_PAYTOTAPROOT:
-        input_script_type = InputScriptType_SPENDTAPROOT;
-        break;
-      default:
-        return 0;  // failed to compile output
-    }
-    memcpy(&node, root, sizeof(HDNode));
-    if (hdnode_private_ckd_cached(&node, in->address_n, in->address_n_count,
-                                  NULL) == 0) {
-      return 0;  // failed to compile output
-    }
-    if (hdnode_fill_public_key(&node) != 0) {
-      return 0;  // failed to compile output
-    }
-    if (!compute_address(coin, input_script_type, &node, in->has_multisig,
-                         &in->multisig, in->address)) {
-      return 0;  // failed to compile output
-    }
-  } else if (!in->has_address) {
-    return 0;  // failed to compile output
-  }
-
-  if (!address_to_script_pubkey(coin, in->address, out->script_pubkey.bytes,
-                                &out->script_pubkey.size)) {
-    return 0;
-  }
-
-  if (needs_confirm) {
-    layoutConfirmOutput(coin, amount_unit, in);
-    if (!protectButton(ButtonRequestType_ButtonRequest_ConfirmOutput, false)) {
-      return -1;  // user aborted
-    }
-  }
-
-  return out->script_pubkey.size;
+void op_return_to_script_pubkey(const uint8_t *op_return_data,
+                                size_t op_return_size, uint8_t *script_pubkey,
+                                pb_size_t *script_pubkey_size) {
+  uint32_t r = 0;
+  script_pubkey[0] = 0x6A;
+  r++;  // OP_RETURN
+  r += op_push(op_return_size, script_pubkey + r);
+  memcpy(script_pubkey + r, op_return_data, op_return_size);
+  r += op_return_size;
+  *script_pubkey_size = r;
 }
 
-int fill_input_script_pubkey(const CoinInfo *coin, const HDNode *root,
-                             TxInputType *in) {
-  if (in->script_type == InputScriptType_EXTERNAL) {
-    // External inputs should have scriptPubKey set by the host.
-    return in->has_script_pubkey;
-  }
-
-  static CONFIDENTIAL HDNode node;
-  memcpy(&node, root, sizeof(HDNode));
+bool get_script_pubkey(const CoinInfo *coin, HDNode *node, bool has_multisig,
+                       const MultisigRedeemScriptType *multisig,
+                       InputScriptType script_type, uint8_t *script_pubkey,
+                       pb_size_t *script_pubkey_size) {
   char address[MAX_ADDR_SIZE] = {0};
   bool res = true;
-  res = res && hdnode_private_ckd_cached(&node, in->address_n,
-                                         in->address_n_count, NULL);
-  res = res && (hdnode_fill_public_key(&node) == 0);
-  res = res && compute_address(coin, in->script_type, &node, in->has_multisig,
-                               &in->multisig, address);
-  memzero(&node, sizeof(node));
-  res = res && address_to_script_pubkey(coin, address, in->script_pubkey.bytes,
-                                        &in->script_pubkey.size);
-  in->has_script_pubkey = res;
+  res = res && (hdnode_fill_public_key(node) == 0);
+  res = res && compute_address(coin, script_type, node, has_multisig, multisig,
+                               address);
+  res = res && address_to_script_pubkey(coin, address, script_pubkey,
+                                        script_pubkey_size);
   return res;
 }
 
@@ -555,6 +469,82 @@ uint32_t serialize_script_multisig(const CoinInfo *coin,
   return r;
 }
 
+uint32_t serialize_p2wpkh_witness(const uint8_t *signature,
+                                  uint32_t signature_len,
+                                  const uint8_t *public_key,
+                                  uint32_t public_key_len, uint8_t sighash,
+                                  uint8_t *out) {
+  uint32_t r = 0;
+
+  // 2 stack items
+  r += ser_length(2, out + r);
+
+  // length-prefixed signature with sighash type
+  r += ser_length(signature_len + 1, out + r);
+  memcpy(out + r, signature, signature_len);
+  r += signature_len;
+  out[r] = sighash;
+  r += 1;
+
+  // length-prefixed public key
+  r += tx_serialize_script(public_key_len, public_key, out + r);
+  return r;
+}
+
+uint32_t serialize_p2tr_witness(const uint8_t *signature,
+                                uint32_t signature_len, uint8_t sighash,
+                                uint8_t *out) {
+  uint32_t r = 0;
+
+  // 1 stack item
+  r += ser_length(1, out + r);
+
+  // length-prefixed signature with optional sighash type
+  uint32_t sighash_len = sighash ? 1 : 0;
+  r += ser_length(signature_len + sighash_len, out + r);
+  memcpy(out + r, signature, signature_len);
+  r += signature_len;
+  if (sighash) {
+    out[r] = sighash;
+    r += 1;
+  }
+
+  return r;
+}
+
+bool tx_sign_ecdsa(const ecdsa_curve *curve, const uint8_t *private_key,
+                   const uint8_t *hash, uint8_t *out, pb_size_t *size) {
+  int ret = 0;
+  uint8_t signature[64] = {0};
+#ifdef USE_SECP256K1_ZKP_ECDSA
+  if (curve == &secp256k1) {
+    ret =
+        zkp_ecdsa_sign_digest(curve, private_key, hash, signature, NULL, NULL);
+  } else
+#endif
+  {
+    ret = ecdsa_sign_digest(curve, private_key, hash, signature, NULL, NULL);
+  }
+  if (ret != 0) {
+    return false;
+  }
+
+  *size = ecdsa_sig_to_der(signature, out);
+  return true;
+}
+
+bool tx_sign_bip340(const uint8_t *private_key, const uint8_t *hash,
+                    uint8_t *out, pb_size_t *size) {
+  static CONFIDENTIAL uint8_t output_private_key[32] = {0};
+  bool ret = (zkp_bip340_tweak_private_key(private_key, NULL,
+                                           output_private_key) == 0);
+  ret =
+      ret && (zkp_bip340_sign_digest(output_private_key, hash, out, NULL) == 0);
+  *size = ret ? 64 : 0;
+  memzero(output_private_key, sizeof(output_private_key));
+  return ret;
+}
+
 // tx methods
 bool tx_input_check_hash(Hasher *hasher, const TxInputType *input) {
   hasher_Update(hasher, (const uint8_t *)&input->address_n_count,
@@ -1142,3 +1132,222 @@ uint32_t tx_decred_witness_weight(const TxInputType *txinput) {
   return 4 * size;
 }
 #endif
+
+bool get_ownership_proof(const CoinInfo *coin, InputScriptType script_type,
+                         const HDNode *node, uint8_t flags,
+                         const uint8_t ownership_id[OWNERSHIP_ID_SIZE],
+                         const uint8_t *script_pubkey,
+                         size_t script_pubkey_size,
+                         const uint8_t *commitment_data,
+                         size_t commitment_data_size, OwnershipProof *out) {
+  size_t r = 0;
+
+  // Write versionMagic (4 bytes).
+  memcpy(out->ownership_proof.bytes + r, SLIP19_VERSION_MAGIC,
+         sizeof(SLIP19_VERSION_MAGIC));
+  r += sizeof(SLIP19_VERSION_MAGIC);
+
+  // Write flags (1 byte).
+  out->ownership_proof.bytes[r] = flags;
+  r += 1;
+
+  // Write number of ownership IDs (1 byte).
+  r += ser_length(1, out->ownership_proof.bytes + r);
+
+  // Write ownership ID (32 bytes).
+  memcpy(out->ownership_proof.bytes + r, ownership_id, OWNERSHIP_ID_SIZE);
+  r += OWNERSHIP_ID_SIZE;
+
+  // Compute sighash = SHA-256(proofBody || proofFooter).
+  Hasher hasher = {0};
+  uint8_t sighash[SHA256_DIGEST_LENGTH] = {0};
+  hasher_InitParam(&hasher, HASHER_SHA2, NULL, 0);
+  hasher_Update(&hasher, out->ownership_proof.bytes, r);
+  tx_script_hash(&hasher, script_pubkey_size, script_pubkey);
+  tx_script_hash(&hasher, commitment_data_size, commitment_data);
+  hasher_Final(&hasher, sighash);
+
+  // Write proofSignature.
+  if (script_type == InputScriptType_SPENDWITNESS) {
+    if (!tx_sign_ecdsa(coin->curve->params, node->private_key, sighash,
+                       out->signature.bytes, &out->signature.size)) {
+      return false;
+    }
+    // Write length-prefixed empty scriptSig (1 byte).
+    r += ser_length(0, out->ownership_proof.bytes + r);
+
+    // Write
+    // 1. number of stack items (1 byte)
+    // 2. signature + sighash type length (1 byte)
+    // 3. DER-encoded signature (max. 71 bytes)
+    // 4. sighash type (1 byte)
+    // 5. public key length (1 byte)
+    // 6. public key (33 bytes)
+    r += serialize_p2wpkh_witness(out->signature.bytes, out->signature.size,
+                                  node->public_key, 33, SIGHASH_ALL,
+                                  out->ownership_proof.bytes + r);
+  } else if (script_type == InputScriptType_SPENDTAPROOT) {
+    if (!tx_sign_bip340(node->private_key, sighash, out->signature.bytes,
+                        &out->signature.size)) {
+      return false;
+    }
+    // Write length-prefixed empty scriptSig (1 byte).
+    r += ser_length(0, out->ownership_proof.bytes + r);
+
+    // Write
+    // 1. number of stack items (1 byte)
+    // 2. signature length (1 byte)
+    // 3. signature (64 bytes)
+    r += serialize_p2tr_witness(out->signature.bytes, out->signature.size, 0,
+                                out->ownership_proof.bytes + r);
+  } else {
+    return false;
+  }
+
+  out->ownership_proof.size = r;
+  return true;
+}
+
+bool tx_input_verify_nonownership(
+    const CoinInfo *coin, const TxInputType *txinput,
+    const uint8_t ownership_id[OWNERSHIP_ID_SIZE]) {
+  size_t r = 0;
+  // Check versionMagic.
+  if (txinput->ownership_proof.size < r + sizeof(SLIP19_VERSION_MAGIC) ||
+      memcmp(txinput->ownership_proof.bytes + r, SLIP19_VERSION_MAGIC,
+             sizeof(SLIP19_VERSION_MAGIC)) != 0) {
+    return false;
+  }
+  r += sizeof(SLIP19_VERSION_MAGIC);
+
+  // Skip flags.
+  r += 1;
+
+  // Ensure that there is only one ownership ID.
+  if (txinput->ownership_proof.size < r + 1 ||
+      txinput->ownership_proof.bytes[r] != 1) {
+    return false;
+  }
+  r += 1;
+
+  // Ensure that the ownership ID is not ours.
+  if (txinput->ownership_proof.size < r + OWNERSHIP_ID_SIZE ||
+      memcmp(txinput->ownership_proof.bytes + r, ownership_id,
+             OWNERSHIP_ID_SIZE) == 0) {
+    return false;
+  }
+  r += OWNERSHIP_ID_SIZE;
+
+  // Compute the ownership proof digest.
+  Hasher hasher = {0};
+  hasher_InitParam(&hasher, HASHER_SHA2, NULL, 0);
+  hasher_Update(&hasher, txinput->ownership_proof.bytes, r);
+  tx_script_hash(&hasher, txinput->script_pubkey.size,
+                 txinput->script_pubkey.bytes);
+  tx_script_hash(&hasher, txinput->commitment_data.size,
+                 txinput->commitment_data.bytes);
+  uint8_t digest[SHA256_DIGEST_LENGTH] = {0};
+  hasher_Final(&hasher, digest);
+
+  // Ensure that there is no scriptSig, since we only support native SegWit
+  // ownership proofs.
+  if (txinput->ownership_proof.size < r + 1 ||
+      txinput->ownership_proof.bytes[r] != 0) {
+    return false;
+  }
+  r += 1;
+
+  if (txinput->script_pubkey.size == 22 &&
+      memcmp(txinput->script_pubkey.bytes, "\x00\x14", 2) == 0) {
+    // SegWit v0 (probably P2WPKH)
+    const uint8_t *pubkey_hash = txinput->script_pubkey.bytes + 2;
+
+    // Ensure that there are two stack items.
+    if (txinput->ownership_proof.size < r + 1 ||
+        txinput->ownership_proof.bytes[r] != 2) {
+      return false;
+    }
+    r += 1;
+
+    // Read the signature.
+    if (txinput->ownership_proof.size < r + 1) {
+      return false;
+    }
+    size_t signature_size = txinput->ownership_proof.bytes[r];
+    r += 1;
+
+    uint8_t signature[64] = {0};
+    if (txinput->ownership_proof.size < r + signature_size ||
+        ecdsa_sig_from_der(txinput->ownership_proof.bytes + r,
+                           signature_size - 1, signature) != 0) {
+      return false;
+    }
+    r += signature_size;
+
+    // Read the public key.
+    if (txinput->ownership_proof.size < r + 34 ||
+        txinput->ownership_proof.bytes[r] != 33) {
+      return false;
+    }
+    const uint8_t *public_key = txinput->ownership_proof.bytes + r + 1;
+    r += 34;
+
+    // Check the public key matches the scriptPubKey.
+    uint8_t expected_pubkey_hash[20] = {0};
+    ecdsa_get_pubkeyhash(public_key, coin->curve->hasher_pubkey,
+                         expected_pubkey_hash);
+    if (memcmp(pubkey_hash, expected_pubkey_hash,
+               sizeof(expected_pubkey_hash)) != 0) {
+      return false;
+    }
+
+    // Ensure that we have read the entire ownership proof.
+    if (r != txinput->ownership_proof.size) {
+      return false;
+    }
+
+#ifdef USE_SECP256K1_ZKP_ECDSA
+    if (coin->curve->params == &secp256k1) {
+      if (zkp_ecdsa_verify_digest(coin->curve->params, public_key, signature,
+                                  digest) != 0) {
+        return false;
+      }
+    } else
+#endif
+    {
+      if (ecdsa_verify_digest(coin->curve->params, public_key, signature,
+                              digest) != 0) {
+        return false;
+      }
+    }
+  } else if (txinput->script_pubkey.size == 34 &&
+             memcmp(txinput->script_pubkey.bytes, "\x51\x20", 2) == 0) {
+    // SegWit v1 (P2TR)
+    const uint8_t *output_public_key = txinput->script_pubkey.bytes + 2;
+
+    // Ensure that there is one stack item consisting of 64 bytes.
+    if (txinput->ownership_proof.size < r + 2 ||
+        memcmp(txinput->ownership_proof.bytes + r, "\x01\x40", 2) != 0) {
+      return false;
+    }
+    r += 2;
+
+    // Read the signature.
+    const uint8_t *signature = txinput->ownership_proof.bytes + r;
+    r += 64;
+
+    // Ensure that we have read the entire ownership proof.
+    if (r != txinput->ownership_proof.size) {
+      return false;
+    }
+
+    if (zkp_bip340_verify_digest(output_public_key, signature, digest) != 0) {
+      return false;
+    }
+  } else {
+    // Unsupported script type.
+    return false;
+  }
+
+  return true;
+}
diff --git a/legacy/firmware/transaction.h b/legacy/firmware/transaction.h
index 3929a72b3a..85848a6929 100644
--- a/legacy/firmware/transaction.h
+++ b/legacy/firmware/transaction.h
@@ -30,6 +30,22 @@
 
 #define TX_OVERWINTERED 0x80000000
 
+#define OWNERSHIP_ID_SIZE 32
+
+enum {
+  // Signature hash type with the same semantics as SIGHASH_ALL, but instead of
+  // having to include the byte in the signature, it is implied.
+  SIGHASH_ALL_TAPROOT = 0,
+
+  // Default signature hash type in Bitcoin which signs all inputs and all
+  // outputs of the transaction.
+  SIGHASH_ALL = 1,
+
+  // Signature hash flag used in some Bitcoin-like altcoins for replay
+  // protection.
+  SIGHASH_FORKID = 0x40,
+};
+
 typedef struct {
   uint32_t inputs_len;
   uint32_t outputs_len;
@@ -59,6 +75,8 @@ bool compute_address(const CoinInfo *coin, InputScriptType script_type,
                      const HDNode *node, bool has_multisig,
                      const MultisigRedeemScriptType *multisig,
                      char address[MAX_ADDR_SIZE]);
+int address_to_script_pubkey(const CoinInfo *coin, const char *address,
+                             uint8_t *script_pubkey, pb_size_t *size);
 uint32_t compile_script_sig(uint32_t address_type, const uint8_t *pubkeyhash,
                             uint8_t *out);
 uint32_t compile_script_multisig(const CoinInfo *coin,
@@ -73,11 +91,25 @@ uint32_t serialize_script_sig(const uint8_t *signature, uint32_t signature_len,
 uint32_t serialize_script_multisig(const CoinInfo *coin,
                                    const MultisigRedeemScriptType *multisig,
                                    uint8_t sighash, uint8_t *out);
-int compile_output(const CoinInfo *coin, AmountUnit amount_unit,
-                   const HDNode *root, TxOutputType *in, TxOutputBinType *out,
-                   bool needs_confirm);
-int fill_input_script_pubkey(const CoinInfo *coin, const HDNode *root,
-                             TxInputType *in);
+uint32_t serialize_p2wpkh_witness(const uint8_t *signature,
+                                  uint32_t signature_len,
+                                  const uint8_t *public_key,
+                                  uint32_t public_key_len, uint8_t sighash,
+                                  uint8_t *out);
+uint32_t serialize_p2tr_witness(const uint8_t *signature,
+                                uint32_t signature_len, uint8_t sighash,
+                                uint8_t *out);
+bool tx_sign_ecdsa(const ecdsa_curve *curve, const uint8_t *private_key,
+                   const uint8_t *hash, uint8_t *out, pb_size_t *size);
+bool tx_sign_bip340(const uint8_t *private_key, const uint8_t *hash,
+                    uint8_t *out, pb_size_t *size);
+void op_return_to_script_pubkey(const uint8_t *op_return_data,
+                                size_t op_return_size, uint8_t *script_pubkey,
+                                pb_size_t *script_pubkey_size);
+bool get_script_pubkey(const CoinInfo *coin, HDNode *node, bool has_multisig,
+                       const MultisigRedeemScriptType *multisig,
+                       InputScriptType script_type, uint8_t *script_pubkey,
+                       pb_size_t *script_pubkey_size);
 
 bool tx_input_check_hash(Hasher *hasher, const TxInputType *input);
 uint32_t tx_prevout_hash(Hasher *hasher, const TxInputType *input);
@@ -113,5 +145,15 @@ void tx_hash_final(TxStruct *t, uint8_t *hash, bool reverse);
 uint32_t tx_input_weight(const CoinInfo *coin, const TxInputType *txinput);
 uint32_t tx_output_weight(const CoinInfo *coin, const TxOutputType *txoutput);
 uint32_t tx_decred_witness_weight(const TxInputType *txinput);
+bool get_ownership_proof(const CoinInfo *coin, InputScriptType script_type,
+                         const HDNode *node, uint8_t flags,
+                         const uint8_t ownership_id[OWNERSHIP_ID_SIZE],
+                         const uint8_t *script_pubkey,
+                         size_t script_pubkey_size,
+                         const uint8_t *commitment_data,
+                         size_t commitment_data_size, OwnershipProof *out);
+bool tx_input_verify_nonownership(
+    const CoinInfo *coin, const TxInputType *txinput,
+    const uint8_t ownership_id[OWNERSHIP_ID_SIZE]);
 
 #endif
diff --git a/legacy/firmware/trezor.c b/legacy/firmware/trezor.c
index 4a0402f9d1..e326dce4f5 100644
--- a/legacy/firmware/trezor.c
+++ b/legacy/firmware/trezor.c
@@ -59,6 +59,9 @@ void secp256k1_default_error_callback_fn(const char *str, void *data) {
 /* Screen timeout */
 uint32_t system_millis_lock_start = 0;
 
+/* Busyscreen timeout */
+uint32_t system_millis_busy_deadline = 0;
+
 void check_lock_screen(void) {
   buttonUpdate();
 
@@ -69,7 +72,8 @@ void check_lock_screen(void) {
   }
 
   // button held for long enough (5 seconds)
-  if (layoutLast == layoutHome && button.NoDown >= 114000 * 5) {
+  if ((layoutLast == layoutHomescreen || layoutLast == layoutBusyscreen) &&
+      button.NoDown >= 114000 * 5) {
     layoutDialog(&bmp_icon_question, _("Cancel"), _("Lock Device"), NULL,
                  _("Do you really want to"), _("lock your Trezor?"), NULL, NULL,
                  NULL, NULL);
@@ -99,7 +103,7 @@ void check_lock_screen(void) {
   }
 
   // if homescreen is shown for too long
-  if (layoutLast == layoutHome) {
+  if (layoutLast == layoutHomescreen) {
     if ((timer_ms() - system_millis_lock_start) >=
         config_getAutoLockDelayMs()) {
       // lock the screen
@@ -109,6 +113,15 @@ void check_lock_screen(void) {
   }
 }
 
+void check_busy_screen(void) {
+  // Clear the busy screen once it expires.
+  if (system_millis_busy_deadline != 0 &&
+      system_millis_busy_deadline < timer_ms()) {
+    system_millis_busy_deadline = 0;
+    layoutHome();
+  }
+}
+
 static void collect_hw_entropy(bool privileged) {
 #if EMULATOR
   (void)privileged;
@@ -184,6 +197,7 @@ int main(void) {
     usbPoll();
 #endif
     check_lock_screen();
+    check_busy_screen();
   }
 
   return 0;
diff --git a/legacy/firmware/trezor.h b/legacy/firmware/trezor.h
index 7f2e5e1619..bc8fd936ff 100644
--- a/legacy/firmware/trezor.h
+++ b/legacy/firmware/trezor.h
@@ -37,4 +37,7 @@
 /* Screen timeout */
 extern uint32_t system_millis_lock_start;
 
+/* Busyscreen timeout */
+extern uint32_t system_millis_busy_deadline;
+
 #endif
diff --git a/poetry.lock b/poetry.lock
index 60ef9018d4..5a54e58520 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -70,11 +70,11 @@ uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
 name = "certifi"
-version = "2021.10.8"
+version = "2022.12.7"
 description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "cffi"
@@ -580,8 +580,8 @@ python-versions = ">=3.6"
 importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""}
 
 [package.extras]
-testing = ["pytest-benchmark", "pytest"]
-dev = ["tox", "pre-commit"]
+dev = ["pre-commit", "tox"]
+testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "protobuf"
@@ -667,17 +667,6 @@ python-versions = ">=3.6"
 [package.extras]
 diagrams = ["jinja2", "railroad-diagrams"]
 
-[[package]]
-name = "pyro4"
-version = "4.82"
-description = "distributed object middleware for Python (RPC)"
-category = "main"
-optional = false
-python-versions = "*"
-
-[package.dependencies]
-serpent = {version = ">=1.27", markers = "python_version >= \"3.2\""}
-
 [[package]]
 name = "pyserial"
 version = "3.5"
@@ -824,14 +813,6 @@ category = "main"
 optional = false
 python-versions = ">=3.5"
 
-[[package]]
-name = "serpent"
-version = "1.40"
-description = "Serialization based on ast.literal_eval"
-category = "main"
-optional = false
-python-versions = ">=3.2"
-
 [[package]]
 name = "shamir-mnemonic"
 version = "0.2.2"
@@ -846,8 +827,8 @@ click = ">=7,<9"
 colorama = "*"
 
 [package.extras]
+dev = ["black", "flake8", "isort"]
 tests = ["pytest"]
-dev = ["isort", "flake8", "black"]
 
 [[package]]
 name = "simple-rlp"
@@ -940,7 +921,7 @@ testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytes
 
 [[package]]
 name = "trezor"
-version = "0.13.4"
+version = "0.13.6"
 description = "Python library for communicating with Trezor Hardware Wallet"
 category = "main"
 optional = false
@@ -1026,6 +1007,17 @@ six = ">=1.9.0,<2"
 docs = ["proselint (>=0.10.2)", "sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=21.3)"]
 testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "packaging (>=20.0)"]
 
+[[package]]
+name = "vulture"
+version = "2.6"
+description = "Find dead code"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+toml = "*"
+
 [[package]]
 name = "wrapt"
 version = "1.13.3"
@@ -1061,766 +1053,97 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "4a28460ada737fff859a9c4aacd94ed4ee76b551c099954ebea353f5b212dd2e"
+content-hash = "1382496efe47672585d1d8e47f7df06d1edb45f31042e2325d9db34d1a7a7f09"
 
 [metadata.files]
-astroid = [
-    {file = "astroid-2.9.3-py3-none-any.whl", hash = "sha256:506daabe5edffb7e696ad82483ad0228245a9742ed7d2d8c9cdb31537decf9f6"},
-    {file = "astroid-2.9.3.tar.gz", hash = "sha256:1efdf4e867d4d8ba4a9f6cf9ce07cd182c4c41de77f23814feb27ca93ca9d877"},
-]
-atomicwrites = [
-    {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"},
-    {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
-]
-attrs = [
-    {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
-    {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
-]
-autoflake = [
-    {file = "autoflake-1.4.tar.gz", hash = "sha256:61a353012cff6ab94ca062823d1fb2f692c4acda51c76ff83a8d77915fba51ea"},
-]
-black = [
-    {file = "black-22.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2497f9c2386572e28921fa8bec7be3e51de6801f7459dffd6e62492531c47e09"},
-    {file = "black-22.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5795a0375eb87bfe902e80e0c8cfaedf8af4d49694d69161e5bd3206c18618bb"},
-    {file = "black-22.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e3556168e2e5c49629f7b0f377070240bd5511e45e25a4497bb0073d9dda776a"},
-    {file = "black-22.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67c8301ec94e3bcc8906740fe071391bce40a862b7be0b86fb5382beefecd968"},
-    {file = "black-22.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:fd57160949179ec517d32ac2ac898b5f20d68ed1a9c977346efbac9c2f1e779d"},
-    {file = "black-22.3.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cc1e1de68c8e5444e8f94c3670bb48a2beef0e91dddfd4fcc29595ebd90bb9ce"},
-    {file = "black-22.3.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d2fc92002d44746d3e7db7cf9313cf4452f43e9ea77a2c939defce3b10b5c82"},
-    {file = "black-22.3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a6342964b43a99dbc72f72812bf88cad8f0217ae9acb47c0d4f141a6416d2d7b"},
-    {file = "black-22.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:328efc0cc70ccb23429d6be184a15ce613f676bdfc85e5fe8ea2a9354b4e9015"},
-    {file = "black-22.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06f9d8846f2340dfac80ceb20200ea5d1b3f181dd0556b47af4e8e0b24fa0a6b"},
-    {file = "black-22.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ad4efa5fad66b903b4a5f96d91461d90b9507a812b3c5de657d544215bb7877a"},
-    {file = "black-22.3.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8477ec6bbfe0312c128e74644ac8a02ca06bcdb8982d4ee06f209be28cdf163"},
-    {file = "black-22.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:637a4014c63fbf42a692d22b55d8ad6968a946b4a6ebc385c5505d9625b6a464"},
-    {file = "black-22.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:863714200ada56cbc366dc9ae5291ceb936573155f8bf8e9de92aef51f3ad0f0"},
-    {file = "black-22.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10dbe6e6d2988049b4655b2b739f98785a884d4d6b85bc35133a8fb9a2233176"},
-    {file = "black-22.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:cee3e11161dde1b2a33a904b850b0899e0424cc331b7295f2a9698e79f9a69a0"},
-    {file = "black-22.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5891ef8abc06576985de8fa88e95ab70641de6c1fca97e2a15820a9b69e51b20"},
-    {file = "black-22.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:30d78ba6bf080eeaf0b7b875d924b15cd46fec5fd044ddfbad38c8ea9171043a"},
-    {file = "black-22.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ee8f1f7228cce7dffc2b464f07ce769f478968bfb3dd1254a4c2eeed84928aad"},
-    {file = "black-22.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ee227b696ca60dd1c507be80a6bc849a5a6ab57ac7352aad1ffec9e8b805f21"},
-    {file = "black-22.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:9b542ced1ec0ceeff5b37d69838106a6348e60db7b8fdd245294dc1d26136265"},
-    {file = "black-22.3.0-py3-none-any.whl", hash = "sha256:bc58025940a896d7e5356952228b68f793cf5fcb342be703c3a2669a1488cb72"},
-    {file = "black-22.3.0.tar.gz", hash = "sha256:35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79"},
-]
-certifi = [
-    {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
-    {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"},
-]
-cffi = [
-    {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"},
-    {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"},
-    {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"},
-    {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"},
-    {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"},
-    {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"},
-    {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"},
-    {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"},
-    {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"},
-    {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"},
-    {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"},
-    {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"},
-    {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"},
-    {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"},
-    {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"},
-    {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"},
-    {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"},
-    {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"},
-    {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"},
-    {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"},
-    {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"},
-    {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"},
-    {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"},
-    {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"},
-    {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"},
-    {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"},
-    {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"},
-    {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"},
-    {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"},
-    {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"},
-    {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"},
-    {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"},
-    {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"},
-    {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"},
-    {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"},
-    {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"},
-    {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"},
-    {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"},
-    {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"},
-    {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"},
-    {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"},
-    {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"},
-    {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"},
-    {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"},
-    {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"},
-    {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"},
-    {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"},
-    {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"},
-    {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"},
-    {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"},
-]
-charset-normalizer = [
-    {file = "charset-normalizer-2.0.11.tar.gz", hash = "sha256:98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c"},
-    {file = "charset_normalizer-2.0.11-py3-none-any.whl", hash = "sha256:2842d8f5e82a1f6aa437380934d5e1cd4fcf2003b06fed6940769c164a480a45"},
-]
-click = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
-click-default-group = [
-    {file = "click-default-group-1.2.2.tar.gz", hash = "sha256:d9560e8e8dfa44b3562fbc9425042a0fd6d21956fcc2db0077f63f34253ab904"},
-]
-colorama = [
-    {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
-    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
-]
-construct = [
-    {file = "construct-2.10.67.tar.gz", hash = "sha256:730235fedf4f2fee5cfadda1d14b83ef1bf23790fb1cc579073e10f70a050883"},
-]
-construct-classes = [
-    {file = "construct-classes-0.1.2.tar.gz", hash = "sha256:72ac1abbae5bddb4918688713f991f5a7fb6c9b593646a82f4bf3ac53de7eeb5"},
-    {file = "construct_classes-0.1.2-py3-none-any.whl", hash = "sha256:e82437261790758bda41e45fb3d5622b54cfbf044ceb14774af68346faf5e08e"},
-]
-coverage = [
-    {file = "coverage-4.5.4-cp26-cp26m-macosx_10_12_x86_64.whl", hash = "sha256:eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28"},
-    {file = "coverage-4.5.4-cp27-cp27m-macosx_10_12_x86_64.whl", hash = "sha256:ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c"},
-    {file = "coverage-4.5.4-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce"},
-    {file = "coverage-4.5.4-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe"},
-    {file = "coverage-4.5.4-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888"},
-    {file = "coverage-4.5.4-cp27-cp27m-win32.whl", hash = "sha256:63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc"},
-    {file = "coverage-4.5.4-cp27-cp27m-win_amd64.whl", hash = "sha256:e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24"},
-    {file = "coverage-4.5.4-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437"},
-    {file = "coverage-4.5.4-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6"},
-    {file = "coverage-4.5.4-cp33-cp33m-macosx_10_10_x86_64.whl", hash = "sha256:6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5"},
-    {file = "coverage-4.5.4-cp34-cp34m-macosx_10_12_x86_64.whl", hash = "sha256:331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef"},
-    {file = "coverage-4.5.4-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e"},
-    {file = "coverage-4.5.4-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca"},
-    {file = "coverage-4.5.4-cp34-cp34m-win32.whl", hash = "sha256:fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0"},
-    {file = "coverage-4.5.4-cp34-cp34m-win_amd64.whl", hash = "sha256:df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1"},
-    {file = "coverage-4.5.4-cp35-cp35m-macosx_10_12_x86_64.whl", hash = "sha256:efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7"},
-    {file = "coverage-4.5.4-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47"},
-    {file = "coverage-4.5.4-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025"},
-    {file = "coverage-4.5.4-cp35-cp35m-win32.whl", hash = "sha256:bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e"},
-    {file = "coverage-4.5.4-cp35-cp35m-win_amd64.whl", hash = "sha256:19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d"},
-    {file = "coverage-4.5.4-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9"},
-    {file = "coverage-4.5.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755"},
-    {file = "coverage-4.5.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9"},
-    {file = "coverage-4.5.4-cp36-cp36m-win32.whl", hash = "sha256:6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f"},
-    {file = "coverage-4.5.4-cp36-cp36m-win_amd64.whl", hash = "sha256:af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5"},
-    {file = "coverage-4.5.4-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca"},
-    {file = "coverage-4.5.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650"},
-    {file = "coverage-4.5.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2"},
-    {file = "coverage-4.5.4-cp37-cp37m-win32.whl", hash = "sha256:93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5"},
-    {file = "coverage-4.5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351"},
-    {file = "coverage-4.5.4-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5"},
-    {file = "coverage-4.5.4.tar.gz", hash = "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c"},
-]
-cryptography = [
-    {file = "cryptography-36.0.1-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:73bc2d3f2444bcfeac67dd130ff2ea598ea5f20b40e36d19821b4df8c9c5037b"},
-    {file = "cryptography-36.0.1-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:2d87cdcb378d3cfed944dac30596da1968f88fb96d7fc34fdae30a99054b2e31"},
-    {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74d6c7e80609c0f4c2434b97b80c7f8fdfaa072ca4baab7e239a15d6d70ed73a"},
-    {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:6c0c021f35b421ebf5976abf2daacc47e235f8b6082d3396a2fe3ccd537ab173"},
-    {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d59a9d55027a8b88fd9fd2826c4392bd487d74bf628bb9d39beecc62a644c12"},
-    {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0a817b961b46894c5ca8a66b599c745b9a3d9f822725221f0e0fe49dc043a3a3"},
-    {file = "cryptography-36.0.1-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:94ae132f0e40fe48f310bba63f477f14a43116f05ddb69d6fa31e93f05848ae2"},
-    {file = "cryptography-36.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:7be0eec337359c155df191d6ae00a5e8bbb63933883f4f5dffc439dac5348c3f"},
-    {file = "cryptography-36.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:e0344c14c9cb89e76eb6a060e67980c9e35b3f36691e15e1b7a9e58a0a6c6dc3"},
-    {file = "cryptography-36.0.1-cp36-abi3-win32.whl", hash = "sha256:4caa4b893d8fad33cf1964d3e51842cd78ba87401ab1d2e44556826df849a8ca"},
-    {file = "cryptography-36.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:391432971a66cfaf94b21c24ab465a4cc3e8bf4a939c1ca5c3e3a6e0abebdbcf"},
-    {file = "cryptography-36.0.1-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bb5829d027ff82aa872d76158919045a7c1e91fbf241aec32cb07956e9ebd3c9"},
-    {file = "cryptography-36.0.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ebc15b1c22e55c4d5566e3ca4db8689470a0ca2babef8e3a9ee057a8b82ce4b1"},
-    {file = "cryptography-36.0.1-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:596f3cd67e1b950bc372c33f1a28a0692080625592ea6392987dba7f09f17a94"},
-    {file = "cryptography-36.0.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:30ee1eb3ebe1644d1c3f183d115a8c04e4e603ed6ce8e394ed39eea4a98469ac"},
-    {file = "cryptography-36.0.1-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ec63da4e7e4a5f924b90af42eddf20b698a70e58d86a72d943857c4c6045b3ee"},
-    {file = "cryptography-36.0.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca238ceb7ba0bdf6ce88c1b74a87bffcee5afbfa1e41e173b1ceb095b39add46"},
-    {file = "cryptography-36.0.1-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:ca28641954f767f9822c24e927ad894d45d5a1e501767599647259cbf030b903"},
-    {file = "cryptography-36.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:39bdf8e70eee6b1c7b289ec6e5d84d49a6bfa11f8b8646b5b3dfe41219153316"},
-    {file = "cryptography-36.0.1.tar.gz", hash = "sha256:53e5c1dc3d7a953de055d77bef2ff607ceef7a2aac0353b5d630ab67f7423638"},
-]
-curve25519-donna = [
-    {file = "curve25519-donna-1.3.tar.gz", hash = "sha256:1818a9d5356a05c022cd504f44fe1d2f641a5c020f8a4c51b2294e02bd9c1bf0"},
-]
-demjson3 = [
-    {file = "demjson3-3.0.5.tar.gz", hash = "sha256:ab9aabdd85695f3684fc296f39766a2730f6c8de81d23f7048073dfe2f616d80"},
-]
-distlib = [
-    {file = "distlib-0.3.4-py2.py3-none-any.whl", hash = "sha256:6564fe0a8f51e734df6333d08b8b94d4ea8ee6b99b5ed50613f731fd4089f34b"},
-    {file = "distlib-0.3.4.zip", hash = "sha256:e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579"},
-]
-dominate = [
-    {file = "dominate-2.6.0-py2.py3-none-any.whl", hash = "sha256:84b5f71ed30021193cb0faa45d7776e1083f392cfe67a49f44e98cb2ed76c036"},
-    {file = "dominate-2.6.0.tar.gz", hash = "sha256:76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4"},
-]
-ecdsa = [
-    {file = "ecdsa-0.16.1-py2.py3-none-any.whl", hash = "sha256:881fa5e12bb992972d3d1b3d4dfbe149ab76a89f13da02daa5ea1ec7dea6e747"},
-    {file = "ecdsa-0.16.1.tar.gz", hash = "sha256:cfc046a2ddd425adbd1a78b3c46f0d1325c657811c0f45ecc3a0a6236c1e50ff"},
-]
-ed25519 = [
-    {file = "ed25519-1.5.tar.gz", hash = "sha256:02053ee019ceef0df97294be2d4d5a8fc120fc86e81e08bec1245fc0f9403358"},
-]
-execnet = [
-    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
-    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
-]
-fido2 = [
-    {file = "fido2-0.8.1.tar.gz", hash = "sha256:449068f6876f397c8bb96ebc6a75c81c2692f045126d3f13ece21d409acdf7c3"},
-]
-filelock = [
-    {file = "filelock-3.4.2-py3-none-any.whl", hash = "sha256:cf0fc6a2f8d26bd900f19bf33915ca70ba4dd8c56903eeb14e1e7a2fd7590146"},
-    {file = "filelock-3.4.2.tar.gz", hash = "sha256:38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80"},
-]
-flake8 = [
-    {file = "flake8-4.0.1-py2.py3-none-any.whl", hash = "sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d"},
-    {file = "flake8-4.0.1.tar.gz", hash = "sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d"},
-]
-flake8-requirements = [
-    {file = "flake8_requirements-1.5.2-py2.py3-none-any.whl", hash = "sha256:3f511d17044e9185644c09cdb42fcaba7b6f285c978fb9ae2a8e468a50b73f61"},
-]
-flaky = [
-    {file = "flaky-3.7.0-py2.py3-none-any.whl", hash = "sha256:d6eda73cab5ae7364504b7c44670f70abed9e75f77dd116352f662817592ec9c"},
-    {file = "flaky-3.7.0.tar.gz", hash = "sha256:3ad100780721a1911f57a165809b7ea265a7863305acb66708220820caf8aa0d"},
-]
-graphviz = [
-    {file = "graphviz-0.19.1-py3-none-any.whl", hash = "sha256:f34088c08be2ec16279dfa9c3b4ff3d1453c5c67597a33e2819b000e18d4c546"},
-    {file = "graphviz-0.19.1.zip", hash = "sha256:09ed0cde452d015fe77c4845a210eb642f28d245f5bc250d4b97808cb8f49078"},
-]
-hypothesis = [
-    {file = "hypothesis-6.36.1-py3-none-any.whl", hash = "sha256:886342c291e3e592f26889f25b33aac78c6af62c736451f7cdad0a06ffa27325"},
-    {file = "hypothesis-6.36.1.tar.gz", hash = "sha256:46cbee9d7aed822149af75ec63d5f86cd1042df69b2e8eae17b26a56a4dda781"},
-]
-idna = [
-    {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
-    {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
-]
-importlib-metadata = [
-    {file = "importlib_metadata-4.2.0-py3-none-any.whl", hash = "sha256:057e92c15bc8d9e8109738a48db0ccb31b4d9d5cfbee5a8670879a30be66304b"},
-    {file = "importlib_metadata-4.2.0.tar.gz", hash = "sha256:b7e52a1f8dec14a75ea73e0891f3060099ca1d8e6a462a4dff11c3e119ea1b31"},
-]
-incremental = [
-    {file = "incremental-21.3.0-py2.py3-none-any.whl", hash = "sha256:92014aebc6a20b78a8084cdd5645eeaa7f74b8933f70fa3ada2cfbd1e3b54321"},
-    {file = "incremental-21.3.0.tar.gz", hash = "sha256:02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57"},
-]
-iniconfig = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
-    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
-]
-inotify = [
-    {file = "inotify-0.2.10-py2-none-any.whl", hash = "sha256:397f8785450e41f606fe4eb6f5e8e0a1c70b354b56495225fc6c6fe7e07db0c9"},
-    {file = "inotify-0.2.10.tar.gz", hash = "sha256:974a623a338482b62e16d4eb705fb863ed33ec178680fc3e96ccdf0df6c02a07"},
-]
-isort = [
-    {file = "isort-4.3.21-py2.py3-none-any.whl", hash = "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd"},
-    {file = "isort-4.3.21.tar.gz", hash = "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1"},
-]
-jinja2 = [
-    {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"},
-    {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"},
-]
-lazy-object-proxy = [
-    {file = "lazy-object-proxy-1.7.1.tar.gz", hash = "sha256:d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4"},
-    {file = "lazy_object_proxy-1.7.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:bb8c5fd1684d60a9902c60ebe276da1f2281a318ca16c1d0a96db28f62e9166b"},
-    {file = "lazy_object_proxy-1.7.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a57d51ed2997e97f3b8e3500c984db50a554bb5db56c50b5dab1b41339b37e36"},
-    {file = "lazy_object_proxy-1.7.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fd45683c3caddf83abbb1249b653a266e7069a09f486daa8863fb0e7496a9fdb"},
-    {file = "lazy_object_proxy-1.7.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:8561da8b3dd22d696244d6d0d5330618c993a215070f473b699e00cf1f3f6443"},
-    {file = "lazy_object_proxy-1.7.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fccdf7c2c5821a8cbd0a9440a456f5050492f2270bd54e94360cac663398739b"},
-    {file = "lazy_object_proxy-1.7.1-cp310-cp310-win32.whl", hash = "sha256:898322f8d078f2654d275124a8dd19b079080ae977033b713f677afcfc88e2b9"},
-    {file = "lazy_object_proxy-1.7.1-cp310-cp310-win_amd64.whl", hash = "sha256:85b232e791f2229a4f55840ed54706110c80c0a210d076eee093f2b2e33e1bfd"},
-    {file = "lazy_object_proxy-1.7.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:46ff647e76f106bb444b4533bb4153c7370cdf52efc62ccfc1a28bdb3cc95442"},
-    {file = "lazy_object_proxy-1.7.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12f3bb77efe1367b2515f8cb4790a11cffae889148ad33adad07b9b55e0ab22c"},
-    {file = "lazy_object_proxy-1.7.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c19814163728941bb871240d45c4c30d33b8a2e85972c44d4e63dd7107faba44"},
-    {file = "lazy_object_proxy-1.7.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:e40f2013d96d30217a51eeb1db28c9ac41e9d0ee915ef9d00da639c5b63f01a1"},
-    {file = "lazy_object_proxy-1.7.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:2052837718516a94940867e16b1bb10edb069ab475c3ad84fd1e1a6dd2c0fcfc"},
-    {file = "lazy_object_proxy-1.7.1-cp36-cp36m-win32.whl", hash = "sha256:6a24357267aa976abab660b1d47a34aaf07259a0c3859a34e536f1ee6e76b5bb"},
-    {file = "lazy_object_proxy-1.7.1-cp36-cp36m-win_amd64.whl", hash = "sha256:6aff3fe5de0831867092e017cf67e2750c6a1c7d88d84d2481bd84a2e019ec35"},
-    {file = "lazy_object_proxy-1.7.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6a6e94c7b02641d1311228a102607ecd576f70734dc3d5e22610111aeacba8a0"},
-    {file = "lazy_object_proxy-1.7.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ce15276a1a14549d7e81c243b887293904ad2d94ad767f42df91e75fd7b5b6"},
-    {file = "lazy_object_proxy-1.7.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e368b7f7eac182a59ff1f81d5f3802161932a41dc1b1cc45c1f757dc876b5d2c"},
-    {file = "lazy_object_proxy-1.7.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:6ecbb350991d6434e1388bee761ece3260e5228952b1f0c46ffc800eb313ff42"},
-    {file = "lazy_object_proxy-1.7.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:553b0f0d8dbf21890dd66edd771f9b1b5f51bd912fa5f26de4449bfc5af5e029"},
-    {file = "lazy_object_proxy-1.7.1-cp37-cp37m-win32.whl", hash = "sha256:c7a683c37a8a24f6428c28c561c80d5f4fd316ddcf0c7cab999b15ab3f5c5c69"},
-    {file = "lazy_object_proxy-1.7.1-cp37-cp37m-win_amd64.whl", hash = "sha256:df2631f9d67259dc9620d831384ed7732a198eb434eadf69aea95ad18c587a28"},
-    {file = "lazy_object_proxy-1.7.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:07fa44286cda977bd4803b656ffc1c9b7e3bc7dff7d34263446aec8f8c96f88a"},
-    {file = "lazy_object_proxy-1.7.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4dca6244e4121c74cc20542c2ca39e5c4a5027c81d112bfb893cf0790f96f57e"},
-    {file = "lazy_object_proxy-1.7.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:91ba172fc5b03978764d1df5144b4ba4ab13290d7bab7a50f12d8117f8630c38"},
-    {file = "lazy_object_proxy-1.7.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:043651b6cb706eee4f91854da4a089816a6606c1428fd391573ef8cb642ae4f7"},
-    {file = "lazy_object_proxy-1.7.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b9e89b87c707dd769c4ea91f7a31538888aad05c116a59820f28d59b3ebfe25a"},
-    {file = "lazy_object_proxy-1.7.1-cp38-cp38-win32.whl", hash = "sha256:9d166602b525bf54ac994cf833c385bfcc341b364e3ee71e3bf5a1336e677b55"},
-    {file = "lazy_object_proxy-1.7.1-cp38-cp38-win_amd64.whl", hash = "sha256:8f3953eb575b45480db6568306893f0bd9d8dfeeebd46812aa09ca9579595148"},
-    {file = "lazy_object_proxy-1.7.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:dd7ed7429dbb6c494aa9bc4e09d94b778a3579be699f9d67da7e6804c422d3de"},
-    {file = "lazy_object_proxy-1.7.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:70ed0c2b380eb6248abdef3cd425fc52f0abd92d2b07ce26359fcbc399f636ad"},
-    {file = "lazy_object_proxy-1.7.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7096a5e0c1115ec82641afbdd70451a144558ea5cf564a896294e346eb611be1"},
-    {file = "lazy_object_proxy-1.7.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f769457a639403073968d118bc70110e7dce294688009f5c24ab78800ae56dc8"},
-    {file = "lazy_object_proxy-1.7.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:39b0e26725c5023757fc1ab2a89ef9d7ab23b84f9251e28f9cc114d5b59c1b09"},
-    {file = "lazy_object_proxy-1.7.1-cp39-cp39-win32.whl", hash = "sha256:2130db8ed69a48a3440103d4a520b89d8a9405f1b06e2cc81640509e8bf6548f"},
-    {file = "lazy_object_proxy-1.7.1-cp39-cp39-win_amd64.whl", hash = "sha256:677ea950bef409b47e51e733283544ac3d660b709cfce7b187f5ace137960d61"},
-    {file = "lazy_object_proxy-1.7.1-pp37.pp38-none-any.whl", hash = "sha256:d66906d5785da8e0be7360912e99c9188b70f52c422f9fc18223347235691a84"},
-]
-libusb1 = [
-    {file = "libusb1-3.0.0-py3-none-any.whl", hash = "sha256:0e652b04cbe85ec8e74f9ee82b49f861fb14b5320ae51399387ad2601ccc0500"},
-    {file = "libusb1-3.0.0-py3-none-win32.whl", hash = "sha256:083f75e5d15cb5e2159e64c308c5317284eae926a820d6dce53a9505d18be3b2"},
-    {file = "libusb1-3.0.0-py3-none-win_amd64.whl", hash = "sha256:6f6bb010632ada35c661d17a65e135077beef0fbb2434d5ffdb3a4a911fd9490"},
-    {file = "libusb1-3.0.0.tar.gz", hash = "sha256:5792a9defee40f15d330a40d9b1800545c32e47ba7fc66b6f28f133c9fcc8538"},
-]
-mako = [
-    {file = "Mako-1.1.6-py2.py3-none-any.whl", hash = "sha256:afaf8e515d075b22fad7d7b8b30e4a1c90624ff2f3733a06ec125f5a5f043a57"},
-    {file = "Mako-1.1.6.tar.gz", hash = "sha256:4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2"},
-]
-markupsafe = [
-    {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},
-    {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
-]
-mccabe = [
-    {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
-    {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"},
-]
-mnemonic = [
-    {file = "mnemonic-0.20-py3-none-any.whl", hash = "sha256:acd2168872d0379e7a10873bb3e12bf6c91b35de758135c4fbd1015ef18fafc5"},
-    {file = "mnemonic-0.20.tar.gz", hash = "sha256:7c6fb5639d779388027a77944680aee4870f0fcd09b1e42a5525ee2ce4c625f6"},
-]
-munch = [
-    {file = "munch-2.5.0-py2.py3-none-any.whl", hash = "sha256:6f44af89a2ce4ed04ff8de41f70b226b984db10a91dcc7b9ac2efc1c77022fdd"},
-    {file = "munch-2.5.0.tar.gz", hash = "sha256:2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2"},
-]
-mypy-extensions = [
-    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
-    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
-]
-nanopb = [
-    {file = "nanopb-0.4.5.post1-py2.py3-none-any.whl", hash = "sha256:ff8d09a0e5dab73ace1bff538a0ff0dcee2a9abdc0c8aded6068eb215a25102e"},
-    {file = "nanopb-0.4.5.post1.tar.gz", hash = "sha256:81b693d10f73772eeb030a59e3342952080dc3b8239738e95c700a90fa403f02"},
-]
-nose = [
-    {file = "nose-1.3.7-py2-none-any.whl", hash = "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a"},
-    {file = "nose-1.3.7-py3-none-any.whl", hash = "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac"},
-    {file = "nose-1.3.7.tar.gz", hash = "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"},
-]
-packaging = [
-    {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
-    {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
-]
-pathspec = [
-    {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"},
-    {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"},
-]
-pillow = [
-    {file = "Pillow-9.0.1-1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a5d24e1d674dd9d72c66ad3ea9131322819ff86250b30dc5821cbafcfa0b96b4"},
-    {file = "Pillow-9.0.1-1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2632d0f846b7c7600edf53c48f8f9f1e13e62f66a6dbc15191029d950bfed976"},
-    {file = "Pillow-9.0.1-1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b9618823bd237c0d2575283f2939655f54d51b4527ec3972907a927acbcc5bfc"},
-    {file = "Pillow-9.0.1-cp310-cp310-macosx_10_10_universal2.whl", hash = "sha256:9bfdb82cdfeccec50aad441afc332faf8606dfa5e8efd18a6692b5d6e79f00fd"},
-    {file = "Pillow-9.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5100b45a4638e3c00e4d2320d3193bdabb2d75e79793af7c3eb139e4f569f16f"},
-    {file = "Pillow-9.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:528a2a692c65dd5cafc130de286030af251d2ee0483a5bf50c9348aefe834e8a"},
-    {file = "Pillow-9.0.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0f29d831e2151e0b7b39981756d201f7108d3d215896212ffe2e992d06bfe049"},
-    {file = "Pillow-9.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:855c583f268edde09474b081e3ddcd5cf3b20c12f26e0d434e1386cc5d318e7a"},
-    {file = "Pillow-9.0.1-cp310-cp310-win32.whl", hash = "sha256:d9d7942b624b04b895cb95af03a23407f17646815495ce4547f0e60e0b06f58e"},
-    {file = "Pillow-9.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:81c4b81611e3a3cb30e59b0cf05b888c675f97e3adb2c8672c3154047980726b"},
-    {file = "Pillow-9.0.1-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:413ce0bbf9fc6278b2d63309dfeefe452835e1c78398efb431bab0672fe9274e"},
-    {file = "Pillow-9.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:80fe64a6deb6fcfdf7b8386f2cf216d329be6f2781f7d90304351811fb591360"},
-    {file = "Pillow-9.0.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cef9c85ccbe9bee00909758936ea841ef12035296c748aaceee535969e27d31b"},
-    {file = "Pillow-9.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1d19397351f73a88904ad1aee421e800fe4bbcd1aeee6435fb62d0a05ccd1030"},
-    {file = "Pillow-9.0.1-cp37-cp37m-win32.whl", hash = "sha256:d21237d0cd37acded35154e29aec853e945950321dd2ffd1a7d86fe686814669"},
-    {file = "Pillow-9.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:ede5af4a2702444a832a800b8eb7f0a7a1c0eed55b644642e049c98d589e5092"},
-    {file = "Pillow-9.0.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:b5b3f092fe345c03bca1e0b687dfbb39364b21ebb8ba90e3fa707374b7915204"},
-    {file = "Pillow-9.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:335ace1a22325395c4ea88e00ba3dc89ca029bd66bd5a3c382d53e44f0ccd77e"},
-    {file = "Pillow-9.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:db6d9fac65bd08cea7f3540b899977c6dee9edad959fa4eaf305940d9cbd861c"},
-    {file = "Pillow-9.0.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f154d173286a5d1863637a7dcd8c3437bb557520b01bddb0be0258dcb72696b5"},
-    {file = "Pillow-9.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14d4b1341ac07ae07eb2cc682f459bec932a380c3b122f5540432d8977e64eae"},
-    {file = "Pillow-9.0.1-cp38-cp38-win32.whl", hash = "sha256:effb7749713d5317478bb3acb3f81d9d7c7f86726d41c1facca068a04cf5bb4c"},
-    {file = "Pillow-9.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:7f7609a718b177bf171ac93cea9fd2ddc0e03e84d8fa4e887bdfc39671d46b00"},
-    {file = "Pillow-9.0.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:80ca33961ced9c63358056bd08403ff866512038883e74f3a4bf88ad3eb66838"},
-    {file = "Pillow-9.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1c3c33ac69cf059bbb9d1a71eeaba76781b450bc307e2291f8a4764d779a6b28"},
-    {file = "Pillow-9.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12875d118f21cf35604176872447cdb57b07126750a33748bac15e77f90f1f9c"},
-    {file = "Pillow-9.0.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:514ceac913076feefbeaf89771fd6febde78b0c4c1b23aaeab082c41c694e81b"},
-    {file = "Pillow-9.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3c5c79ab7dfce6d88f1ba639b77e77a17ea33a01b07b99840d6ed08031cb2a7"},
-    {file = "Pillow-9.0.1-cp39-cp39-win32.whl", hash = "sha256:718856856ba31f14f13ba885ff13874be7fefc53984d2832458f12c38205f7f7"},
-    {file = "Pillow-9.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:f25ed6e28ddf50de7e7ea99d7a976d6a9c415f03adcaac9c41ff6ff41b6d86ac"},
-    {file = "Pillow-9.0.1-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:011233e0c42a4a7836498e98c1acf5e744c96a67dd5032a6f666cc1fb97eab97"},
-    {file = "Pillow-9.0.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:253e8a302a96df6927310a9d44e6103055e8fb96a6822f8b7f514bb7ef77de56"},
-    {file = "Pillow-9.0.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6295f6763749b89c994fcb6d8a7f7ce03c3992e695f89f00b741b4580b199b7e"},
-    {file = "Pillow-9.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:a9f44cd7e162ac6191491d7249cceb02b8116b0f7e847ee33f739d7cb1ea1f70"},
-    {file = "Pillow-9.0.1.tar.gz", hash = "sha256:6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa"},
-]
-platformdirs = [
-    {file = "platformdirs-2.5.0-py3-none-any.whl", hash = "sha256:30671902352e97b1eafd74ade8e4a694782bd3471685e78c32d0fdfd3aa7e7bb"},
-    {file = "platformdirs-2.5.0.tar.gz", hash = "sha256:8ec11dfba28ecc0715eb5fb0147a87b1bf325f349f3da9aab2cd6b50b96b692b"},
-]
-pluggy = [
-    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
-    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
-]
-protobuf = [
-    {file = "protobuf-3.19.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f51d5a9f137f7a2cec2d326a74b6e3fc79d635d69ffe1b036d39fc7d75430d37"},
-    {file = "protobuf-3.19.4-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:09297b7972da685ce269ec52af761743714996b4381c085205914c41fcab59fb"},
-    {file = "protobuf-3.19.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:072fbc78d705d3edc7ccac58a62c4c8e0cec856987da7df8aca86e647be4e35c"},
-    {file = "protobuf-3.19.4-cp310-cp310-win32.whl", hash = "sha256:7bb03bc2873a2842e5ebb4801f5c7ff1bfbdf426f85d0172f7644fcda0671ae0"},
-    {file = "protobuf-3.19.4-cp310-cp310-win_amd64.whl", hash = "sha256:f358aa33e03b7a84e0d91270a4d4d8f5df6921abe99a377828839e8ed0c04e07"},
-    {file = "protobuf-3.19.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:1c91ef4110fdd2c590effb5dca8fdbdcb3bf563eece99287019c4204f53d81a4"},
-    {file = "protobuf-3.19.4-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c438268eebb8cf039552897d78f402d734a404f1360592fef55297285f7f953f"},
-    {file = "protobuf-3.19.4-cp36-cp36m-win32.whl", hash = "sha256:835a9c949dc193953c319603b2961c5c8f4327957fe23d914ca80d982665e8ee"},
-    {file = "protobuf-3.19.4-cp36-cp36m-win_amd64.whl", hash = "sha256:4276cdec4447bd5015453e41bdc0c0c1234eda08420b7c9a18b8d647add51e4b"},
-    {file = "protobuf-3.19.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6cbc312be5e71869d9d5ea25147cdf652a6781cf4d906497ca7690b7b9b5df13"},
-    {file = "protobuf-3.19.4-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:54a1473077f3b616779ce31f477351a45b4fef8c9fd7892d6d87e287a38df368"},
-    {file = "protobuf-3.19.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:435bb78b37fc386f9275a7035fe4fb1364484e38980d0dd91bc834a02c5ec909"},
-    {file = "protobuf-3.19.4-cp37-cp37m-win32.whl", hash = "sha256:16f519de1313f1b7139ad70772e7db515b1420d208cb16c6d7858ea989fc64a9"},
-    {file = "protobuf-3.19.4-cp37-cp37m-win_amd64.whl", hash = "sha256:cdc076c03381f5c1d9bb1abdcc5503d9ca8b53cf0a9d31a9f6754ec9e6c8af0f"},
-    {file = "protobuf-3.19.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:69da7d39e39942bd52848438462674c463e23963a1fdaa84d88df7fbd7e749b2"},
-    {file = "protobuf-3.19.4-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:48ed3877fa43e22bcacc852ca76d4775741f9709dd9575881a373bd3e85e54b2"},
-    {file = "protobuf-3.19.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd95d1dfb9c4f4563e6093a9aa19d9c186bf98fa54da5252531cc0d3a07977e7"},
-    {file = "protobuf-3.19.4-cp38-cp38-win32.whl", hash = "sha256:b38057450a0c566cbd04890a40edf916db890f2818e8682221611d78dc32ae26"},
-    {file = "protobuf-3.19.4-cp38-cp38-win_amd64.whl", hash = "sha256:7ca7da9c339ca8890d66958f5462beabd611eca6c958691a8fe6eccbd1eb0c6e"},
-    {file = "protobuf-3.19.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:36cecbabbda242915529b8ff364f2263cd4de7c46bbe361418b5ed859677ba58"},
-    {file = "protobuf-3.19.4-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:c1068287025f8ea025103e37d62ffd63fec8e9e636246b89c341aeda8a67c934"},
-    {file = "protobuf-3.19.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:96bd766831596d6014ca88d86dc8fe0fb2e428c0b02432fd9db3943202bf8c5e"},
-    {file = "protobuf-3.19.4-cp39-cp39-win32.whl", hash = "sha256:84123274d982b9e248a143dadd1b9815049f4477dc783bf84efe6250eb4b836a"},
-    {file = "protobuf-3.19.4-cp39-cp39-win_amd64.whl", hash = "sha256:3112b58aac3bac9c8be2b60a9daf6b558ca3f7681c130dcdd788ade7c9ffbdca"},
-    {file = "protobuf-3.19.4-py2.py3-none-any.whl", hash = "sha256:8961c3a78ebfcd000920c9060a262f082f29838682b1f7201889300c1fbe0616"},
-    {file = "protobuf-3.19.4.tar.gz", hash = "sha256:9df0c10adf3e83015ced42a9a7bd64e13d06c4cf45c340d2c63020ea04499d0a"},
-]
-py = [
-    {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
-    {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
-]
-pyasn1 = [
-    {file = "pyasn1-0.4.8-py2.4.egg", hash = "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3"},
-    {file = "pyasn1-0.4.8-py2.5.egg", hash = "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf"},
-    {file = "pyasn1-0.4.8-py2.6.egg", hash = "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00"},
-    {file = "pyasn1-0.4.8-py2.7.egg", hash = "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8"},
-    {file = "pyasn1-0.4.8-py2.py3-none-any.whl", hash = "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d"},
-    {file = "pyasn1-0.4.8-py3.1.egg", hash = "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86"},
-    {file = "pyasn1-0.4.8-py3.2.egg", hash = "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7"},
-    {file = "pyasn1-0.4.8-py3.3.egg", hash = "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576"},
-    {file = "pyasn1-0.4.8-py3.4.egg", hash = "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12"},
-    {file = "pyasn1-0.4.8-py3.5.egg", hash = "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2"},
-    {file = "pyasn1-0.4.8-py3.6.egg", hash = "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359"},
-    {file = "pyasn1-0.4.8-py3.7.egg", hash = "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776"},
-    {file = "pyasn1-0.4.8.tar.gz", hash = "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba"},
-]
-pyblake2 = [
-    {file = "pyblake2-1.1.2-cp27-cp27m-win32.whl", hash = "sha256:3757f7ad709b0e1b2a6b3919fa79fe3261f166fc375cd521f2be480f8319dde9"},
-    {file = "pyblake2-1.1.2-cp27-cp27m-win_amd64.whl", hash = "sha256:8043267fbc0b2f3748c6920591cd0b8b5609dcce60c504c32858aa36206386f2"},
-    {file = "pyblake2-1.1.2-cp34-cp34m-win32.whl", hash = "sha256:4d47b4a2c1d292b1e460bde1dda4d13aa792ed2ed70fcc263b6bc24632c8e902"},
-    {file = "pyblake2-1.1.2-cp34-cp34m-win_amd64.whl", hash = "sha256:982295a87907d50f4723db6bc724660da76b6547826d52160171d54f95b919ac"},
-    {file = "pyblake2-1.1.2-cp35-cp35m-win32.whl", hash = "sha256:baa2190bfe549e36163aa44664d4ee3a9080b236fc5d42f50dc6fd36bbdc749e"},
-    {file = "pyblake2-1.1.2-cp35-cp35m-win_amd64.whl", hash = "sha256:407e02c7f8f36fcec1b7aa114ddca0c1060c598142ea6f6759d03710b946a7e3"},
-    {file = "pyblake2-1.1.2-cp36-cp36m-win32.whl", hash = "sha256:fbc9fcde75713930bc2a91b149e97be2401f7c9c56d735b46a109210f58d7358"},
-    {file = "pyblake2-1.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:c53417ee0bbe77db852d5fd1036749f03696ebc2265de359fe17418d800196c4"},
-    {file = "pyblake2-1.1.2.tar.gz", hash = "sha256:5ccc7eb02edb82fafb8adbb90746af71460fbc29aa0f822526fc976dff83e93f"},
-]
-pycodestyle = [
-    {file = "pycodestyle-2.8.0-py2.py3-none-any.whl", hash = "sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20"},
-    {file = "pycodestyle-2.8.0.tar.gz", hash = "sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f"},
-]
-pycparser = [
-    {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
-    {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
-]
-pyflakes = [
-    {file = "pyflakes-2.4.0-py2.py3-none-any.whl", hash = "sha256:3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e"},
-    {file = "pyflakes-2.4.0.tar.gz", hash = "sha256:05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c"},
-]
-pylint = [
-    {file = "pylint-2.12.2-py3-none-any.whl", hash = "sha256:daabda3f7ed9d1c60f52d563b1b854632fd90035bcf01443e234d3dc794e3b74"},
-    {file = "pylint-2.12.2.tar.gz", hash = "sha256:9d945a73640e1fec07ee34b42f5669b770c759acd536ec7b16d7e4b87a9c9ff9"},
-]
-pyparsing = [
-    {file = "pyparsing-3.0.7-py3-none-any.whl", hash = "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484"},
-    {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"},
-]
-pyro4 = [
-    {file = "Pyro4-4.82-py2.py3-none-any.whl", hash = "sha256:bbf5d7413e616d3e1978a05d7caca62eec59692d2dab75dd22a4426ef9b8a691"},
-    {file = "Pyro4-4.82.tar.gz", hash = "sha256:511f5b0804e92dd77dc33adf9c947787e3f9e9c5a96b12162f0557a7c4ce21fb"},
-]
-pyserial = [
-    {file = "pyserial-3.5-py2.py3-none-any.whl", hash = "sha256:c4451db6ba391ca6ca299fb3ec7bae67a5c55dde170964c7a14ceefec02f2cf0"},
-    {file = "pyserial-3.5.tar.gz", hash = "sha256:3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb"},
-]
-pytest = [
-    {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"},
-    {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"},
-]
-pytest-forked = [
-    {file = "pytest-forked-1.4.0.tar.gz", hash = "sha256:8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e"},
-    {file = "pytest_forked-1.4.0-py3-none-any.whl", hash = "sha256:bbbb6717efc886b9d64537b41fb1497cfaf3c9601276be8da2cccfea5a3c8ad8"},
-]
-pytest-ordering = [
-    {file = "pytest-ordering-0.6.tar.gz", hash = "sha256:561ad653626bb171da78e682f6d39ac33bb13b3e272d406cd555adb6b006bda6"},
-    {file = "pytest_ordering-0.6-py2-none-any.whl", hash = "sha256:27fba3fc265f5d0f8597e7557885662c1bdc1969497cd58aff6ed21c3b617de2"},
-    {file = "pytest_ordering-0.6-py3-none-any.whl", hash = "sha256:3f314a178dbeb6777509548727dc69edf22d6d9a2867bf2d310ab85c403380b6"},
-]
-pytest-random-order = [
-    {file = "pytest-random-order-1.0.4.tar.gz", hash = "sha256:6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52"},
-    {file = "pytest_random_order-1.0.4-py3-none-any.whl", hash = "sha256:72279a7f823969e18b10e438950f58330d17e0fcffb57cbd7929770cd687ecb2"},
-]
-pytest-timeout = [
-    {file = "pytest-timeout-2.1.0.tar.gz", hash = "sha256:c07ca07404c612f8abbe22294b23c368e2e5104b521c1790195561f37e1ac3d9"},
-    {file = "pytest_timeout-2.1.0-py3-none-any.whl", hash = "sha256:f6f50101443ce70ad325ceb4473c4255e9d74e3c7cd0ef827309dfa4c0d975c6"},
-]
-pytest-xdist = [
-    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
-    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
-]
-python-bitcoinlib = [
-    {file = "python-bitcoinlib-0.11.0.tar.gz", hash = "sha256:3daafd63cb755f6e2067b7c9c514053856034c9f9363c80c37007744d54a2e06"},
-    {file = "python_bitcoinlib-0.11.0-py3-none-any.whl", hash = "sha256:6e7982734637135599e2136d3c88d622f147e3b29201636665f799365784cd9e"},
-]
-pyyaml = [
-    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
-    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
-    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
-    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
-    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
-    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
-    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
-    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
-    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
-    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
-    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
-    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
-    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
-    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
-    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
-    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
-    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
-    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
-]
-requests = [
-    {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"},
-    {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"},
-]
-scan-build = [
-    {file = "scan-build-2.0.20.tar.gz", hash = "sha256:f1f9f1dc3daf906ef106077dbac4d872f5740843173dc74070ef3b39da3d0f07"},
-    {file = "scan_build-2.0.20-py3-none-any.whl", hash = "sha256:f61cd6e05269819c8c5fb6d61eabb5cbc3c271ca99b89c096e45f82c454f63ef"},
-]
-scons = [
-    {file = "SCons-4.3.0-py3-none-any.whl", hash = "sha256:8c13911a2aa40552553488f7d625af4c0768fc8cdedab4a858d8ce42c8c3664d"},
-    {file = "SCons-4.3.0.tar.gz", hash = "sha256:d47081587e3675cc168f1f54f0d74a69b328a2fc90ec4feb85f728677419b879"},
-]
-serpent = [
-    {file = "serpent-1.40-py3-none-any.whl", hash = "sha256:14d531cedeed593e793bae4e14eb1463445e8b161cb24ddf795800a50973d3d3"},
-    {file = "serpent-1.40.tar.gz", hash = "sha256:10b34e7f8e3207ee6fb70dcdc9bce473851ee3daf0b47c58aec1b48032ac11ce"},
-]
-shamir-mnemonic = [
-    {file = "shamir-mnemonic-0.2.2.tar.gz", hash = "sha256:7fb9b592e5c518192c0b0caa2c2d82e342fddd186693bc64be9647eace1b9182"},
-    {file = "shamir_mnemonic-0.2.2-py3-none-any.whl", hash = "sha256:7d9facea70379cad02bab18d4572c0fcd033c9d7effe5da095b9e0944bf5fbbf"},
-]
-simple-rlp = [
-    {file = "simple-rlp-0.1.2.tar.gz", hash = "sha256:5c4a9c58f1b742f7fa8af0fe4ea6ff9fb02294ae041912f771570dfaf339d2b9"},
-]
-six = [
-    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
-    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
-]
-sortedcontainers = [
-    {file = "sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"},
-    {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"},
-]
-termcolor = [
-    {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"},
-]
-toml = [
-    {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
-    {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
-]
-tomli = [
-    {file = "tomli-1.2.3-py3-none-any.whl", hash = "sha256:e3069e4be3ead9668e21cb9b074cd948f7b3113fd9c8bba083f48247aab8b11c"},
-    {file = "tomli-1.2.3.tar.gz", hash = "sha256:05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f"},
-]
-towncrier = [
-    {file = "towncrier-21.9.0-py2.py3-none-any.whl", hash = "sha256:fc5a88a2a54988e3a8ed2b60d553599da8330f65722cc607c839614ed87e0f92"},
-    {file = "towncrier-21.9.0.tar.gz", hash = "sha256:9cb6f45c16e1a1eec9d0e7651165e7be60cd0ab81d13a5c96ca97a498ae87f48"},
-]
-tox = [
-    {file = "tox-3.24.5-py2.py3-none-any.whl", hash = "sha256:be3362472a33094bce26727f5f771ca0facf6dafa217f65875314e9a6600c95c"},
-    {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
-]
+astroid = []
+atomicwrites = []
+attrs = []
+autoflake = []
+black = []
+certifi = []
+cffi = []
+charset-normalizer = []
+click = []
+click-default-group = []
+colorama = []
+construct = []
+construct-classes = []
+coverage = []
+cryptography = []
+curve25519-donna = []
+demjson3 = []
+distlib = []
+dominate = []
+ecdsa = []
+ed25519 = []
+execnet = []
+fido2 = []
+filelock = []
+flake8 = []
+flake8-requirements = []
+flaky = []
+graphviz = []
+hypothesis = []
+idna = []
+importlib-metadata = []
+incremental = []
+iniconfig = []
+inotify = []
+isort = []
+jinja2 = []
+lazy-object-proxy = []
+libusb1 = []
+mako = []
+markupsafe = []
+mccabe = []
+mnemonic = []
+munch = []
+mypy-extensions = []
+nanopb = []
+nose = []
+packaging = []
+pathspec = []
+pillow = []
+platformdirs = []
+pluggy = []
+protobuf = []
+py = []
+pyasn1 = []
+pyblake2 = []
+pycodestyle = []
+pycparser = []
+pyflakes = []
+pylint = []
+pyparsing = []
+pyserial = []
+pytest = []
+pytest-forked = []
+pytest-ordering = []
+pytest-random-order = []
+pytest-timeout = []
+pytest-xdist = []
+python-bitcoinlib = []
+pyyaml = []
+requests = []
+scan-build = []
+scons = []
+shamir-mnemonic = []
+simple-rlp = []
+six = []
+sortedcontainers = []
+termcolor = []
+toml = []
+tomli = []
+towncrier = []
+tox = []
 trezor = []
-typed-ast = [
-    {file = "typed_ast-1.5.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:183b183b7771a508395d2cbffd6db67d6ad52958a5fdc99f450d954003900266"},
-    {file = "typed_ast-1.5.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:676d051b1da67a852c0447621fdd11c4e104827417bf216092ec3e286f7da596"},
-    {file = "typed_ast-1.5.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bc2542e83ac8399752bc16e0b35e038bdb659ba237f4222616b4e83fb9654985"},
-    {file = "typed_ast-1.5.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74cac86cc586db8dfda0ce65d8bcd2bf17b58668dfcc3652762f3ef0e6677e76"},
-    {file = "typed_ast-1.5.2-cp310-cp310-win_amd64.whl", hash = "sha256:18fe320f354d6f9ad3147859b6e16649a0781425268c4dde596093177660e71a"},
-    {file = "typed_ast-1.5.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:31d8c6b2df19a777bc8826770b872a45a1f30cfefcfd729491baa5237faae837"},
-    {file = "typed_ast-1.5.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:963a0ccc9a4188524e6e6d39b12c9ca24cc2d45a71cfdd04a26d883c922b4b78"},
-    {file = "typed_ast-1.5.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0eb77764ea470f14fcbb89d51bc6bbf5e7623446ac4ed06cbd9ca9495b62e36e"},
-    {file = "typed_ast-1.5.2-cp36-cp36m-win_amd64.whl", hash = "sha256:294a6903a4d087db805a7656989f613371915fc45c8cc0ddc5c5a0a8ad9bea4d"},
-    {file = "typed_ast-1.5.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:26a432dc219c6b6f38be20a958cbe1abffcc5492821d7e27f08606ef99e0dffd"},
-    {file = "typed_ast-1.5.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7407cfcad702f0b6c0e0f3e7ab876cd1d2c13b14ce770e412c0c4b9728a0f88"},
-    {file = "typed_ast-1.5.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f30ddd110634c2d7534b2d4e0e22967e88366b0d356b24de87419cc4410c41b7"},
-    {file = "typed_ast-1.5.2-cp37-cp37m-win_amd64.whl", hash = "sha256:8c08d6625bb258179b6e512f55ad20f9dfef019bbfbe3095247401e053a3ea30"},
-    {file = "typed_ast-1.5.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:90904d889ab8e81a956f2c0935a523cc4e077c7847a836abee832f868d5c26a4"},
-    {file = "typed_ast-1.5.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:bbebc31bf11762b63bf61aaae232becb41c5bf6b3461b80a4df7e791fabb3aca"},
-    {file = "typed_ast-1.5.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c29dd9a3a9d259c9fa19d19738d021632d673f6ed9b35a739f48e5f807f264fb"},
-    {file = "typed_ast-1.5.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:58ae097a325e9bb7a684572d20eb3e1809802c5c9ec7108e85da1eb6c1a3331b"},
-    {file = "typed_ast-1.5.2-cp38-cp38-win_amd64.whl", hash = "sha256:da0a98d458010bf4fe535f2d1e367a2e2060e105978873c04c04212fb20543f7"},
-    {file = "typed_ast-1.5.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:33b4a19ddc9fc551ebabca9765d54d04600c4a50eda13893dadf67ed81d9a098"},
-    {file = "typed_ast-1.5.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1098df9a0592dd4c8c0ccfc2e98931278a6c6c53cb3a3e2cf7e9ee3b06153344"},
-    {file = "typed_ast-1.5.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42c47c3b43fe3a39ddf8de1d40dbbfca60ac8530a36c9b198ea5b9efac75c09e"},
-    {file = "typed_ast-1.5.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f290617f74a610849bd8f5514e34ae3d09eafd521dceaa6cf68b3f4414266d4e"},
-    {file = "typed_ast-1.5.2-cp39-cp39-win_amd64.whl", hash = "sha256:df05aa5b241e2e8045f5f4367a9f6187b09c4cdf8578bb219861c4e27c443db5"},
-    {file = "typed_ast-1.5.2.tar.gz", hash = "sha256:525a2d4088e70a9f75b08b3f87a51acc9cde640e19cc523c7e41aa355564ae27"},
-]
-typing-extensions = [
-    {file = "typing_extensions-4.0.1-py3-none-any.whl", hash = "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"},
-    {file = "typing_extensions-4.0.1.tar.gz", hash = "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e"},
-]
-uhid-freebsd = [
-    {file = "uhid-freebsd-1.2.2.tar.gz", hash = "sha256:3670374111e9cde795323992809c1299c95c46e96b9bd888c3b340a4e1e733bc"},
-]
-urllib3 = [
-    {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"},
-    {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"},
-]
-virtualenv = [
-    {file = "virtualenv-20.13.1-py2.py3-none-any.whl", hash = "sha256:45e1d053cad4cd453181ae877c4ffc053546ae99e7dd049b9ff1d9be7491abf7"},
-    {file = "virtualenv-20.13.1.tar.gz", hash = "sha256:e0621bcbf4160e4e1030f05065c8834b4e93f4fcc223255db2a823440aca9c14"},
-]
-wrapt = [
-    {file = "wrapt-1.13.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:e05e60ff3b2b0342153be4d1b597bbcfd8330890056b9619f4ad6b8d5c96a81a"},
-    {file = "wrapt-1.13.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:85148f4225287b6a0665eef08a178c15097366d46b210574a658c1ff5b377489"},
-    {file = "wrapt-1.13.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:2dded5496e8f1592ec27079b28b6ad2a1ef0b9296d270f77b8e4a3a796cf6909"},
-    {file = "wrapt-1.13.3-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:e94b7d9deaa4cc7bac9198a58a7240aaf87fe56c6277ee25fa5b3aa1edebd229"},
-    {file = "wrapt-1.13.3-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:498e6217523111d07cd67e87a791f5e9ee769f9241fcf8a379696e25806965af"},
-    {file = "wrapt-1.13.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ec7e20258ecc5174029a0f391e1b948bf2906cd64c198a9b8b281b811cbc04de"},
-    {file = "wrapt-1.13.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:87883690cae293541e08ba2da22cacaae0a092e0ed56bbba8d018cc486fbafbb"},
-    {file = "wrapt-1.13.3-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:f99c0489258086308aad4ae57da9e8ecf9e1f3f30fa35d5e170b4d4896554d80"},
-    {file = "wrapt-1.13.3-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:6a03d9917aee887690aa3f1747ce634e610f6db6f6b332b35c2dd89412912bca"},
-    {file = "wrapt-1.13.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:936503cb0a6ed28dbfa87e8fcd0a56458822144e9d11a49ccee6d9a8adb2ac44"},
-    {file = "wrapt-1.13.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f9c51d9af9abb899bd34ace878fbec8bf357b3194a10c4e8e0a25512826ef056"},
-    {file = "wrapt-1.13.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:220a869982ea9023e163ba915077816ca439489de6d2c09089b219f4e11b6785"},
-    {file = "wrapt-1.13.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:0877fe981fd76b183711d767500e6b3111378ed2043c145e21816ee589d91096"},
-    {file = "wrapt-1.13.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:43e69ffe47e3609a6aec0fe723001c60c65305784d964f5007d5b4fb1bc6bf33"},
-    {file = "wrapt-1.13.3-cp310-cp310-win32.whl", hash = "sha256:78dea98c81915bbf510eb6a3c9c24915e4660302937b9ae05a0947164248020f"},
-    {file = "wrapt-1.13.3-cp310-cp310-win_amd64.whl", hash = "sha256:ea3e746e29d4000cd98d572f3ee2a6050a4f784bb536f4ac1f035987fc1ed83e"},
-    {file = "wrapt-1.13.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:8c73c1a2ec7c98d7eaded149f6d225a692caa1bd7b2401a14125446e9e90410d"},
-    {file = "wrapt-1.13.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:086218a72ec7d986a3eddb7707c8c4526d677c7b35e355875a0fe2918b059179"},
-    {file = "wrapt-1.13.3-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:e92d0d4fa68ea0c02d39f1e2f9cb5bc4b4a71e8c442207433d8db47ee79d7aa3"},
-    {file = "wrapt-1.13.3-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:d4a5f6146cfa5c7ba0134249665acd322a70d1ea61732723c7d3e8cc0fa80755"},
-    {file = "wrapt-1.13.3-cp35-cp35m-win32.whl", hash = "sha256:8aab36778fa9bba1a8f06a4919556f9f8c7b33102bd71b3ab307bb3fecb21851"},
-    {file = "wrapt-1.13.3-cp35-cp35m-win_amd64.whl", hash = "sha256:944b180f61f5e36c0634d3202ba8509b986b5fbaf57db3e94df11abee244ba13"},
-    {file = "wrapt-1.13.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:2ebdde19cd3c8cdf8df3fc165bc7827334bc4e353465048b36f7deeae8ee0918"},
-    {file = "wrapt-1.13.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:610f5f83dd1e0ad40254c306f4764fcdc846641f120c3cf424ff57a19d5f7ade"},
-    {file = "wrapt-1.13.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5601f44a0f38fed36cc07db004f0eedeaadbdcec90e4e90509480e7e6060a5bc"},
-    {file = "wrapt-1.13.3-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:e6906d6f48437dfd80464f7d7af1740eadc572b9f7a4301e7dd3d65db285cacf"},
-    {file = "wrapt-1.13.3-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:766b32c762e07e26f50d8a3468e3b4228b3736c805018e4b0ec8cc01ecd88125"},
-    {file = "wrapt-1.13.3-cp36-cp36m-win32.whl", hash = "sha256:5f223101f21cfd41deec8ce3889dc59f88a59b409db028c469c9b20cfeefbe36"},
-    {file = "wrapt-1.13.3-cp36-cp36m-win_amd64.whl", hash = "sha256:f122ccd12fdc69628786d0c947bdd9cb2733be8f800d88b5a37c57f1f1d73c10"},
-    {file = "wrapt-1.13.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:46f7f3af321a573fc0c3586612db4decb7eb37172af1bc6173d81f5b66c2e068"},
-    {file = "wrapt-1.13.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:778fd096ee96890c10ce96187c76b3e99b2da44e08c9e24d5652f356873f6709"},
-    {file = "wrapt-1.13.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0cb23d36ed03bf46b894cfec777eec754146d68429c30431c99ef28482b5c1df"},
-    {file = "wrapt-1.13.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:96b81ae75591a795d8c90edc0bfaab44d3d41ffc1aae4d994c5aa21d9b8e19a2"},
-    {file = "wrapt-1.13.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7dd215e4e8514004c8d810a73e342c536547038fb130205ec4bba9f5de35d45b"},
-    {file = "wrapt-1.13.3-cp37-cp37m-win32.whl", hash = "sha256:47f0a183743e7f71f29e4e21574ad3fa95676136f45b91afcf83f6a050914829"},
-    {file = "wrapt-1.13.3-cp37-cp37m-win_amd64.whl", hash = "sha256:fd76c47f20984b43d93de9a82011bb6e5f8325df6c9ed4d8310029a55fa361ea"},
-    {file = "wrapt-1.13.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b73d4b78807bd299b38e4598b8e7bd34ed55d480160d2e7fdaabd9931afa65f9"},
-    {file = "wrapt-1.13.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ec9465dd69d5657b5d2fa6133b3e1e989ae27d29471a672416fd729b429eb554"},
-    {file = "wrapt-1.13.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:dd91006848eb55af2159375134d724032a2d1d13bcc6f81cd8d3ed9f2b8e846c"},
-    {file = "wrapt-1.13.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ae9de71eb60940e58207f8e71fe113c639da42adb02fb2bcbcaccc1ccecd092b"},
-    {file = "wrapt-1.13.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:51799ca950cfee9396a87f4a1240622ac38973b6df5ef7a41e7f0b98797099ce"},
-    {file = "wrapt-1.13.3-cp38-cp38-win32.whl", hash = "sha256:4b9c458732450ec42578b5642ac53e312092acf8c0bfce140ada5ca1ac556f79"},
-    {file = "wrapt-1.13.3-cp38-cp38-win_amd64.whl", hash = "sha256:7dde79d007cd6dfa65afe404766057c2409316135cb892be4b1c768e3f3a11cb"},
-    {file = "wrapt-1.13.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:981da26722bebb9247a0601e2922cedf8bb7a600e89c852d063313102de6f2cb"},
-    {file = "wrapt-1.13.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:705e2af1f7be4707e49ced9153f8d72131090e52be9278b5dbb1498c749a1e32"},
-    {file = "wrapt-1.13.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:25b1b1d5df495d82be1c9d2fad408f7ce5ca8a38085e2da41bb63c914baadff7"},
-    {file = "wrapt-1.13.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:77416e6b17926d953b5c666a3cb718d5945df63ecf922af0ee576206d7033b5e"},
-    {file = "wrapt-1.13.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:865c0b50003616f05858b22174c40ffc27a38e67359fa1495605f96125f76640"},
-    {file = "wrapt-1.13.3-cp39-cp39-win32.whl", hash = "sha256:0a017a667d1f7411816e4bf214646d0ad5b1da2c1ea13dec6c162736ff25a374"},
-    {file = "wrapt-1.13.3-cp39-cp39-win_amd64.whl", hash = "sha256:81bd7c90d28a4b2e1df135bfbd7c23aee3050078ca6441bead44c42483f9ebfb"},
-    {file = "wrapt-1.13.3.tar.gz", hash = "sha256:1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185"},
-]
-yamllint = [
-    {file = "yamllint-1.26.3.tar.gz", hash = "sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e"},
-]
-zipp = [
-    {file = "zipp-3.7.0-py3-none-any.whl", hash = "sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375"},
-    {file = "zipp-3.7.0.tar.gz", hash = "sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"},
-]
+typed-ast = []
+typing-extensions = []
+uhid-freebsd = []
+urllib3 = []
+virtualenv = []
+vulture = []
+wrapt = []
+yamllint = []
+zipp = []
diff --git a/pyproject.toml b/pyproject.toml
index 34eb3788a0..ab8506dd4b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,6 @@ trezor = {path = "./python", develop = true}
 scons = "*"
 protobuf = "*"
 pyblake2 = "*"
-Pyro4 = "*"
 nanopb = "^0.4.3"
 
 ## test tools
@@ -71,6 +70,7 @@ cryptography = "*"
 hypothesis = "*"
 inotify = "*"
 yamllint = "^1.25.0"
+vulture = "^2.6"
 
 [tool.poetry.dev-dependencies]
 scan-build = "*"
diff --git a/python/.changelog.d/2745.changed b/python/.changelog.d/2745.changed
new file mode 100644
index 0000000000..8d30b7eef8
--- /dev/null
+++ b/python/.changelog.d/2745.changed
@@ -0,0 +1 @@
+`trezorctl firmware verify` changed order of checks - fingerprint is validated before signatures.
diff --git a/python/.changelog.d/2786.fixed b/python/.changelog.d/2786.fixed
new file mode 100644
index 0000000000..2a3152d634
--- /dev/null
+++ b/python/.changelog.d/2786.fixed
@@ -0,0 +1 @@
+Fixed behavior of UDP transport search by path when full path is provided and prefix_search is True
diff --git a/python/.changelog.d/2801.fixed b/python/.changelog.d/2801.fixed
new file mode 100644
index 0000000000..59b0b56863
--- /dev/null
+++ b/python/.changelog.d/2801.fixed
@@ -0,0 +1 @@
+Fixed behavior of `trezorctl fw` with unsigned Trezor One firmwares.
diff --git a/python/.changelog.d/2832.fixed b/python/.changelog.d/2832.fixed
new file mode 100644
index 0000000000..ae0edb4177
--- /dev/null
+++ b/python/.changelog.d/2832.fixed
@@ -0,0 +1 @@
+Improve typing information when `TrezorClient` has a more intelligent UI object.
diff --git a/python/src/trezorlib/_internal/firmware_headers.py b/python/src/trezorlib/_internal/firmware_headers.py
index f3440dcc0e..f47d82a5ec 100644
--- a/python/src/trezorlib/_internal/firmware_headers.py
+++ b/python/src/trezorlib/_internal/firmware_headers.py
@@ -54,7 +54,7 @@ def all_zero(data: bytes) -> bool:
     return all(b == 0 for b in data)
 
 
-def _check_signature_any(fw: "SignableImageProto", is_devel: bool) -> Status:
+def _check_signature_any(fw: "SignableImageProto", is_devel: bool = False) -> Status:
     if not fw.signature_present():
         return Status.MISSING
     try:
@@ -308,7 +308,7 @@ class VendorHeader(firmware.VendorHeader, CosiSignedMixin):
         if not terse:
             output.append(f"Fingerprint: {click.style(self.digest().hex(), bold=True)}")
 
-        sig_status = _check_signature_any(self, is_devel=False)
+        sig_status = _check_signature_any(self)
         sym = SYM_OK if sig_status.is_ok() else SYM_FAIL
         output.append(f"{sym} Signature is {sig_status.value}")
 
@@ -383,7 +383,7 @@ class BootloaderImage(firmware.FirmwareImage, CosiSignedMixin):
             self.header,
             self.code_hashes(),
             self.digest(),
-            _check_signature_any(self, False),
+            _check_signature_any(self),
         )
 
     def verify(self, dev_keys: bool = False) -> None:
@@ -470,7 +470,7 @@ class LegacyV2Firmware(firmware.LegacyV2Firmware):
             self.header,
             self.code_hashes(),
             self.digest(),
-            _check_signature_any(self, False),
+            _check_signature_any(self),
         )
 
     def public_keys(
diff --git a/python/src/trezorlib/cli/firmware.py b/python/src/trezorlib/cli/firmware.py
index 189d59504a..7599dff8e7 100644
--- a/python/src/trezorlib/cli/firmware.py
+++ b/python/src/trezorlib/cli/firmware.py
@@ -77,7 +77,9 @@ def print_firmware_version(fw: "firmware.FirmwareType") -> None:
         _print_version(fw.firmware.header.version)
 
 
-def validate_signatures(fw: "firmware.FirmwareType") -> None:
+def validate_signatures(
+    fw: "firmware.FirmwareType", prompt_unsigned: bool = True
+) -> None:
     """Check the signatures on the firmware.
 
     Prints the validity status.
@@ -86,14 +88,17 @@ def validate_signatures(fw: "firmware.FirmwareType") -> None:
     """
     try:
         fw.verify()
-        click.echo("Signatures are valid.")
     except firmware.Unsigned:
-        if not isinstance(fw, firmware.LegacyFirmware):
-            raise
+        if not prompt_unsigned or not isinstance(
+            fw, (firmware.LegacyFirmware, firmware.LegacyV2Firmware)
+        ):
+            click.echo("Firmware is not signed, aborting.")
+            sys.exit(4)
 
         # allow legacy firmware without signatures
         if not click.confirm("No signatures found. Continue?", default=False):
             sys.exit(1)
+
         if firmware.is_onev2(fw):
             try:
                 assert fw.embedded_v2 is not None
@@ -337,6 +342,7 @@ def validate_firmware(
     fingerprint: Optional[str] = None,
     bootloader_onev2: Optional[bool] = None,
     trezor_major_version: Optional[int] = None,
+    prompt_unsigned: bool = True,
 ) -> None:
     """Validate the firmware through multiple tests.
 
@@ -351,8 +357,8 @@ def validate_firmware(
         sys.exit(2)
 
     print_firmware_version(fw)
-    validate_signatures(fw)
     validate_fingerprint(fw, fingerprint)
+    validate_signatures(fw, prompt_unsigned=prompt_unsigned)
 
     if bootloader_onev2 is not None and trezor_major_version is not None:
         check_device_match(
@@ -447,6 +453,7 @@ def verify(
         fingerprint=fingerprint,
         bootloader_onev2=bootloader_onev2,
         trezor_major_version=trezor_major_version,
+        prompt_unsigned=False,
     )
 
 
diff --git a/python/src/trezorlib/cli/settings.py b/python/src/trezorlib/cli/settings.py
index fde3ca0bea..eb23398db1 100644
--- a/python/src/trezorlib/cli/settings.py
+++ b/python/src/trezorlib/cli/settings.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the License along with this library.
 # If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
 
+import os
 from typing import TYPE_CHECKING, Optional, cast
 
 import click
@@ -59,7 +60,7 @@ def image_to_t1(filename: str) -> bytes:
     return image.tobytes("raw", "1")
 
 
-def image_to_tt(filename: str) -> bytes:
+def image_to_toif_144x144(filename: str) -> bytes:
     if filename.endswith(".toif"):
         try:
             toif_image = toif.load(filename)
@@ -89,6 +90,40 @@ def image_to_tt(filename: str) -> bytes:
     return toif_image.to_bytes()
 
 
+def image_to_jpeg_240x240(filename: str) -> bytes:
+    if not (filename.endswith(".jpg") or filename.endswith(".jpeg")):
+        raise click.ClickException("Please use a jpg image")
+
+    elif not PIL_AVAILABLE:
+        raise click.ClickException(
+            "Image library is missing. Please install via 'pip install Pillow'."
+        )
+
+    else:
+        try:
+            image = Image.open(filename)
+        except Exception as e:
+            raise click.ClickException("Failed to open image") from e
+
+    if "progressive" in image.info:
+        raise click.ClickException("Progressive JPEG is not supported")
+
+    if image.size != (240, 240):
+        raise click.ClickException("Wrong size of image - should be 240x240")
+
+    image.close()
+
+    file_stats = os.stat(filename)
+
+    if file_stats.st_size > 16384:
+        raise click.ClickException("File is too big, please use maximum 16kB")
+
+    in_file = open(filename, "rb")
+    bytes = in_file.read()
+    in_file.close()
+    return bytes
+
+
 def _should_remove(enable: Optional[bool], remove: bool) -> bool:
     """Helper to decide whether to remove something or not.
 
@@ -208,7 +243,21 @@ def homescreen(client: "TrezorClient", filename: str) -> str:
         if client.features.model == "1":
             img = image_to_t1(filename)
         else:
-            img = image_to_tt(filename)
+            if (
+                client.features.homescreen_format
+                == messages.HomescreenFormat.Jpeg240x240
+            ):
+                img = image_to_jpeg_240x240(filename)
+            elif (
+                client.features.homescreen_format
+                == messages.HomescreenFormat.Toif144x144
+                or client.features.homescreen_format is None
+            ):
+                img = image_to_toif_144x144(filename)
+            else:
+                raise click.ClickException(
+                    "Unknown image format requested by the device."
+                )
 
     return device.apply_settings(client, homescreen=img)
 
@@ -288,3 +337,14 @@ passphrase.aliases = {
     "enabled": passphrase_on,
     "disabled": passphrase_off,
 }
+
+
+@passphrase.command(name="hide")
+@click.argument("hide", type=ChoiceType({"on": True, "off": False}))
+@with_client
+def hide_passphrase_from_host(client: "TrezorClient", hide: bool) -> str:
+    """Enable or disable hiding passphrase coming from host.
+
+    This is a developer feature. Use with caution.
+    """
+    return device.apply_settings(client, hide_passphrase_from_host=hide)
diff --git a/python/src/trezorlib/client.py b/python/src/trezorlib/client.py
index 684093b032..85bcaa3408 100644
--- a/python/src/trezorlib/client.py
+++ b/python/src/trezorlib/client.py
@@ -17,7 +17,7 @@
 import logging
 import os
 import warnings
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any, Generic, Optional, TypeVar
 
 from mnemonic import Mnemonic
 
@@ -31,6 +31,8 @@ if TYPE_CHECKING:
     from .ui import TrezorClientUI
     from .transport import Transport
 
+UI = TypeVar("UI", bound="TrezorClientUI")
+
 LOG = logging.getLogger(__name__)
 
 MAX_PASSPHRASE_LENGTH = 50
@@ -70,7 +72,7 @@ def get_default_client(
     return TrezorClient(transport, ui, **kwargs)
 
 
-class TrezorClient:
+class TrezorClient(Generic[UI]):
     """Trezor client, a connection to a Trezor device.
 
     This class allows you to manage connection state, send and receive protobuf
@@ -81,7 +83,7 @@ class TrezorClient:
     def __init__(
         self,
         transport: "Transport",
-        ui: "TrezorClientUI",
+        ui: UI,
         session_id: Optional[bytes] = None,
         derive_cardano: Optional[bool] = None,
         model: Optional[models.TrezorModel] = None,
diff --git a/python/src/trezorlib/debuglink.py b/python/src/trezorlib/debuglink.py
index a05c38809e..5ad51775ac 100644
--- a/python/src/trezorlib/debuglink.py
+++ b/python/src/trezorlib/debuglink.py
@@ -197,6 +197,15 @@ class DebugLink:
         self.t1_screenshot_directory: Optional[Path] = None
         self.t1_screenshot_counter = 0
 
+        # Optional file for saving text representation of the screen
+        self.screen_text_file: Optional[Path] = None
+        self.last_screen_content = ""
+
+    def set_screen_text_file(self, file_path: Optional[Path]) -> None:
+        if file_path is not None:
+            file_path.write_bytes(b"")
+        self.screen_text_file = file_path
+
     def open(self) -> None:
         self.transport.begin_session()
 
@@ -292,12 +301,43 @@ class DebugLink:
         decision = messages.DebugLinkDecision(
             button=button, swipe=swipe, input=word, x=x, y=y, wait=wait, hold_ms=hold_ms
         )
+
         ret = self._call(decision, nowait=not wait)
         if ret is not None:
             return LayoutContent(ret.lines)
 
+        # Getting the current screen after the (nowait) decision
+        self.save_current_screen_if_relevant(wait=False)
+
         return None
 
+    def save_current_screen_if_relevant(self, wait: bool = True) -> None:
+        """Optionally saving the textual screen output."""
+        if self.screen_text_file is None:
+            return
+
+        if wait:
+            layout = self.wait_layout()
+        else:
+            layout = self.read_layout()
+        self.save_debug_screen(layout.lines)
+
+    def save_debug_screen(self, lines: List[str]) -> None:
+        if self.screen_text_file is None:
+            return
+
+        content = "\n".join(lines)
+
+        # Not writing the same screen twice
+        if content == self.last_screen_content:
+            return
+
+        self.last_screen_content = content
+
+        with open(self.screen_text_file, "a") as f:
+            f.write(content)
+            f.write("\n" + 80 * "/" + "\n")
+
     # Type overloads make sure that when we supply `wait=True` into `click()`,
     # it will always return `LayoutContent` and we do not need to assert `is not None`.
 
@@ -449,6 +489,12 @@ class DebugUI:
         self.debuglink.take_t1_screenshot_if_relevant()
 
         if self.input_flow is None:
+            # Only calling screen-saver when not in input-flow
+            # as it collides with wait-layout of input flows.
+            # All input flows call debuglink.input(), so
+            # recording their screens that way (as well as
+            # possible swipes below).
+            self.debuglink.save_current_screen_if_relevant(wait=True)
             if br.code == messages.ButtonRequestType.PinEntry:
                 self.debuglink.input(self.get_pin())
             else:
@@ -618,6 +664,11 @@ class TrezorClientDebugLink(TrezorClient):
             Callable[[protobuf.MessageType], protobuf.MessageType],
         ] = {}
 
+    def ensure_open(self) -> None:
+        """Only open session if there isn't already an open one."""
+        if self.session_counter == 0:
+            self.open()
+
     def open(self) -> None:
         super().open()
         if self.session_counter == 1:
@@ -715,7 +766,6 @@ class TrezorClientDebugLink(TrezorClient):
     def __exit__(self, exc_type: Any, value: Any, traceback: Any) -> None:
         __tracebackhide__ = True  # for pytest # pylint: disable=W0612
 
-        self.watch_layout(False)
         # copy expected/actual responses before clearing them
         expected_responses = self.expected_responses
         actual_responses = self.actual_responses
diff --git a/python/src/trezorlib/device.py b/python/src/trezorlib/device.py
index cea79deb24..79c75eff82 100644
--- a/python/src/trezorlib/device.py
+++ b/python/src/trezorlib/device.py
@@ -43,6 +43,7 @@ def apply_settings(
     display_rotation: Optional[int] = None,
     safety_checks: Optional[messages.SafetyCheckLevel] = None,
     experimental_features: Optional[bool] = None,
+    hide_passphrase_from_host: Optional[bool] = None,
 ) -> "MessageType":
     settings = messages.ApplySettings(
         label=label,
@@ -54,6 +55,7 @@ def apply_settings(
         display_rotation=display_rotation,
         safety_checks=safety_checks,
         experimental_features=experimental_features,
+        hide_passphrase_from_host=hide_passphrase_from_host,
     )
 
     out = client.call(settings)
diff --git a/python/src/trezorlib/firmware/core.py b/python/src/trezorlib/firmware/core.py
index 934dfb2851..2c6e453aee 100644
--- a/python/src/trezorlib/firmware/core.py
+++ b/python/src/trezorlib/firmware/core.py
@@ -51,10 +51,10 @@ class FirmwareHeader(Struct):
     hw_model: Model
     hw_revision: int
     monotonic: int
-    hashes: t.Sequence[bytes]
+    hashes: t.List[bytes]
 
-    v1_signatures: t.Sequence[bytes]
-    v1_key_indexes: t.Sequence[int]
+    v1_signatures: t.List[bytes]
+    v1_key_indexes: t.List[int]
 
     sigmask: int
     signature: bytes
diff --git a/python/src/trezorlib/firmware/models.py b/python/src/trezorlib/firmware/models.py
index 6c2508c71e..0c2fb901eb 100644
--- a/python/src/trezorlib/firmware/models.py
+++ b/python/src/trezorlib/firmware/models.py
@@ -66,11 +66,11 @@ TREZOR_ONE_V1V2_DEV = ModelKeys(
     firmware_keys=[
         bytes.fromhex(key)
         for key in (
-            "032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991",
-            "02edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145",
-            "03665f660a5052be7a95546a02179058d93d3e08a779734914594346075bb0afd4",
-            "0366635d999417b65566866c65630d977a7ae723fe5f6c4cd17fa00f088ba184c1",
-            "03f36c7d0fb615ada43d7188580f15ebda22d6f6b9b1a92bff16c6937799dcbc66",
+            "042c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991ae31a9c671a36543f46cea8fce6984608aa316aa0472a7eed08847440218cb2f",
+            "04edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f2211452c88a66eb8ac3c19a1cc3a3fc6d72506f6fce2025f738d8b55f29f22125eb0a4",
+            "04665f660a5052be7a95546a02179058d93d3e08a779734914594346075bb0afd45113948d72cf3dc8f2b70ee02dc1695d051bb0c6da2a914a69045e3277682d3b",
+            "0466635d999417b65566866c65630d977a7ae723fe5f6c4cd17fa00f088ba184c103f86b11525fc876237f804b1496bbb98916dcdda18e1e3670522cb5106f410d",
+            "04f36c7d0fb615ada43d7188580f15ebda22d6f6b9b1a92bff16c6937799dcbc667e3bd719d5c84068a94b75e43724467398892eab80a0f8283f9bad6657f146c9",
         )
     ],
     firmware_sigs_needed=3,
diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py
index a060c6c308..2178610400 100644
--- a/python/src/trezorlib/messages.py
+++ b/python/src/trezorlib/messages.py
@@ -437,6 +437,11 @@ class SafetyCheckLevel(IntEnum):
     PromptTemporarily = 2
 
 
+class HomescreenFormat(IntEnum):
+    Toif144x144 = 1
+    Jpeg240x240 = 2
+
+
 class Capability(IntEnum):
     Bitcoin = 1
     Bitcoin_like = 2
@@ -3137,6 +3142,8 @@ class Features(protobuf.MessageType):
         39: protobuf.Field("display_rotation", "uint32", repeated=False, required=False, default=None),
         40: protobuf.Field("experimental_features", "bool", repeated=False, required=False, default=None),
         41: protobuf.Field("busy", "bool", repeated=False, required=False, default=None),
+        42: protobuf.Field("homescreen_format", "HomescreenFormat", repeated=False, required=False, default=None),
+        43: protobuf.Field("hide_passphrase_from_host", "bool", repeated=False, required=False, default=None),
     }
 
     def __init__(
@@ -3181,6 +3188,8 @@ class Features(protobuf.MessageType):
         display_rotation: Optional["int"] = None,
         experimental_features: Optional["bool"] = None,
         busy: Optional["bool"] = None,
+        homescreen_format: Optional["HomescreenFormat"] = None,
+        hide_passphrase_from_host: Optional["bool"] = None,
     ) -> None:
         self.capabilities: Sequence["Capability"] = capabilities if capabilities is not None else []
         self.major_version = major_version
@@ -3221,6 +3230,8 @@ class Features(protobuf.MessageType):
         self.display_rotation = display_rotation
         self.experimental_features = experimental_features
         self.busy = busy
+        self.homescreen_format = homescreen_format
+        self.hide_passphrase_from_host = hide_passphrase_from_host
 
 
 class LockDevice(protobuf.MessageType):
@@ -3258,6 +3269,7 @@ class ApplySettings(protobuf.MessageType):
         8: protobuf.Field("passphrase_always_on_device", "bool", repeated=False, required=False, default=None),
         9: protobuf.Field("safety_checks", "SafetyCheckLevel", repeated=False, required=False, default=None),
         10: protobuf.Field("experimental_features", "bool", repeated=False, required=False, default=None),
+        11: protobuf.Field("hide_passphrase_from_host", "bool", repeated=False, required=False, default=None),
     }
 
     def __init__(
@@ -3273,6 +3285,7 @@ class ApplySettings(protobuf.MessageType):
         passphrase_always_on_device: Optional["bool"] = None,
         safety_checks: Optional["SafetyCheckLevel"] = None,
         experimental_features: Optional["bool"] = None,
+        hide_passphrase_from_host: Optional["bool"] = None,
     ) -> None:
         self.language = language
         self.label = label
@@ -3284,6 +3297,7 @@ class ApplySettings(protobuf.MessageType):
         self.passphrase_always_on_device = passphrase_always_on_device
         self.safety_checks = safety_checks
         self.experimental_features = experimental_features
+        self.hide_passphrase_from_host = hide_passphrase_from_host
 
 
 class ApplyFlags(protobuf.MessageType):
diff --git a/python/src/trezorlib/models.py b/python/src/trezorlib/models.py
index 54502bb0a8..7473c8f911 100644
--- a/python/src/trezorlib/models.py
+++ b/python/src/trezorlib/models.py
@@ -60,7 +60,9 @@ TREZOR_R = TrezorModel(
 TREZORS = {TREZOR_ONE, TREZOR_T, TREZOR_R}
 
 
-def by_name(name: str) -> Optional[TrezorModel]:
+def by_name(name: Optional[str]) -> Optional[TrezorModel]:
+    if name is None:
+        return TREZOR_ONE
     for model in TREZORS:
         if model.name == name:
             return model
diff --git a/python/src/trezorlib/transport/bridge.py b/python/src/trezorlib/transport/bridge.py
index 0066e12d03..e0c34a8f70 100644
--- a/python/src/trezorlib/transport/bridge.py
+++ b/python/src/trezorlib/transport/bridge.py
@@ -109,7 +109,7 @@ class BridgeTransport(Transport):
     """
 
     PATH_PREFIX = "bridge"
-    ENABLED = True
+    ENABLED: bool = True
 
     def __init__(
         self, device: Dict[str, Any], legacy: bool, debug: bool = False
diff --git a/python/src/trezorlib/transport/udp.py b/python/src/trezorlib/transport/udp.py
index 0bd3e43bcb..f305a77c29 100644
--- a/python/src/trezorlib/transport/udp.py
+++ b/python/src/trezorlib/transport/udp.py
@@ -36,7 +36,7 @@ class UdpTransport(ProtocolBasedTransport):
     DEFAULT_HOST = "127.0.0.1"
     DEFAULT_PORT = 21324
     PATH_PREFIX = "udp"
-    ENABLED = True
+    ENABLED: bool = True
 
     def __init__(self, device: Optional[str] = None) -> None:
         if not device:
@@ -84,11 +84,17 @@ class UdpTransport(ProtocolBasedTransport):
 
     @classmethod
     def find_by_path(cls, path: str, prefix_search: bool = False) -> "UdpTransport":
+        try:
+            path = path.replace(f"{cls.PATH_PREFIX}:", "")
+            return cls._try_path(path)
+        except TransportException:
+            if not prefix_search:
+                raise
+
         if prefix_search:
             return super().find_by_path(path, prefix_search)
         else:
-            path = path.replace(f"{cls.PATH_PREFIX}:", "")
-            return cls._try_path(path)
+            raise TransportException(f"No UDP device at {path}")
 
     def wait_until_ready(self, timeout: float = 10) -> None:
         try:
diff --git a/python/tools/pybridge.py b/python/tools/pybridge.py
new file mode 100644
index 0000000000..d5cefb02fa
--- /dev/null
+++ b/python/tools/pybridge.py
@@ -0,0 +1,329 @@
+#!/usr/bin/env python3
+# ### INSTRUCTIONS FOR USE ####
+#
+# 1. install Python 3.7 and up
+# 2. make sure you have `pip3` command available
+# 3. from command line, run the following:
+#        pip3 install trezor[hidapi] gevent bottle
+# 4. (ONLY for TT or T1 >= 1.8.0) Make sure you have libusb available.
+#    4a. on Windows, download:
+#        https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26-binaries.7z
+#        Extract file VS2015-x64/dll/libusb-1.0.dll and place it in your working directory.
+#    4b. on MacOS, assuming you have Homebrew, run `brew install libusb`
+#        Otherwise download the above, extract the file macos_<best version>/lib/libusb.1.0.0.dylib
+#        and place it in your working directory.
+#    4c. on Linux, use your package manager to install `libusb` or `libusb-1.0` package.
+#        (but on Linux you most likely already have it)
+# 4. Shut down Trezor Suite (and bridge if you are running it separately
+# 5. Disconnect and then reconnect your Trezor.
+# 6. Run the following command from the command line:
+#        python3 pybridge.py
+# 7. Start Suite again, or use any other Trezor-compatible software.
+# 8. Output of pybridge goes to console and also to file `pybridge.log`
+from __future__ import annotations  # type: ignore [unknown import symbol]
+
+from gevent import monkey
+
+monkey.patch_all()
+
+import json
+import struct
+import time
+import typing as t
+import logging
+
+import click
+from bottle import run, post, request, response
+
+import trezorlib.transport
+import trezorlib.mapping
+import trezorlib.models
+from trezorlib.client import TrezorClient
+from trezorlib.ui import TrezorClientUI
+from trezorlib.protobuf import format_message
+from trezorlib.transport.bridge import BridgeTransport
+
+# ignore bridge. we are the bridge
+BridgeTransport.ENABLED = False
+
+
+logging.basicConfig(
+    level=logging.DEBUG,
+    format="%(asctime)s %(levelname)s %(message)s",
+    handlers=[
+        logging.FileHandler("pybridge.log"),
+        logging.StreamHandler(),
+    ],
+)
+
+LOG = logging.getLogger()
+
+
+class SilentUI(TrezorClientUI):
+    def get_pin(self, _code: t.Any) -> str:
+        return ""
+
+    def get_passphrase(self) -> str:
+        return ""
+
+    def button_request(self, _br: t.Any) -> None:
+        pass
+
+
+class Session:
+    SESSION_COUNTER = 0
+    SESSIONS: dict[str, Session] = {}
+
+    def __init__(self, transport: Transport) -> None:
+        self.id = self._new_id()
+        self.transport = transport
+        self.SESSIONS[self.id] = self
+
+    def release(self) -> None:
+        self.SESSIONS.pop(self.id, None)
+        self.transport.release()
+
+    @classmethod
+    def find(cls, sid: str) -> Session | None:
+        return cls.SESSIONS.get(sid)
+
+    @classmethod
+    def _new_id(cls) -> str:
+        id = str(cls.SESSION_COUNTER)
+        cls.SESSION_COUNTER += 1
+        return id
+
+
+class Transport:
+    TRANSPORT_COUNTER = 0
+    TRANSPORTS: dict[str, Transport] = {}
+
+    def __init__(self, transport: trezorlib.transport.Transport) -> None:
+        self.path = transport.get_path()
+        self.session: Session | None = None
+        self.transport = transport
+
+        client = TrezorClient(transport, ui=SilentUI())
+        self.model = (
+            trezorlib.models.by_name(client.features.model) or trezorlib.models.TREZOR_T
+        )
+        client.end_session()
+
+    def acquire(self, sid: str) -> str:
+        if self.session_id() != sid:
+            raise Exception("Session mismatch")
+        if self.session is not None:
+            self.session.release()
+
+        self.session = Session(self)
+        self.transport.begin_session()
+        return self.session.id
+
+    def release(self) -> None:
+        self.transport.end_session()
+        self.session = None
+
+    def session_id(self) -> str | None:
+        if self.session is not None:
+            return self.session.id
+        else:
+            return None
+
+    def to_json(self) -> dict:
+        vid, pid = next(iter(self.model.usb_ids), (0, 0))
+        return {
+            "debug": False,
+            "debugSession": None,
+            "path": self.path,
+            "product": pid,
+            "vendor": vid,
+            "session": self.session_id(),
+        }
+
+    def write(self, msg_id: int, data: bytes) -> None:
+        self.transport.write(msg_id, data)
+
+    def read(self) -> tuple[int, bytes]:
+        return self.transport.read()
+
+    @classmethod
+    def find(cls, path: str) -> Transport | None:
+        return cls.TRANSPORTS.get(path)
+
+    @classmethod
+    def enumerate(cls) -> t.Iterable[Transport]:
+        transports = {t.get_path(): t for t in trezorlib.transport.enumerate_devices()}
+        for path in transports:
+            if path not in cls.TRANSPORTS:
+                cls.TRANSPORTS[path] = Transport(transports[path])
+
+        for path in list(cls.TRANSPORTS):
+            if path not in transports:
+                cls.TRANSPORTS.pop(path, None)
+
+        return cls.TRANSPORTS.values()
+
+
+FILTERS: dict[int, t.Callable[[int, bytes], tuple[int, bytes]]] = {}
+
+
+def log_message(prefix: str, msg_id: int, data: bytes) -> None:
+    try:
+        msg = trezorlib.mapping.DEFAULT_MAPPING.decode(msg_id, data)
+        LOG.info("=== %s: [%s] %s", prefix, msg_id, format_message(msg))
+    except Exception:
+        LOG.info("=== %s: [%s] undecoded bytes %s", prefix, msg_id, data.hex())
+
+
+def decode_data(hex_data: str) -> tuple[int, bytes]:
+    data = bytes.fromhex(hex_data)
+    headerlen = struct.calcsize(">HL")
+    msg_type, datalen = struct.unpack(">HL", data[:headerlen])
+    return msg_type, data[headerlen : headerlen + datalen]
+
+
+def encode_data(msg_type: int, msg_data: bytes) -> str:
+    data = struct.pack(">HL", msg_type, len(msg_data)) + msg_data
+    return data.hex()
+
+
+def check_origin() -> None:
+    response.set_header("Access-Control-Allow-Origin", "*")
+
+
+@post("/")  # type: ignore [Untyped function decorator]
+def index():
+    check_origin()
+    return {"version": "2.0.27"}
+
+
+@post("/configure")  # type: ignore [Untyped function decorator]
+def do_configure():
+    return index()
+
+
+@post("/enumerate")  # type: ignore [Untyped function decorator]
+def do_enumerate():
+    check_origin()
+    trezor_json = [transport.to_json() for transport in Transport.enumerate()]
+    return json.dumps(trezor_json)
+
+
+@post("/acquire/<path>/<sid>")  # type: ignore [Untyped function decorator]
+def do_acquire(path: str, sid: str):
+    check_origin()
+    if sid == "null":
+        sid = None  # type: ignore [cannot be assigned to declared type]
+    trezor = Transport.find(path)
+    if trezor is None:
+        response.status = 404
+        return {"error": "invalid path"}
+
+    try:
+        return {"session": trezor.acquire(sid)}
+    except Exception:
+        response.status = 400
+        return {"error": "wrong previous session"}
+
+
+@post("/release/<sid>")  # type: ignore [Untyped function decorator]
+def do_release(sid: str):
+    check_origin()
+    session = Session.find(sid)
+    if session is None:
+        response.status = 404
+        return {"error": "invalid session"}
+    session.release()
+    return {"session": sid}
+
+
+@post("/call/<sid>")  # type: ignore [Untyped function decorator]
+def do_call(sid: str):
+    check_origin()
+    session = Session.find(sid)
+    if session is None:
+        response.status = 404
+        return {"error": "invalid session"}
+
+    msg_type, msg_data = decode_data(request.body.read().decode())
+
+    if msg_type in FILTERS:
+        msg_type, msg_data = FILTERS[msg_type](msg_type, msg_data)
+    log_message("CALLING", msg_type, msg_data)
+
+    session.transport.write(msg_type, msg_data)
+    resp_type, resp_data = session.transport.read()
+
+    if resp_type in FILTERS:
+        resp_type, resp_data = FILTERS[resp_type](resp_type, resp_data)
+    log_message("RESPONSE", resp_type, resp_data)
+
+    return encode_data(resp_type, resp_data)
+
+
+@post("/post/<sid>")  # type: ignore [Untyped function decorator]
+def do_post(sid: str):
+    check_origin()
+    session = Session.find(sid)
+    if session is None:
+        response.status = 404
+        return {"error": "invalid session"}
+
+    msg_type, msg_data = decode_data(request.body.read().decode())
+    session.transport.write(msg_type, msg_data)
+    return {"session": sid}
+
+
+@post("/read/<sid>")  # type: ignore [Untyped function decorator]
+def do_read(sid: str):
+    check_origin()
+    session = Session.find(sid)
+    if session is None:
+        response.status = 404
+        return {"error": "invalid session"}
+
+    resp_type, resp_data = session.transport.read()
+    print("=== RESPONSE:")
+    msg = trezorlib.mapping.DEFAULT_MAPPING.decode(resp_type, resp_data)
+    print(format_message(msg))
+
+    return encode_data(resp_type, resp_data)
+
+
+@post("/listen")  # type: ignore [Untyped function decorator]
+def do_listen():
+    check_origin()
+    try:
+        data = json.load(request.body)
+    except Exception:
+        response.status = 400
+        return {"error": "invalid json"}
+
+    for _ in range(10):
+        trezor_json = [transport.to_json() for transport in Transport.enumerate()]
+        if trezor_json != data:
+            # `yield` turns the function into a generator which allows gevent to
+            # run it in a greenlet, so that the time.sleep() call doesn't block
+            yield json.dumps(trezor_json)
+            return
+        time.sleep(1)
+
+
+# def example_filter(msg_id: int, data: bytes) -> tuple[int, bytes]:
+#     msg = trezorlib.mapping.DEFAULT_MAPPING.decode(msg_id, data)
+#     assert isinstance(msg, messages.Features)
+#     msg.model = "Example"
+#     return trezorlib.mapping.DEFAULT_MAPPING.encode(msg)
+
+
+# FILTERS[messages.Features.MESSAGE_WIRE_TYPE] = example_filter
+
+
+@click.command()
+@click.argument("port", type=int, default=21325)
+def main(port: int) -> None:
+    run(host="127.0.0.1", port=port, server="gevent")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/click_tests/recovery.py b/tests/click_tests/recovery.py
index 5502e34633..55e9aaeee0 100644
--- a/tests/click_tests/recovery.py
+++ b/tests/click_tests/recovery.py
@@ -25,7 +25,7 @@ def confirm_recovery(debug: "DebugLink", legacy_ui: bool = False) -> None:
     if legacy_ui:
         layout.text.startswith("Recovery mode")
     else:
-        assert layout.get_title() == "RECOVERY MODE"
+        assert layout.get_title().startswith("WALLET RECOVERY")
     debug.click(buttons.OK, wait=True)
 
 
@@ -85,4 +85,4 @@ def enter_shares(debug: "DebugLink", shares: list[str]) -> None:
 
 def finalize(debug: "DebugLink") -> None:
     layout = debug.click(buttons.OK, wait=True)
-    assert layout.text == "Homescreen"
+    assert layout.text.startswith("< Homescreen ")
diff --git a/tests/click_tests/test_autolock.py b/tests/click_tests/test_autolock.py
index cdb7e18aa4..49a77c47bf 100644
--- a/tests/click_tests/test_autolock.py
+++ b/tests/click_tests/test_autolock.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the License along with this library.
 # If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
 
+import math
 import time
 from typing import TYPE_CHECKING
 
@@ -57,7 +58,7 @@ def set_autolock_delay(device_handler: "BackgroundDeviceHandler", delay_ms: int)
     debug.click(buttons.OK)
 
     layout = debug.wait_layout()
-    assert layout.text == "Homescreen"
+    assert layout.text.startswith("< Homescreen")
     assert device_handler.result() == "Settings applied"
 
 
@@ -97,7 +98,6 @@ def test_autolock_interrupts_signing(device_handler: "BackgroundDeviceHandler"):
         device_handler.result()
 
 
-@pytest.mark.xfail(reason="depends on #922")
 @pytest.mark.setup_client(pin=PIN4, passphrase=True)
 def test_autolock_passphrase_keyboard(device_handler: "BackgroundDeviceHandler"):
     set_autolock_delay(device_handler, 10_000)
@@ -108,14 +108,42 @@ def test_autolock_passphrase_keyboard(device_handler: "BackgroundDeviceHandler")
 
     # enter passphrase - slowly
     layout = debug.wait_layout()
-    assert layout.text == "PassphraseKeyboard"
+    assert layout.text == "< PassphraseKeyboard >"
 
     CENTER_BUTTON = buttons.grid35(1, 2)
-    for _ in range(11):
+    # keep clicking for long enough to trigger the autolock if it incorrectly ignored key presses
+    for _ in range(math.ceil(11 / 1.5)):
         debug.click(CENTER_BUTTON)
-        time.sleep(1.1)
+        time.sleep(1.5)
 
-    assert device_handler.result() == "TODO when #922 fixed"
+    debug.click(buttons.OK, wait=True)
+    assert device_handler.result() == "mnF4yRWJXmzRB6EuBzuVigqeqTqirQupxJ"
+
+
+@pytest.mark.setup_client(pin=PIN4, passphrase=True)
+def test_autolock_interrupts_passphrase(device_handler: "BackgroundDeviceHandler"):
+    set_autolock_delay(device_handler, 10_000)
+    debug = device_handler.debuglink()
+
+    # get address
+    device_handler.run(common.get_test_address)
+
+    # enter passphrase - slowly
+    layout = debug.wait_layout()
+    assert layout.text == "< PassphraseKeyboard >"
+
+    CENTER_BUTTON = buttons.grid35(1, 2)
+    # autolock must activate even if we pressed some buttons
+    for _ in range(math.ceil(6 / 1.5)):
+        debug.click(CENTER_BUTTON)
+        time.sleep(1.5)
+
+    # wait for autolock to kick in
+    time.sleep(10.1)
+    layout = debug.wait_layout()
+    assert layout.text.startswith("< Lockscreen")
+    with pytest.raises(exceptions.Cancelled):
+        device_handler.result()
 
 
 @pytest.mark.setup_client(pin=PIN4)
@@ -136,7 +164,7 @@ def test_dryrun_locks_at_number_of_words(device_handler: "BackgroundDeviceHandle
     # wait for autolock to trigger
     time.sleep(10.1)
     layout = debug.wait_layout()
-    assert layout.text == "Lockscreen"
+    assert layout.text.startswith("< Lockscreen")
     with pytest.raises(exceptions.Cancelled):
         device_handler.result()
 
@@ -171,7 +199,7 @@ def test_dryrun_locks_at_word_entry(device_handler: "BackgroundDeviceHandler"):
     assert layout.text == "< MnemonicKeyboard >"
     time.sleep(10.1)
     layout = debug.wait_layout()
-    assert layout.text == "Lockscreen"
+    assert layout.text.startswith("< Lockscreen")
     with pytest.raises(exceptions.Cancelled):
         device_handler.result()
 
diff --git a/tests/click_tests/test_reset_slip39_advanced.py b/tests/click_tests/test_reset_slip39_advanced.py
index bcddea09f1..aff056a4f1 100644
--- a/tests/click_tests/test_reset_slip39_advanced.py
+++ b/tests/click_tests/test_reset_slip39_advanced.py
@@ -52,7 +52,7 @@ def test_reset_slip39_advanced_2of2groups_2of2shares(
     )
 
     # confirm new wallet
-    reset.confirm_wait(debug, "Create new wallet")
+    reset.confirm_wait(debug, "Wallet creation")
 
     # confirm back up
     reset.confirm_read(debug, "Success")
@@ -137,7 +137,7 @@ def test_reset_slip39_advanced_16of16groups_16of16shares(
     )
 
     # confirm new wallet
-    reset.confirm_wait(debug, "Create new wallet")
+    reset.confirm_wait(debug, "Wallet creation")
 
     # confirm back up
     reset.confirm_read(debug, "Success")
diff --git a/tests/click_tests/test_reset_slip39_basic.py b/tests/click_tests/test_reset_slip39_basic.py
index 6bfdd82813..afae51f1ed 100644
--- a/tests/click_tests/test_reset_slip39_basic.py
+++ b/tests/click_tests/test_reset_slip39_basic.py
@@ -50,7 +50,7 @@ def test_reset_slip39_basic_1of1(device_handler: "BackgroundDeviceHandler"):
         )
 
         # confirm new wallet
-        reset.confirm_wait(debug, "Create new wallet")
+        reset.confirm_wait(debug, "Wallet creation")
 
         # confirm back up
         reset.confirm_read(debug, "Success")
@@ -123,7 +123,7 @@ def test_reset_slip39_basic_16of16(device_handler: "BackgroundDeviceHandler"):
         )
 
         # confirm new wallet
-        reset.confirm_wait(debug, "Create new wallet")
+        reset.confirm_wait(debug, "Wallet creation")
 
         # confirm back up
         reset.confirm_read(debug, "Success")
diff --git a/tests/conftest.py b/tests/conftest.py
index 2f4648e5ee..abd364b97a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -30,7 +30,6 @@ from trezorlib.transport import enumerate_devices, get_transport
 from . import ui_tests
 from .device_handler import BackgroundDeviceHandler
 from .emulators import EmulatorWrapper
-from .ui_tests.reporting import testreport
 
 if TYPE_CHECKING:
     from trezorlib._internal.emulator import Emulator
@@ -209,13 +208,13 @@ def client(
     if not setup_params["uninitialized"]:
         debuglink.load_device(
             _raw_client,
-            mnemonic=setup_params["mnemonic"],
-            pin=setup_params["pin"],
+            mnemonic=setup_params["mnemonic"],  # type: ignore
+            pin=setup_params["pin"],  # type: ignore
             passphrase_protection=use_passphrase,
             label="test",
             language="en-US",
-            needs_backup=setup_params["needs_backup"],
-            no_backup=setup_params["no_backup"],
+            needs_backup=setup_params["needs_backup"],  # type: ignore
+            no_backup=setup_params["no_backup"],  # type: ignore
         )
 
         if request.node.get_closest_marker("experimental"):
@@ -226,10 +225,7 @@ def client(
 
         _raw_client.clear_session()
 
-    if test_ui:
-        with ui_tests.screen_recording(_raw_client, request):
-            yield _raw_client
-    else:
+    with ui_tests.screen_recording(_raw_client, request):
         yield _raw_client
 
     _raw_client.close()
@@ -246,36 +242,19 @@ def _is_main_runner(session_or_request: pytest.Session | pytest.FixtureRequest)
 
 
 def pytest_sessionstart(session: pytest.Session) -> None:
-    ui_tests.read_fixtures()
-    if session.config.getoption("ui") and _is_main_runner(session):
-        testreport.clear_dir()
-
-
-def _should_write_ui_report(exitstatus: pytest.ExitCode) -> bool:
-    # generate UI report and check missing only if pytest is exitting cleanly
-    # I.e., the test suite passed or failed (as opposed to ctrl+c break, internal error,
-    # etc.)
-    return exitstatus in (pytest.ExitCode.OK, pytest.ExitCode.TESTS_FAILED)
+    if session.config.getoption("ui"):
+        ui_tests.setup(main_runner=_is_main_runner(session))
 
 
 def pytest_sessionfinish(session: pytest.Session, exitstatus: pytest.ExitCode) -> None:
-    if not _should_write_ui_report(exitstatus):
-        return
-
-    missing = session.config.getoption("ui_check_missing")
     test_ui = session.config.getoption("ui")
-
-    if test_ui == "test":
-        if missing and ui_tests.list_missing():
-            session.exitstatus = pytest.ExitCode.TESTS_FAILED
-        ui_tests.write_fixtures_suggestion(missing)
-        testreport.generate_reports()
-    elif test_ui == "record":
-        if exitstatus == pytest.ExitCode.OK:
-            ui_tests.write_fixtures(missing)
-        else:
-            ui_tests.write_fixtures_suggestion(missing, only_passed_tests=True)
-        testreport.generate_reports()
+    if test_ui and _is_main_runner(session):
+        session.exitstatus = ui_tests.sessionfinish(
+            exitstatus,
+            test_ui,  # type: ignore
+            bool(session.config.getoption("ui_check_missing")),
+            bool(session.config.getoption("record_text_layout")),
+        )
 
 
 def pytest_terminal_summary(
@@ -285,36 +264,13 @@ def pytest_terminal_summary(
     println("")
 
     ui_option = config.getoption("ui")
-    missing_tests = ui_tests.list_missing()
-    if ui_option and _should_write_ui_report(exitstatus) and missing_tests:
-        println(f"{len(missing_tests)} expected UI tests did not run.")
-        if config.getoption("ui_check_missing"):
-            println("-------- List of missing tests follows: --------")
-            for test in missing_tests:
-                println("\t" + test)
-
-            if ui_option == "test":
-                println("UI test failed.")
-            elif ui_option == "record":
-                println("Removing missing tests from record.")
-            println("")
-
-    if ui_option == "test" and _should_write_ui_report(exitstatus):
-        println("\n-------- Suggested fixtures.json diff: --------")
-        print("See", ui_tests.SUGGESTION_FILE)
-        println("")
-
-    if ui_option == "record" and exitstatus != pytest.ExitCode.OK:
-        println(
-            f"\n-------- WARNING! Recording to {ui_tests.HASH_FILE.name} was disabled due to failed tests. --------"
+    if ui_option:
+        ui_tests.terminal_summary(
+            terminalreporter.write_line,
+            ui_option,  # type: ignore
+            bool(config.getoption("ui_check_missing")),
+            exitstatus,
         )
-        print("See", ui_tests.SUGGESTION_FILE, "for suggestions for ONLY PASSED tests.")
-        println("")
-
-    if _should_write_ui_report(exitstatus):
-        println("-------- UI tests summary: --------")
-        println("Run ./tests/show_results.py to open test summary")
-        println("")
 
 
 def pytest_addoption(parser: "Parser") -> None:
@@ -345,6 +301,13 @@ def pytest_addoption(parser: "Parser") -> None:
         help="Which emulator to use: 'core' or 'legacy'. "
         "Only valid in connection with `--control-emulators`",
     )
+    parser.addoption(
+        "--record-text-layout",
+        action="store_true",
+        default=False,
+        help="Saving debugging traces for each screen change. "
+        "Will generate a report with text from all test-cases. ",
+    )
 
 
 def pytest_configure(config: "Config") -> None:
@@ -385,20 +348,8 @@ def pytest_runtest_setup(item: pytest.Item) -> None:
         pytest.skip("Skipping altcoin test")
 
 
-def pytest_runtest_teardown(item: pytest.Item) -> None:
-    """Called after a test item finishes.
-
-    Dumps the current UI test report HTML.
-    """
-    # Not calling `testreport.generate_reports()` not to generate
-    # the `all_screens` report, as would take a lot of time.
-    # That will be generated in `pytest_sessionfinish`.
-    if item.session.config.getoption("ui"):
-        testreport.index()
-
-
 @pytest.hookimpl(tryfirst=True, hookwrapper=True)
-def pytest_runtest_makereport(item: pytest.Item, call) -> None:
+def pytest_runtest_makereport(item: pytest.Item, call) -> Generator:
     # Make test results available in fixtures.
     # See https://docs.pytest.org/en/latest/example/simple.html#making-test-result-information-available-in-fixtures
     # The device_handler fixture uses this as 'request.node.rep_call.passed' attribute,
@@ -409,12 +360,12 @@ def pytest_runtest_makereport(item: pytest.Item, call) -> None:
 
 
 @pytest.fixture
-def device_handler(client: Client, request: pytest.FixtureRequest) -> None:
+def device_handler(client: Client, request: pytest.FixtureRequest) -> Generator:
     device_handler = BackgroundDeviceHandler(client)
     yield device_handler
 
     # get call test result
-    test_res = ui_tests.get_last_call_test_result(request)
+    test_res = ui_tests.common.get_last_call_test_result(request)
 
     if test_res is None:
         return
diff --git a/tests/device_tests/bitcoin/test_authorize_coinjoin.py b/tests/device_tests/bitcoin/test_authorize_coinjoin.py
index 26fb412e81..62cf70e02c 100644
--- a/tests/device_tests/bitcoin/test_authorize_coinjoin.py
+++ b/tests/device_tests/bitcoin/test_authorize_coinjoin.py
@@ -25,7 +25,13 @@ from trezorlib.tools import parse_path
 
 from ...tx_cache import TxCache
 from .payment_req import make_coinjoin_request
-from .signtx import request_finished, request_input, request_output
+from .signtx import (
+    assert_tx_matches,
+    request_finished,
+    request_input,
+    request_meta,
+    request_output,
+)
 
 B = messages.ButtonRequestType
 
@@ -38,13 +44,17 @@ FAKE_TXHASH_e5b7e2 = bytes.fromhex(
 FAKE_TXHASH_f982c0 = bytes.fromhex(
     "f982c0a283bd65a59aa89eded9e48f2a3319cb80361dfab4cf6192a03badb60a"
 )
+TXHASH_2cc3c1 = bytes.fromhex(
+    "2cc3c1e33fb1cb7b4fccf4e0fead3fc077a1eb6c22e61561b343b704a5a8da6d"
+)
+TXHASH_7f3a34 = bytes.fromhex(
+    "7f3a348106f9f3688069f389c00842b18d26770ec9a96ea94bf21623433a0f72"
+)
 
 PIN = "1234"
 ROUND_ID_LEN = 32
 SLIP25_PATH = parse_path("m/10025h")
 
-pytestmark = pytest.mark.skip_t1
-
 
 @pytest.mark.setup_client(pin=PIN)
 def test_sign_tx(client: Client):
@@ -240,7 +250,7 @@ def test_sign_tx(client: Client):
     )
 
     # Test for a third time, number of rounds should be exceeded.
-    with pytest.raises(TrezorFailure, match="Exceeded number of CoinJoin rounds"):
+    with pytest.raises(TrezorFailure, match="No preauthorized operation"):
         btc.sign_tx(
             client,
             "Testnet",
@@ -439,6 +449,7 @@ def test_sign_tx_spend(client: Client):
         )
 
     with client:
+        tt = client.features.model == "T"
         client.set_expected_responses(
             [
                 messages.ButtonRequest(code=B.Other),
@@ -447,9 +458,9 @@ def test_sign_tx_spend(client: Client):
                 request_output(0),
                 request_output(1),
                 messages.ButtonRequest(code=B.ConfirmOutput),
-                messages.ButtonRequest(code=B.ConfirmOutput),
-                messages.ButtonRequest(code=B.SignTx),
+                (tt, messages.ButtonRequest(code=B.ConfirmOutput)),
                 messages.ButtonRequest(code=B.SignTx),
+                (tt, messages.ButtonRequest(code=B.SignTx)),
                 request_input(0),
                 request_output(0),
                 request_output(1),
@@ -473,6 +484,94 @@ def test_sign_tx_spend(client: Client):
     )
 
 
+def test_sign_tx_migration(client: Client):
+    inputs = [
+        messages.TxInputType(
+            address_n=parse_path("m/84h/1h/3h/0/12"),
+            amount=1_393,
+            prev_hash=TXHASH_2cc3c1,
+            prev_index=0,
+            script_type=messages.InputScriptType.SPENDWITNESS,
+            sequence=0xFFFFFFFD,
+        ),
+        messages.TxInputType(
+            address_n=parse_path("m/84h/1h/3h/0/13"),
+            amount=8_159,
+            prev_hash=TXHASH_7f3a34,
+            prev_index=1,
+            script_type=messages.InputScriptType.SPENDWITNESS,
+            sequence=0xFFFFFFFD,
+        ),
+    ]
+
+    outputs = [
+        # CoinJoin account.
+        messages.TxOutputType(
+            # tb1pl3y9gf7xk2ryvmav5ar66ra0d2hk7lhh9mmusx3qvn0n09kmaghqh32ru7
+            address_n=parse_path("m/10025h/1h/0h/1h/0/0"),
+            amount=1_393 + 8_159 - 190,
+            script_type=messages.OutputScriptType.PAYTOTAPROOT,
+        ),
+    ]
+
+    # Ensure that Trezor refuses to receive to CoinJoin path without the user first authorizing access to CoinJoin paths.
+    with pytest.raises(TrezorFailure, match="Forbidden key path"):
+        _, serialized_tx = btc.sign_tx(
+            client,
+            "Testnet",
+            inputs,
+            outputs,
+            prev_txes=TX_CACHE_TESTNET,
+        )
+
+    with client:
+        tt = client.features.model == "T"
+        client.set_expected_responses(
+            [
+                messages.ButtonRequest(code=B.Other),
+                messages.UnlockedPathRequest(),
+                request_input(0),
+                request_input(1),
+                request_output(0),
+                messages.ButtonRequest(code=B.ConfirmOutput),
+                (tt, messages.ButtonRequest(code=B.ConfirmOutput)),
+                messages.ButtonRequest(code=B.SignTx),
+                (tt, messages.ButtonRequest(code=B.SignTx)),
+                request_input(0),
+                request_meta(TXHASH_2cc3c1),
+                request_input(0, TXHASH_2cc3c1),
+                request_output(0, TXHASH_2cc3c1),
+                request_input(1),
+                request_meta(TXHASH_7f3a34),
+                request_input(0, TXHASH_7f3a34),
+                request_input(1, TXHASH_7f3a34),
+                request_input(2, TXHASH_7f3a34),
+                request_output(0, TXHASH_7f3a34),
+                request_output(1, TXHASH_7f3a34),
+                request_input(0),
+                request_input(1),
+                request_output(0),
+                request_input(0),
+                request_input(1),
+                request_finished(),
+            ]
+        )
+        _, serialized_tx = btc.sign_tx(
+            client,
+            "Testnet",
+            inputs,
+            outputs,
+            prev_txes=TX_CACHE_TESTNET,
+            unlock_path=SLIP25_PATH,
+        )
+
+    assert_tx_matches(
+        serialized_tx,
+        hash_link="https://tbtc1.trezor.io/api/tx/3452d339045f8a35f2a083992b8f73d907f8da9653e89ee175022ca8a649b822",
+        tx_hex="010000000001026ddaa8a504b743b36115e6226ceba177c03fadfee0f4cc4f7bcbb13fe3c1c32c0000000000fdffffff720f3a432316f24ba96ea9c90e77268db14208c089f3698068f3f90681343a7f0100000000fdffffff019224000000000000225120fc485427c6b286466faca747ad0faf6aaf6f7ef72ef7c81a2064df3796dbea2e0247304402202f325d6e3ac764bb9d38003bb11022c5317a59ad8a2513dcabe7af9b23ff7c9f022011ff8161d9ed8cf82667b2b44dbe2f4538d41d8b353d64a01338881bce8de3690121030968050bc0647e28c09616d642cc88ab075b01e40616b53e446e7f122218a9da02483045022100f462c32fd90bf92a1aa4ca9fdb2dd9b5ef9adad6990b9bc7f9ca583e8b72d72a02202a6d9c2a8749d65bdb62a0ec4de27bad5fb13e2ae40be86afb95a477b60a1609012103e4dbaaee8486b328dba46adeb9afc3a56237aa5ca43df24eb61b04e6ca00099300000000",
+    )
+
+
 def test_wrong_coordinator(client: Client):
     # Ensure that a preauthorized GetOwnershipProof fails if the commitment_data doesn't match the coordinator.
 
diff --git a/tests/device_tests/bitcoin/test_getownershipproof.py b/tests/device_tests/bitcoin/test_getownershipproof.py
index ba197a9501..b21fe944b0 100644
--- a/tests/device_tests/bitcoin/test_getownershipproof.py
+++ b/tests/device_tests/bitcoin/test_getownershipproof.py
@@ -21,8 +21,6 @@ from trezorlib.debuglink import TrezorClientDebugLink as Client
 from trezorlib.exceptions import TrezorFailure
 from trezorlib.tools import parse_path
 
-pytestmark = pytest.mark.skip_t1
-
 
 def test_p2wpkh_ownership_id(client: Client):
     ownership_id = btc.get_ownership_id(
diff --git a/tests/device_tests/bitcoin/test_multisig_change.py b/tests/device_tests/bitcoin/test_multisig_change.py
index 450163a765..a54dcded27 100644
--- a/tests/device_tests/bitcoin/test_multisig_change.py
+++ b/tests/device_tests/bitcoin/test_multisig_change.py
@@ -143,6 +143,7 @@ def _responses(
     INP1: messages.TxInputType,
     INP2: messages.TxInputType,
     change: int = 0,
+    foreign: bool = False,
 ):
     tt = client.features.model == "T"
     resp = [
@@ -150,15 +151,23 @@ def _responses(
         request_input(1),
         request_output(0),
     ]
+
     if change != 1:
         resp.append(messages.ButtonRequest(code=B.ConfirmOutput))
         if tt:
             resp.append(messages.ButtonRequest(code=B.ConfirmOutput))
+    elif foreign:
+        resp.append(messages.ButtonRequest(code=B.UnknownDerivationPath))
+
     resp.append(request_output(1))
+
     if change != 2:
         resp.append(messages.ButtonRequest(code=B.ConfirmOutput))
         if tt:
             resp.append(messages.ButtonRequest(code=B.ConfirmOutput))
+    elif foreign:
+        resp.append(messages.ButtonRequest(code=B.UnknownDerivationPath))
+
     resp += [
         messages.ButtonRequest(code=B.SignTx),
         (tt, messages.ButtonRequest(code=B.SignTx)),
@@ -233,7 +242,9 @@ def test_external_internal(client: Client):
     )
 
     with client:
-        client.set_expected_responses(_responses(client, INP1, INP2, change=2))
+        client.set_expected_responses(
+            _responses(client, INP1, INP2, change=2, foreign=True)
+        )
         _, serialized_tx = btc.sign_tx(
             client,
             "Bitcoin",
@@ -264,7 +275,9 @@ def test_internal_external(client: Client):
     )
 
     with client:
-        client.set_expected_responses(_responses(client, INP1, INP2, change=1))
+        client.set_expected_responses(
+            _responses(client, INP1, INP2, change=1, foreign=True)
+        )
         _, serialized_tx = btc.sign_tx(
             client,
             "Bitcoin",
diff --git a/tests/device_tests/bitcoin/test_nonstandard_paths.py b/tests/device_tests/bitcoin/test_nonstandard_paths.py
index af3fb460f4..38ce879f4d 100644
--- a/tests/device_tests/bitcoin/test_nonstandard_paths.py
+++ b/tests/device_tests/bitcoin/test_nonstandard_paths.py
@@ -85,6 +85,8 @@ VECTORS_MULTISIG = (  # paths, address_index
     (("m/45h/0/63/1000000", "m/45h/0/62/1000000", "m/45h/0/61/1000000"), [0, 255]),
     # Unchained deprecated m/45'/coin_type'/account'/[0-1000000]/address_index
     (("m/45h/0h/63h/1000000", "m/45h/0h/62h/1000000", "m/45h/0/61/1000000"), [255]),
+    # Casa Paths
+    (("m/45h/0/60/1", "m/45h/1/60/0", "m/45h/2/60/0"), [255]),
 )
 
 
diff --git a/tests/device_tests/bitcoin/test_signmessage.py b/tests/device_tests/bitcoin/test_signmessage.py
index b907c16789..56c82822d7 100644
--- a/tests/device_tests/bitcoin/test_signmessage.py
+++ b/tests/device_tests/bitcoin/test_signmessage.py
@@ -29,11 +29,12 @@ from trezorlib.tools import parse_path
 S = messages.InputScriptType
 
 
-def case(id, *args, altcoin=False):
+def case(id, *args, altcoin=False, skip_t1=False):
+    marks = []
     if altcoin:
-        marks = pytest.mark.altcoin
-    else:
-        marks = ()
+        marks.append(pytest.mark.altcoin)
+    if skip_t1:
+        marks.append(pytest.mark.skip_t1)
     return pytest.param(*args, id=id, marks=marks)
 
 
@@ -155,6 +156,18 @@ VECTORS = (  # case name, coin_name, path, script_type, address, message, signat
         MESSAGE_NFC,
         NFKD_NFC_SIGNATURE,
     ),
+    # ==== T1 FW signing ====
+    case(
+        "t1 firmware path",
+        "Bitcoin",
+        "m/10026'/826421588'/2'/0'",
+        S.SPENDADDRESS,
+        False,
+        "1FoHjQT6bAEu2FQGzTgqj4PBneoiCAk4ZN",
+        b"BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB",
+        "1f40ae58dd68480a2f39eecf4decfe79ceacde3f865502db67c083b8465b33535c0750d5377b7ac62e534f71c922cd029f659761f8ac99e859df36322c5b320eff",
+        skip_t1=True,
+    ),
     # ==== Testnet script types ====
     case(
         "p2pkh",
diff --git a/tests/device_tests/bitcoin/test_signtx_external.py b/tests/device_tests/bitcoin/test_signtx_external.py
index 7a3fcd42bf..f7b06018d7 100644
--- a/tests/device_tests/bitcoin/test_signtx_external.py
+++ b/tests/device_tests/bitcoin/test_signtx_external.py
@@ -577,7 +577,6 @@ def test_p2wpkh_in_p2sh_with_proof(client: Client):
     pass
 
 
-@pytest.mark.skip_t1
 def test_p2wpkh_with_proof(client: Client):
     inp1 = messages.TxInputType(
         # seed "alcohol woman abuse must during monitor noble actual mixed trade anger aisle"
@@ -611,16 +610,18 @@ def test_p2wpkh_with_proof(client: Client):
     )
 
     with client:
+        t1 = client.features.model == "1"
+        tt = client.features.model == "T"
         client.set_expected_responses(
             [
                 request_input(0),
                 request_input(1),
                 request_output(0),
                 messages.ButtonRequest(code=B.ConfirmOutput),
-                messages.ButtonRequest(code=B.ConfirmOutput),
+                (tt, messages.ButtonRequest(code=B.ConfirmOutput)),
                 request_output(1),
                 messages.ButtonRequest(code=B.ConfirmOutput),
-                messages.ButtonRequest(code=B.ConfirmOutput),
+                (tt, messages.ButtonRequest(code=B.ConfirmOutput)),
                 messages.ButtonRequest(code=B.SignTx),
                 request_input(0),
                 request_meta(TXHASH_e5b7e2),
@@ -636,6 +637,7 @@ def test_p2wpkh_with_proof(client: Client):
                 request_input(1),
                 request_output(0),
                 request_output(1),
+                (t1, request_input(0)),
                 request_input(1),
                 request_finished(),
             ]
@@ -656,7 +658,7 @@ def test_p2wpkh_with_proof(client: Client):
 
     # Test corrupted ownership proof.
     inp1.ownership_proof[10] ^= 1
-    with pytest.raises(TrezorFailure, match="Invalid signature"):
+    with pytest.raises(TrezorFailure, match="Invalid signature|Invalid external input"):
         btc.sign_tx(
             client,
             "Testnet",
@@ -666,7 +668,6 @@ def test_p2wpkh_with_proof(client: Client):
         )
 
 
-@pytest.mark.skip_t1
 @pytest.mark.setup_client(
     mnemonic="abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
 )
@@ -703,17 +704,20 @@ def test_p2tr_with_proof(client: Client):
     )
 
     with client:
+        t1 = client.features.model == "1"
+        tt = client.features.model == "T"
         client.set_expected_responses(
             [
                 request_input(0),
                 request_input(1),
                 request_output(0),
                 messages.ButtonRequest(code=B.ConfirmOutput),
-                messages.ButtonRequest(code=B.ConfirmOutput),
+                (tt, messages.ButtonRequest(code=B.ConfirmOutput)),
                 messages.ButtonRequest(code=B.SignTx),
                 request_input(0),
                 request_input(1),
                 request_output(0),
+                (t1, request_input(0)),
                 request_input(1),
                 request_finished(),
             ]
@@ -732,11 +736,10 @@ def test_p2tr_with_proof(client: Client):
 
     # Test corrupted ownership proof.
     inp1.ownership_proof[10] ^= 1
-    with pytest.raises(TrezorFailure, match="Invalid signature"):
+    with pytest.raises(TrezorFailure, match="Invalid signature|Invalid external input"):
         btc.sign_tx(client, "Testnet", [inp1, inp2], [out1], prev_txes=TX_CACHE_TESTNET)
 
 
-@pytest.mark.skip_t1
 def test_p2wpkh_with_false_proof(client: Client):
     inp1 = messages.TxInputType(
         # tb1qkvwu9g3k2pdxewfqr7syz89r3gj557l3uuf9r9
diff --git a/tests/device_tests/bitcoin/test_signtx_prevhash.py b/tests/device_tests/bitcoin/test_signtx_prevhash.py
index ee7d610697..3f7e1693d4 100644
--- a/tests/device_tests/bitcoin/test_signtx_prevhash.py
+++ b/tests/device_tests/bitcoin/test_signtx_prevhash.py
@@ -63,14 +63,11 @@ def hash_tx(data: bytes) -> bytes:
 
 
 def _check_error_message(value: bytes, model: str, message: str):
-    if model != "1":
-        assert message == "Provided prev_hash is invalid."
-
     # T1 has several possible errors
-    elif len(value) > 32:
+    if model == "1" and len(value) > 32:
         assert message.endswith("bytes overflow")
     else:
-        assert message.endswith("Encountered invalid prevhash")
+        assert message.endswith("Provided prev_hash is invalid.")
 
 
 with_bad_prevhashes = pytest.mark.parametrize(
diff --git a/tests/device_tests/bitcoin/test_signtx_segwit_native.py b/tests/device_tests/bitcoin/test_signtx_segwit_native.py
index e6404a5e6c..610334d4d6 100644
--- a/tests/device_tests/bitcoin/test_signtx_segwit_native.py
+++ b/tests/device_tests/bitcoin/test_signtx_segwit_native.py
@@ -605,6 +605,9 @@ def test_send_multisig_3_change(client: Client):
     expected_responses = [
         request_input(0),
         request_output(0),
+        messages.ButtonRequest(code=B.UnknownDerivationPath),
+        messages.ButtonRequest(code=B.ConfirmOutput),
+        (tt, messages.ButtonRequest(code=B.ConfirmOutput)),
         messages.ButtonRequest(code=B.SignTx),
         (tt, messages.ButtonRequest(code=B.SignTx)),
         request_input(0),
@@ -690,6 +693,9 @@ def test_send_multisig_4_change(client: Client):
     expected_responses = [
         request_input(0),
         request_output(0),
+        messages.ButtonRequest(code=B.UnknownDerivationPath),
+        messages.ButtonRequest(code=B.ConfirmOutput),
+        (tt, messages.ButtonRequest(code=B.ConfirmOutput)),
         messages.ButtonRequest(code=B.SignTx),
         (tt, messages.ButtonRequest(code=B.SignTx)),
         request_input(0),
diff --git a/tests/device_tests/ethereum/test_getaddress.py b/tests/device_tests/ethereum/test_getaddress.py
index b9cd6d8c65..36ab62d2a7 100644
--- a/tests/device_tests/ethereum/test_getaddress.py
+++ b/tests/device_tests/ethereum/test_getaddress.py
@@ -28,4 +28,6 @@ pytestmark = [pytest.mark.altcoin, pytest.mark.ethereum]
 @parametrize_using_common_fixtures("ethereum/getaddress.json")
 def test_getaddress(client: Client, parameters, result):
     address_n = parse_path(parameters["path"])
-    assert ethereum.get_address(client, address_n) == result["address"]
+    assert (
+        ethereum.get_address(client, address_n, show_display=True) == result["address"]
+    )
diff --git a/tests/device_tests/ethereum/test_sign_typed_data.py b/tests/device_tests/ethereum/test_sign_typed_data.py
index a58e828c27..99821cc86a 100644
--- a/tests/device_tests/ethereum/test_sign_typed_data.py
+++ b/tests/device_tests/ethereum/test_sign_typed_data.py
@@ -96,6 +96,9 @@ DATA = {
 
 def input_flow_show_more(client: Client):
     """Clicks show_more button wherever possible"""
+    yield  # confirm address
+    client.debug.press_yes()
+
     yield  # confirm domain
     client.debug.wait_layout()
     client.debug.click(SHOW_MORE)
@@ -136,6 +139,9 @@ def input_flow_show_more(client: Client):
 
 def input_flow_cancel(client: Client):
     """Clicks cancelling button"""
+    yield  # confirm address
+    client.debug.press_yes()
+
     yield  # confirm domain
     client.debug.press_no()
 
diff --git a/tests/device_tests/misc/test_cosi.py b/tests/device_tests/misc/test_cosi.py
index 0f7a0cce98..ed2a9dde0a 100644
--- a/tests/device_tests/misc/test_cosi.py
+++ b/tests/device_tests/misc/test_cosi.py
@@ -20,9 +20,8 @@ import pytest
 
 from trezorlib import cosi
 from trezorlib.debuglink import TrezorClientDebugLink as Client
-from trezorlib.tools import parse_path
-
-pytestmark = pytest.mark.skip_t2
+from trezorlib.exceptions import TrezorFailure
+from trezorlib.tools import H_, Address, parse_path
 
 DIGEST = sha256(b"this is not a pipe").digest()
 
@@ -108,3 +107,48 @@ def test_cosi_sign3(client: Client):
     )
 
     cosi.verify_combined(signature, DIGEST, global_pk)
+
+
+@pytest.mark.skip_t1
+def test_cosi_different_key(client: Client):
+    with pytest.raises(TrezorFailure):
+        commit = cosi.commit(client, parse_path("m/10018h/0h"))
+        cosi.sign(
+            client, parse_path("m/10018h/1h"), DIGEST, commit.commitment, commit.pubkey
+        )
+
+
+@pytest.mark.parametrize(
+    "model",
+    (
+        b"T1B1",
+        b"T2T1",
+        b"T2B1",
+        b"T3W1",
+        b"\xfe\xfe\xfe\xfe",
+        b"\x00",
+        b"dog",
+        b"42",
+    ),
+)
+@pytest.mark.skip_t1
+def test_slip26_paths(client: Client, model: bytes):
+    slip26_model = int.from_bytes(model, "little")
+    path = Address([H_(10026), H_(slip26_model), H_(0), H_(0)])
+    cosi.commit(client, path)
+
+
+@pytest.mark.parametrize(
+    "path",
+    (
+        "m/44h/0h/0h/0/0",
+        "m/44h/60h/0h/0/0",
+        "m/44h/60h/1h",
+        "m/84h/60h/1h/0",
+        "m/1",
+        "m/10018/0",
+    ),
+)
+def test_invalid_path(client: Client, path: str) -> None:
+    with pytest.raises(TrezorFailure, match="DataError"):
+        cosi.commit(client, parse_path(path))
diff --git a/tests/device_tests/reset_recovery/test_recovery_bip39_t2.py b/tests/device_tests/reset_recovery/test_recovery_bip39_t2.py
index cfa8b8fd65..cc4e0f470c 100644
--- a/tests/device_tests/reset_recovery/test_recovery_bip39_t2.py
+++ b/tests/device_tests/reset_recovery/test_recovery_bip39_t2.py
@@ -31,7 +31,7 @@ def test_tt_pin_passphrase(client: Client):
 
     def input_flow():
         yield
-        assert "Do you really want to recover a wallet?" in layout().get_content()
+        assert "recover wallet" in layout().text.lower()
         client.debug.press_yes()
 
         yield
@@ -85,7 +85,7 @@ def test_tt_nopin_nopassphrase(client: Client):
 
     def input_flow():
         yield
-        assert "Do you really want to recover a wallet?" in layout().get_content()
+        assert "recover wallet" in layout().text.lower()
         client.debug.press_yes()
 
         yield
diff --git a/tests/device_tests/test_busy_state.py b/tests/device_tests/test_busy_state.py
index c4ce368f88..f0c020c6d5 100644
--- a/tests/device_tests/test_busy_state.py
+++ b/tests/device_tests/test_busy_state.py
@@ -24,8 +24,6 @@ from trezorlib.tools import parse_path
 
 PIN = "1234"
 
-pytestmark = pytest.mark.skip_t1
-
 
 @pytest.mark.setup_client(pin=PIN)
 def test_busy_state(client: Client):
diff --git a/tests/device_tests/test_msg_applysettings.py b/tests/device_tests/test_msg_applysettings.py
index ad7faf0284..74e88f3bbc 100644
--- a/tests/device_tests/test_msg_applysettings.py
+++ b/tests/device_tests/test_msg_applysettings.py
@@ -133,6 +133,52 @@ def test_apply_settings_passphrase_on_device(client: Client):
 def test_apply_homescreen_toif(client: Client):
     img = b"TOIf\x90\x00\x90\x00~\x00\x00\x00\xed\xd2\xcb\r\x83@\x10D\xc1^.\xde#!\xac31\x99\x10\x8aC%\x14~\x16\x92Y9\x02WI3\x01<\xf5cI2d\x1es(\xe1[\xdbn\xba\xca\xe8s7\xa4\xd5\xd4\xb3\x13\xbdw\xf6:\xf3\xd1\xe7%\xc7]\xdd_\xb3\x9e\x9f\x9e\x9fN\xed\xaaE\xef\xdc\xcf$D\xa7\xa4X\r\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0OV"
 
+    with pytest.raises(exceptions.TrezorFailure), client:
+        _set_expected_responses(client)
+        device.apply_settings(client, homescreen=img)
+
+
+@pytest.mark.skip_t1
+def test_apply_homescreen_jpeg(client: Client):
+    img = (
+        b"\xff\xd8\xff\xe0\x00\x10JFIF\x00\x01\x01\x01\x01,\x01,"
+        b"\x00\x00\xff\xdb\x00C\x00\x02\x01\x01\x02\x01\x01\x02\x02\x02\x02\x02\x02\x02\x02\x03\x05\x03\x03\x03\x03"
+        b"\x03\x06\x04\x04\x03\x05\x07\x06\x07\x07\x07\x06\x07\x07\x08\t\x0b\t\x08\x08\n\x08\x07\x07\n\r\n\n\x0b"
+        b"\x0c\x0c\x0c\x0c\x07\t\x0e\x0f\r\x0c\x0e\x0b\x0c\x0c\x0c\xff\xdb\x00C\x01\x02\x02\x02\x03\x03\x03\x06\x03"
+        b"\x03\x06\x0c\x08\x07\x08\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
+        b"\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
+        b"\x0c\x0c\x0c\x0c\xff\xc0\x00\x11\x08\x00\xf0\x00\xf0\x03\x01\x11\x00\x02\x11\x01\x03\x11\x01\xff\xc4\x00"
+        b"\x15\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\xff\xc4\x00\x14\x10\x01"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\xff\xda\x00\x0c\x03\x01\x00\x02\x11\x03\x11\x00?\x00\x9f\xf0\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1f\xff\xd9"
+    )
     with client:
         _set_expected_responses(client)
         device.apply_settings(client, homescreen=img)
@@ -141,26 +187,106 @@ def test_apply_homescreen_toif(client: Client):
         device.apply_settings(client, homescreen=b"")
 
 
-@pytest.mark.parametrize(
-    "toif_data",
-    [
-        # incomplete header
-        b"TOIf\x90\00\x90\x00~"
-        # wrong magic
-        b"XXXf\x90\x00\x90\x00~\x00\x00\x00\xed\xd2\xcb\r\x83@\x10D\xc1^.\xde#!\xac31\x99\x10\x8aC%\x14~\x16\x92Y9\x02WI3\x01<\xf5cI2d\x1es(\xe1[\xdbn\xba\xca\xe8s7\xa4\xd5\xd4\xb3\x13\xbdw\xf6:\xf3\xd1\xe7%\xc7]\xdd_\xb3\x9e\x9f\x9e\x9fN\xed\xaaE\xef\xdc\xcf$D\xa7\xa4X\r\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0OV"
-        # wrong datasize in header
-        b"TOIf\x90\x00\x90\x00~\x00\x00\x00\xed\xd2\xcb\r\x83@\x10D\xc1^.\xde#!\xac31\x99\x10\x8aC%\x14~\x16\x92Y9\x02WI3\x01<\xf5cI2d\x1es(\xe1[\xdbn\xba\xca\xe8s7\xa4\xd5\xd4\xb3\x13\xbdw\xf6:\xf3\xd1\xe7%\xc7]\xdd_\xb3\x9e\x9f\x9e\x9fN\xed\xaaE\xef\xdc\xcf$D\xa7\xa4X\r\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-        # grayscale 144x144
-        b"TOIg\x90\x00\x90\x00~\x00\x00\x00\xed\xd2\xcb\r\x83@\x10D\xc1^.\xde#!\xac31\x99\x10\x8aC%\x14~\x16\x92Y9\x02WI3\x01<\xf5cI2d\x1es(\xe1[\xdbn\xba\xca\xe8s7\xa4\xd5\xd4\xb3\x13\xbdw\xf6:\xf3\xd1\xe7%\xc7]\xdd_\xb3\x9e\x9f\x9e\x9fN\xed\xaaE\xef\xdc\xcf$D\xa7\xa4X\r\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0OV",
-        # fullcolor 128x128
-        b"TOIf\x80\x00\x80\x00~\x00\x00\x00\xed\xd2\xcb\r\x83@\x10D\xc1^.\xde#!\xac31\x99\x10\x8aC%\x14~\x16\x92Y9\x02WI3\x01<\xf5cI2d\x1es(\xe1[\xdbn\xba\xca\xe8s7\xa4\xd5\xd4\xb3\x13\xbdw\xf6:\xf3\xd1\xe7%\xc7]\xdd_\xb3\x9e\x9f\x9e\x9fN\xed\xaaE\xef\xdc\xcf$D\xa7\xa4X\r\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0OV",
-    ],
-)
 @pytest.mark.skip_t1
-def test_apply_homescreen_toif_fail(client: Client, toif_data):
+def test_apply_homescreen_jpeg_progressive(client: Client):
+    img = (
+        b"\xff\xd8\xff\xe0\x00\x10JFIF\x00\x01\x01\x01\x01,\x01,"
+        b"\x00\x00\xff\xdb\x00C\x00\x02\x01\x01\x02\x01\x01\x02\x02\x02\x02\x02\x02\x02\x02\x03\x05\x03\x03\x03\x03"
+        b"\x03\x06\x04\x04\x03\x05\x07\x06\x07\x07\x07\x06\x07\x07\x08\t\x0b\t\x08\x08\n\x08\x07\x07\n\r\n\n\x0b"
+        b"\x0c\x0c\x0c\x0c\x07\t\x0e\x0f\r\x0c\x0e\x0b\x0c\x0c\x0c\xff\xdb\x00C\x01\x02\x02\x02\x03\x03\x03\x06\x03"
+        b"\x03\x06\x0c\x08\x07\x08\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
+        b"\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
+        b"\x0c\x0c\x0c\x0c\xff\xc2\x00\x11\x08\x00\xf0\x00\xf0\x03\x01\x11\x00\x02\x11\x01\x03\x11\x01\xff\xc4\x00"
+        b"\x15\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\t\xff\xc4\x00\x14\x01\x01"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xda\x00\x0c\x03\x01\x00\x02\x10\x03"
+        b"\x10\x00\x00\x01\x9f\xe0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x03\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x90\xff\xda\x00\x08\x01\x01\x00\x01\x05\x02a?\xff\xc4\x00\x14\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x90\xff\xda\x00\x08\x01\x03\x01\x01?\x01a?\xff\xc4\x00\x14\x11\x01\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\xff\xda\x00\x08\x01\x02\x01\x01?\x01a?\xff\xc4"
+        b"\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\xff\xda\x00\x08\x01\x01"
+        b"\x00\x06?\x02a?\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90"
+        b"\xff\xda\x00\x08\x01\x01\x00\x01?!a?\xff\xda\x00\x0c\x03\x01\x00\x02\x00\x03\x00\x00\x00\x10\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\xff\xc4\x00"
+        b"\x14\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\xff\xda\x00\x08\x01\x03\x01"
+        b"\x01?\x10a?\xff\xc4\x00\x14\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\xff"
+        b"\xda\x00\x08\x01\x02\x01\x01?\x10a?\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x90\xff\xda\x00\x08\x01\x01\x00\x01?\x10a?\xff\xd9"
+    )
+
     with pytest.raises(exceptions.TrezorFailure), client:
-        client.use_pin_sequence([PIN4])
-        device.apply_settings(client, homescreen=toif_data)
+        _set_expected_responses(client)
+        device.apply_settings(client, homescreen=img)
+
+
+@pytest.mark.skip_t1
+def test_apply_homescreen_jpeg_wrong_size(client: Client):
+    img = (
+        b"\xff\xd8\xff\xe0\x00\x10JFIF\x00\x01\x01\x01\x01,\x01,"
+        b"\x00\x00\xff\xdb\x00C\x00\x02\x01\x01\x02\x01\x01\x02\x02\x02\x02\x02\x02\x02\x02\x03\x05\x03\x03\x03\x03"
+        b"\x03\x06\x04\x04\x03\x05\x07\x06\x07\x07\x07\x06\x07\x07\x08\t\x0b\t\x08\x08\n\x08\x07\x07\n\r\n\n\x0b"
+        b"\x0c\x0c\x0c\x0c\x07\t\x0e\x0f\r\x0c\x0e\x0b\x0c\x0c\x0c\xff\xdb\x00C\x01\x02\x02\x02\x03\x03\x03\x06\x03"
+        b"\x03\x06\x0c\x08\x07\x08\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
+        b"\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
+        b"\x0c\x0c\x0c\x0c\xff\xc0\x00\x11\x08\x00\xf0\x00\xdc\x03\x01\x11\x00\x02\x11\x01\x03\x11\x01\xff\xc4\x00"
+        b"\x15\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\xff\xc4\x00\x14\x10\x01"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\xff\xda\x00\x0c\x03\x01\x00\x02\x11\x03\x11\x00?\x00\x9f\xf0\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        b"\x00\x00\x1f\xff\xd9"
+    )
+
+    with pytest.raises(exceptions.TrezorFailure), client:
+        _set_expected_responses(client)
+        device.apply_settings(client, homescreen=img)
 
 
 @pytest.mark.skip_t2
diff --git a/tests/device_tests/test_sdcard.py b/tests/device_tests/test_sdcard.py
index eed4256d11..c7fa8d301b 100644
--- a/tests/device_tests/test_sdcard.py
+++ b/tests/device_tests/test_sdcard.py
@@ -75,7 +75,7 @@ def test_sd_protect_unlock(client: Client):
 
     def input_flow_change_pin():
         yield  # do you really want to change PIN?
-        assert "CHANGE PIN" == layout().get_title()
+        assert "PIN SETTINGS" == layout().get_title()
         client.debug.press_yes()
 
         yield  # enter current PIN
@@ -103,7 +103,7 @@ def test_sd_protect_unlock(client: Client):
 
     def input_flow_change_pin_format():
         yield  # do you really want to change PIN?
-        assert "CHANGE PIN" == layout().get_title()
+        assert "PIN SETTINGS" == layout().get_title()
         client.debug.press_yes()
 
         yield  # enter current PIN
diff --git a/tests/device_tests/test_session_id_and_passphrase.py b/tests/device_tests/test_session_id_and_passphrase.py
index 80fd6bc30b..c7ab935923 100644
--- a/tests/device_tests/test_session_id_and_passphrase.py
+++ b/tests/device_tests/test_session_id_and_passphrase.py
@@ -18,9 +18,10 @@ import random
 
 import pytest
 
-from trezorlib import exceptions, messages
+from trezorlib import device, exceptions, messages
 from trezorlib.debuglink import TrezorClientDebugLink as Client
-from trezorlib.messages import FailureType
+from trezorlib.exceptions import TrezorFailure
+from trezorlib.messages import FailureType, SafetyCheckLevel
 from trezorlib.tools import parse_path
 
 XPUB_PASSPHRASES = {
@@ -375,6 +376,83 @@ def test_passphrase_length(client: Client):
     call(passphrase="A" * 49 + "š", expected_result=False)
 
 
+@pytest.mark.skip_t1
+@pytest.mark.setup_client(passphrase=True)
+def test_hide_passphrase_from_host(client: Client):
+    # Without safety checks, turning it on fails
+    with pytest.raises(TrezorFailure, match="Safety checks are strict"), client:
+        device.apply_settings(client, hide_passphrase_from_host=True)
+
+    device.apply_settings(client, safety_checks=SafetyCheckLevel.PromptTemporarily)
+
+    # Turning it on
+    device.apply_settings(client, hide_passphrase_from_host=True)
+
+    passphrase = "abc"
+
+    with client:
+
+        def input_flow():
+            yield
+            layout = client.debug.wait_layout()
+            assert (
+                "Passphrase provided by host will be used but will not be displayed due to the device settings."
+                in layout.get_content()
+            )
+            client.debug.press_yes()
+
+        client.watch_layout()
+        client.set_input_flow(input_flow)
+        client.set_expected_responses(
+            [
+                messages.PassphraseRequest,
+                messages.ButtonRequest,
+                messages.PublicKey,
+            ]
+        )
+        client.use_passphrase(passphrase)
+        result = client.call(XPUB_REQUEST)
+        assert isinstance(result, messages.PublicKey)
+        xpub_hidden_passphrase = result.xpub
+
+    # Turning it off
+    device.apply_settings(client, hide_passphrase_from_host=False)
+
+    # Starting new session, otherwise the passphrase would be cached
+    _init_session(client)
+
+    with client:
+
+        def input_flow():
+            yield
+            layout = client.debug.wait_layout()
+            assert "Next screen will show the passphrase!" in layout.get_content()
+            client.debug.press_yes()
+
+            yield
+            layout = client.debug.wait_layout()
+            assert "Use this passphrase?" in layout.get_content()
+            assert passphrase in layout.get_content()
+            client.debug.press_yes()
+
+        client.watch_layout()
+        client.set_input_flow(input_flow)
+        client.set_expected_responses(
+            [
+                messages.PassphraseRequest,
+                messages.ButtonRequest,
+                messages.ButtonRequest,
+                messages.PublicKey,
+            ]
+        )
+        client.use_passphrase(passphrase)
+        result = client.call(XPUB_REQUEST)
+        assert isinstance(result, messages.PublicKey)
+        xpub_shown_passphrase = result.xpub
+
+    assert xpub_hidden_passphrase == xpub_shown_passphrase
+
+
 def _get_xpub_cardano(client: Client, passphrase):
     msg = messages.CardanoGetPublicKey(
         address_n=parse_path("m/44h/1815h/0h/0/0"),
diff --git a/tests/persistence_tests/test_shamir_persistence.py b/tests/persistence_tests/test_shamir_persistence.py
index 5e837f04be..4cfb6aee5c 100644
--- a/tests/persistence_tests/test_shamir_persistence.py
+++ b/tests/persistence_tests/test_shamir_persistence.py
@@ -50,7 +50,7 @@ def test_abort(emulator: Emulator):
 
     device_handler.run(device.recover, pin_protection=False)
     layout = debug.wait_layout()
-    assert layout.get_title() == "RECOVERY MODE"
+    assert layout.get_title() == "WALLET RECOVERY"
 
     layout = debug.click(buttons.OK, wait=True)
     assert "Select number of words" in layout.text
@@ -69,7 +69,7 @@ def test_abort(emulator: Emulator):
     assert layout.get_title() == "ABORT RECOVERY"
     layout = debug.click(buttons.OK, wait=True)
 
-    assert layout.text == "Homescreen"
+    assert layout.text.startswith("< Homescreen")
     features = device_handler.features()
     assert features.recovery_mode is False
 
@@ -212,7 +212,7 @@ def test_recovery_multiple_resets(emulator: Emulator):
     enter_shares_with_restarts(debug)
     debug = device_handler.debuglink()
     layout = debug.read_layout()
-    assert layout.text == "Homescreen"
+    assert layout.text.startswith("< Homescreen")
 
     features = device_handler.features()
     assert features.initialized is True
diff --git a/tests/show_results.py b/tests/show_results.py
index ed53777c61..00ec774048 100755
--- a/tests/show_results.py
+++ b/tests/show_results.py
@@ -1,9 +1,11 @@
 #!/usr/bin/env python3
 
 import http.server
+import json
 import multiprocessing
 import os
 import posixpath
+import sys
 import time
 import webbrowser
 from pathlib import Path
@@ -11,8 +13,12 @@ from urllib.parse import unquote
 
 import click
 
+from ui_tests.common import SCREENS_DIR, TestResult, write_fixtures
+from ui_tests.reporting import testreport  # noqa: E402
+
 ROOT = Path(__file__).resolve().parent.parent
-TEST_RESULT_PATH = ROOT / "tests" / "ui_tests" / "reporting" / "reports" / "test"
+
+sys.path.append(str(ROOT / "tests"))
 
 
 class NoCacheRequestHandler(http.server.SimpleHTTPRequestHandler):
@@ -42,7 +48,7 @@ class NoCacheRequestHandler(http.server.SimpleHTTPRequestHandler):
         path = posixpath.normpath(path)
         words = path.split("/")
         words = filter(None, words)
-        path = str(TEST_RESULT_PATH)  # XXX this is the only modified line
+        path = str(testreport.TESTREPORT_PATH)  # XXX this is the only modified line
         for word in words:
             if os.path.dirname(word) or word in (os.curdir, os.pardir):
                 # Ignore components that are not a simple file/directory name
@@ -52,6 +58,32 @@ class NoCacheRequestHandler(http.server.SimpleHTTPRequestHandler):
             path += "/"
         return path
 
+    def do_GET(self) -> None:
+        if self.path in ("/", "/index.html"):
+            testreport.index()
+
+        return super().do_GET()
+
+    def do_POST(self) -> None:
+        if self.path == "/fixtures.json":
+
+            length = int(self.headers.get("content-length"))
+            field_data = self.rfile.read(length)
+            data = json.loads(field_data)
+
+            test_name = data.get("test")
+            test_hash = data.get("hash")
+
+            if test_name is not None and test_hash is not None:
+                test_path = SCREENS_DIR / test_name
+                result = TestResult.load(test_path)
+                assert result.actual_hash == test_hash
+                write_fixtures([result])
+
+            self.send_response(200)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+
 
 def launch_http_server(port: int) -> None:
     http.server.test(HandlerClass=NoCacheRequestHandler, bind="localhost", port=port)  # type: ignore [test is defined]
diff --git a/tests/txcache/testnet/2cc3c1e33fb1cb7b4fccf4e0fead3fc077a1eb6c22e61561b343b704a5a8da6d.json b/tests/txcache/testnet/2cc3c1e33fb1cb7b4fccf4e0fead3fc077a1eb6c22e61561b343b704a5a8da6d.json
new file mode 100644
index 0000000000..a48b074057
--- /dev/null
+++ b/tests/txcache/testnet/2cc3c1e33fb1cb7b4fccf4e0fead3fc077a1eb6c22e61561b343b704a5a8da6d.json
@@ -0,0 +1,20 @@
+{
+  "bin_outputs": [
+    {
+      "amount": 1393,
+      "script_pubkey": "001435b1e893609de6ffdf298bc04a0c8067d3849e20"
+    }
+  ],
+  "inputs": [
+    {
+      "coinjoin_flags": 0,
+      "prev_hash": "49b5aaaaa017a75876b0726cc35c2e353b9f38742682c18434a467d76fb9e3d0",
+      "prev_index": 0,
+      "script_sig": "",
+      "script_type": "SPENDADDRESS",
+      "sequence": 4294967293
+    }
+  ],
+  "lock_time": 0,
+  "version": 1
+}
diff --git a/tests/txcache/testnet/7f3a348106f9f3688069f389c00842b18d26770ec9a96ea94bf21623433a0f72.json b/tests/txcache/testnet/7f3a348106f9f3688069f389c00842b18d26770ec9a96ea94bf21623433a0f72.json
new file mode 100644
index 0000000000..904ab660cb
--- /dev/null
+++ b/tests/txcache/testnet/7f3a348106f9f3688069f389c00842b18d26770ec9a96ea94bf21623433a0f72.json
@@ -0,0 +1,40 @@
+{
+  "bin_outputs": [
+    {
+      "amount": 601,
+      "script_pubkey": "001481a889eb2bab85282006b6418e3265bff9563a75"
+    },
+    {
+      "amount": 8159,
+      "script_pubkey": "00149076768ac4b06c247dbc1a89b66327a5051bdc0c"
+    }
+  ],
+  "inputs": [
+    {
+      "coinjoin_flags": 0,
+      "prev_hash": "a6d3bc4b297a9dae38a0a4650c191947cefe4bd27ce96699d21df287eb9d457c",
+      "prev_index": 1,
+      "script_sig": "",
+      "script_type": "SPENDADDRESS",
+      "sequence": 4294967293
+    },
+    {
+      "coinjoin_flags": 0,
+      "prev_hash": "bd99f985131e4d008f3fd0cccf54f9bb1cf7752d1fcd04aa485ec69937cd40ae",
+      "prev_index": 0,
+      "script_sig": "",
+      "script_type": "SPENDADDRESS",
+      "sequence": 4294967293
+    },
+    {
+      "coinjoin_flags": 0,
+      "prev_hash": "d5616b728472378f365d2d28215d89c296d28b685e2f15ca7d2e4dccdb73fa5c",
+      "prev_index": 0,
+      "script_sig": "",
+      "script_type": "SPENDADDRESS",
+      "sequence": 4294967293
+    }
+  ],
+  "lock_time": 0,
+  "version": 1
+}
diff --git a/tests/ui_tests/.gitignore b/tests/ui_tests/.gitignore
index 047e341006..5e3fedad20 100644
--- a/tests/ui_tests/.gitignore
+++ b/tests/ui_tests/.gitignore
@@ -1,4 +1,5 @@
 *.png
 *.html
 *.zip
+*.txt
 fixtures.suggestion.json
diff --git a/tests/ui_tests/__init__.py b/tests/ui_tests/__init__.py
index d0633d9648..5a3762bb65 100644
--- a/tests/ui_tests/__init__.py
+++ b/tests/ui_tests/__init__.py
@@ -1,114 +1,46 @@
-import hashlib
-import json
-import re
+from __future__ import annotations
+
 import shutil
 from contextlib import contextmanager
-from pathlib import Path
-from typing import Dict, Generator, Optional, Set
+from typing import Callable, Generator
 
 import pytest
 from _pytest.outcomes import Failed
-from PIL import Image
 
 from trezorlib.debuglink import TrezorClientDebugLink as Client
 
+from . import common
+from .common import SCREENS_DIR, UI_TESTS_DIR, TestCase, TestResult
 from .reporting import testreport
 
-UI_TESTS_DIR = Path(__file__).resolve().parent
-SCREENS_DIR = UI_TESTS_DIR / "screens"
-HASH_FILE = UI_TESTS_DIR / "fixtures.json"
-SUGGESTION_FILE = UI_TESTS_DIR / "fixtures.suggestion.json"
-FILE_HASHES: Dict[str, str] = {}
-ACTUAL_HASHES: Dict[str, str] = {}
-PROCESSED: Set[str] = set()
-FAILED_TESTS: Set[str] = set()
-
-# T1/TT, to be set in screen_recording(), as we do not know it beforehand
-# TODO: it is not the cleanest, we could create a class out of this file
-MODEL = ""
+FIXTURES_SUGGESTION_FILE = UI_TESTS_DIR / "fixtures.suggestion.json"
 
 
-def get_test_name(node_id: str) -> str:
-    # Test item name is usually function name, but when parametrization is used,
-    # parameters are also part of the name. Some functions have very long parameter
-    # names (tx hashes etc) that run out of maximum allowable filename length, so
-    # we limit the name to first 100 chars. This is not a problem with txhashes.
-    new_name = node_id.replace("tests/device_tests/", "")
-    # remove ::TestClass:: if present because it is usually the same as the test file name
-    new_name = re.sub(r"::.*?::", "-", new_name)
-    new_name = new_name.replace("/", "-")  # in case there is "/"
-    if len(new_name) <= 100:
-        return new_name
-    return new_name[:91] + "-" + hashlib.sha256(new_name.encode()).hexdigest()[:8]
-
-
-def _process_recorded(screen_path: Path, test_name: str) -> None:
+def _process_recorded(result: TestResult) -> None:
     # calculate hash
-    actual_hash = _hash_files(screen_path)
-    FILE_HASHES[test_name] = actual_hash
-    ACTUAL_HASHES[test_name] = actual_hash
-    _rename_records(screen_path)
-    testreport.recorded(screen_path, test_name, actual_hash)
+    result.store_recorded()
+    testreport.recorded(result)
 
 
-def _rename_records(screen_path: Path) -> None:
-    # rename screenshots
-    for index, record in enumerate(sorted(screen_path.iterdir())):
-        record.replace(screen_path / f"{index:08}.png")
-
-
-def _hash_files(path: Path) -> str:
-    files = path.iterdir()
-    hasher = hashlib.sha256()
-    for file in sorted(files):
-        hasher.update(_get_bytes_from_png(str(file)))
-
-    return hasher.digest().hex()
-
-
-def _get_bytes_from_png(png_file: str) -> bytes:
-    """Decode a PNG file into bytes representing all the pixels.
-
-    Is necessary because Linux and Mac are using different PNG encoding libraries,
-    and we need the file hashes to be the same on both platforms.
-    """
-    return Image.open(png_file).tobytes()
-
-
-def _process_tested(fixture_test_path: Path, test_name: str) -> None:
-    actual_path = fixture_test_path / "actual"
-    actual_hash = _hash_files(actual_path)
-    ACTUAL_HASHES[test_name] = actual_hash
-
-    _rename_records(actual_path)
-
-    expected_hash = FILE_HASHES.get(test_name)
-    if expected_hash is None:
-        pytest.fail(f"Hash of {test_name} not found in fixtures.json")
-
-    if actual_hash != expected_hash:
-        assert expected_hash is not None
-        file_path = testreport.failed(
-            fixture_test_path, test_name, actual_hash, expected_hash
-        )
-
+def _process_tested(result: TestResult) -> None:
+    if result.expected_hash is None:
+        file_path = testreport.missing(result)
         pytest.fail(
-            f"Hash of {test_name} differs.\n"
-            f"Expected:  {expected_hash}\n"
-            f"Actual:    {actual_hash}\n"
+            f"Hash of {result.test.id} not found in fixtures.json\n"
+            f"Expected:  {result.expected_hash}\n"
+            f"Actual:    {result.actual_hash}\n"
+            f"Diff file: {file_path}"
+        )
+    elif result.actual_hash != result.expected_hash:
+        file_path = testreport.failed(result)
+        pytest.fail(
+            f"Hash of {result.test.id} differs\n"
+            f"Expected:  {result.expected_hash}\n"
+            f"Actual:    {result.actual_hash}\n"
             f"Diff file: {file_path}"
         )
     else:
-        testreport.passed(fixture_test_path, test_name, actual_hash)
-
-
-def get_last_call_test_result(request: pytest.FixtureRequest) -> Optional[bool]:
-    # if test did not finish, e.g. interrupted by Ctrl+C, the pytest_runtest_makereport
-    # did not create the attribute we need
-    if not hasattr(request.node, "rep_call"):
-        return None
-
-    return request.node.rep_call.passed
+        testreport.passed(result)
 
 
 @contextmanager
@@ -116,107 +48,151 @@ def screen_recording(
     client: Client, request: pytest.FixtureRequest
 ) -> Generator[None, None, None]:
     test_ui = request.config.getoption("ui")
-    test_name = get_test_name(request.node.nodeid)
+    if not test_ui:
+        yield
+        return
 
-    # Differentiating test names between T1 and TT
-    # Making the model global for other functions
-    global MODEL
-    MODEL = f"T{client.features.model}"
+    record_text_layout = request.config.getoption("record_text_layout")
 
-    test_name = f"{MODEL}_{test_name}"
+    testcase = TestCase.build(client, request)
+    testcase.dir.mkdir(exist_ok=True, parents=True)
 
-    screens_test_path = SCREENS_DIR / test_name
-
-    if test_ui == "record":
-        screen_path = screens_test_path / "recorded"
-    else:
-        screen_path = screens_test_path / "actual"
-
-    if not screens_test_path.exists():
-        screens_test_path.mkdir()
     # remove previous files
-    shutil.rmtree(screen_path, ignore_errors=True)
-    screen_path.mkdir()
+    shutil.rmtree(testcase.actual_dir, ignore_errors=True)
+    testcase.actual_dir.mkdir()
 
     try:
-        client.debug.start_recording(str(screen_path))
+        client.debug.start_recording(str(testcase.actual_dir))
+        if record_text_layout:
+            client.debug.set_screen_text_file(testcase.screen_text_file)
+            client.debug.watch_layout(True)
         yield
     finally:
+        client.ensure_open()
         # Wait for response to Initialize, which gives the emulator time to catch up
         # and redraw the homescreen. Otherwise there's a race condition between that
         # and stopping recording.
+        if record_text_layout:
+            client.debug.set_screen_text_file(None)
+            client.debug.watch_layout(False)
         client.init_device()
         client.debug.stop_recording()
 
-    if test_ui:
-        PROCESSED.add(test_name)
-        if get_last_call_test_result(request) is False:
-            FAILED_TESTS.add(test_name)
-
-        if test_ui == "record":
-            _process_recorded(screen_path, test_name)
-        else:
-            _process_tested(screens_test_path, test_name)
-
-
-def list_missing() -> Set[str]:
-    # Only listing the ones for the current model
-    relevant_cases = {
-        case for case in FILE_HASHES.keys() if case.startswith(f"{MODEL}_")
-    }
-    return relevant_cases - PROCESSED
-
-
-def read_fixtures() -> None:
-    if not HASH_FILE.exists():
-        raise ValueError("File fixtures.json not found.")
-    global FILE_HASHES
-    FILE_HASHES = json.loads(HASH_FILE.read_text())
-
-
-def write_fixtures(remove_missing: bool) -> None:
-    HASH_FILE.write_text(_get_fixtures_content(FILE_HASHES, remove_missing))
-
-
-def write_fixtures_suggestion(
-    remove_missing: bool, only_passed_tests: bool = False
-) -> None:
-    SUGGESTION_FILE.write_text(
-        _get_fixtures_content(ACTUAL_HASHES, remove_missing, only_passed_tests)
-    )
-
-
-def _get_fixtures_content(
-    fixtures: Dict[str, str], remove_missing: bool, only_passed_tests: bool = False
-) -> str:
-    if remove_missing:
-        # Not removing the ones for different model
-        nonrelevant_cases = {
-            f: h for f, h in FILE_HASHES.items() if not f.startswith(f"{MODEL}_")
-        }
-
-        filtered_processed_tests = PROCESSED
-        if only_passed_tests:
-            filtered_processed_tests = PROCESSED - FAILED_TESTS
-
-        processed_fixtures = {i: fixtures[i] for i in filtered_processed_tests}
-        fixtures = {**nonrelevant_cases, **processed_fixtures}
+    result = testcase.build_result(request)
+    if test_ui == "record":
+        _process_recorded(result)
     else:
-        fixtures = fixtures
+        _process_tested(result)
 
-    return json.dumps(fixtures, indent="", sort_keys=True) + "\n"
+
+def setup(main_runner: bool) -> None:
+    # clear metadata and "actual" recordings before current run, keep "recorded" around
+    if main_runner:
+        for meta in SCREENS_DIR.glob("*/metadata.json"):
+            meta.unlink()
+            shutil.rmtree(meta.parent / "actual", ignore_errors=True)
+
+    # clear testreport
+    testreport.setup(main_runner)
+
+
+def list_missing() -> set[str]:
+    # Only listing the ones for the current model
+    _, missing = common.prepare_fixtures(
+        TestResult.recent_results(), remove_missing=True
+    )
+    return {test.id for test in missing}
+
+
+def update_fixtures(remove_missing: bool = False) -> int:
+    """Update the fixtures.json file with the actual hashes from the latest run.
+
+    Used in --ui=record and in update_fixtures.py
+    """
+    results = list(TestResult.recent_results())
+    for result in results:
+        result.store_recorded()
+
+    common.write_fixtures(results, remove_missing=remove_missing)
+    return len(results)
+
+
+def _should_write_ui_report(exitstatus: pytest.ExitCode) -> bool:
+    # generate UI report and check missing only if pytest is exitting cleanly
+    # I.e., the test suite passed or failed (as opposed to ctrl+c break, internal error,
+    # etc.)
+    return exitstatus in (pytest.ExitCode.OK, pytest.ExitCode.TESTS_FAILED)
+
+
+def terminal_summary(
+    println: Callable[[str], None],
+    ui_option: str,
+    check_missing: bool,
+    exitstatus: pytest.ExitCode,
+) -> None:
+    println("")
+
+    normal_exit = _should_write_ui_report(exitstatus)
+    missing_tests = list_missing()
+    if ui_option and normal_exit and missing_tests:
+        println(f"{len(missing_tests)} expected UI tests did not run.")
+        if check_missing:
+            println("-------- List of missing tests follows: --------")
+            for test in missing_tests:
+                println("\t" + test)
+
+            if ui_option == "test":
+                println("UI test failed.")
+            elif ui_option == "record":
+                println("Removing missing tests from record.")
+            println("")
+
+    if ui_option == "record" and exitstatus != pytest.ExitCode.OK:
+        println(
+            "\n-------- WARNING! Recording to fixtures.json was disabled due to failed tests. --------"
+        )
+        println("")
+
+    if normal_exit:
+        println("-------- UI tests summary: --------")
+        println("Run ./tests/show_results.py to open test summary")
+        println("")
+
+        println("-------- Accepting all recent UI changes: --------")
+        println("Run ./tests/update_fixtures.py to apply all changes")
+        println("")
+
+
+def sessionfinish(
+    exitstatus: pytest.ExitCode,
+    test_ui: str,
+    check_missing: bool,
+    record_text_layout: bool,
+) -> pytest.ExitCode:
+    if not _should_write_ui_report(exitstatus):
+        return exitstatus
+
+    testreport.generate_reports(record_text_layout)
+    if test_ui == "test" and check_missing and list_missing():
+        common.write_fixtures(
+            TestResult.recent_results(),
+            remove_missing=True,
+            dest=FIXTURES_SUGGESTION_FILE,
+        )
+        return pytest.ExitCode.TESTS_FAILED
+
+    if test_ui == "record" and exitstatus == pytest.ExitCode.OK:
+        update_fixtures(check_missing)
+
+    return exitstatus
 
 
 def main() -> None:
-    read_fixtures()
-    for record in SCREENS_DIR.iterdir():
-        if not (record / "actual").exists():
-            continue
-
+    for result in TestResult.recent_results():
         try:
-            _process_tested(record, record.name)
-            print("PASSED:", record.name)
+            _process_tested(result)
+            print("PASSED:", result.test.id)
         except Failed:
-            print("FAILED:", record.name)
+            print("FAILED:", result.test.id)
 
     testreport.generate_reports()
diff --git a/tests/ui_tests/common.py b/tests/ui_tests/common.py
new file mode 100644
index 0000000000..1950806f41
--- /dev/null
+++ b/tests/ui_tests/common.py
@@ -0,0 +1,322 @@
+from __future__ import annotations
+
+import hashlib
+import json
+import re
+import shutil
+import typing as t
+import warnings
+from copy import deepcopy
+from dataclasses import asdict, dataclass, field
+from difflib import SequenceMatcher
+from functools import cached_property
+from itertools import zip_longest
+from pathlib import Path
+
+import pytest
+from PIL import Image
+from typing_extensions import Self
+
+from trezorlib.debuglink import TrezorClientDebugLink as Client
+
+UI_TESTS_DIR = Path(__file__).resolve().parent
+SCREENS_DIR = UI_TESTS_DIR / "screens"
+IMAGES_DIR = SCREENS_DIR / "all_images"
+FIXTURES_FILE = UI_TESTS_DIR / "fixtures.json"
+
+# fixtures.json are structured as follows:
+# {
+#   "model": {
+#     "group": {
+#       "test_name": "hash",
+#       ...
+#  }}}...
+# IOW, FixturesType = dict[<model>, dict[<group>, dict[<test_name>, <hash>]]]
+FixturesType = t.NewType("FixturesType", "dict[str, dict[str, dict[str, str]]]")
+
+FIXTURES: FixturesType = FixturesType({})
+
+
+def get_fixtures() -> FixturesType:
+    global FIXTURES
+    if not FIXTURES and FIXTURES_FILE.exists():
+        FIXTURES = FixturesType(json.loads(FIXTURES_FILE.read_text()))
+
+    return FIXTURES
+
+
+def prepare_fixtures(
+    results: t.Iterable[TestResult],
+    remove_missing: bool = False,
+) -> tuple[FixturesType, set[TestCase]]:
+    """Prepare contents of fixtures.json"""
+    # set up brand new contents
+    grouped_tests: dict[tuple[str, str], dict[str, str]] = {}
+    for result in results:
+        idx = result.test.model, result.test.group
+        group = grouped_tests.setdefault(idx, {})
+        group[result.test.fixtures_name] = result.actual_hash
+
+    missing_tests: set[TestCase] = set()
+
+    # merge with previous fixtures
+    fixtures = deepcopy(get_fixtures())
+    for (model, group), new_content in grouped_tests.items():
+        # for every model/group, update the data with the new content
+        current_content = fixtures.setdefault(model, {}).setdefault(group, {})
+        if remove_missing:
+            new_tests = set(new_content.keys())
+            old_tests = set(current_content.keys())
+            missing_tests |= {
+                TestCase(model, group, test) for test in old_tests - new_tests
+            }
+            current_content.clear()
+
+        current_content.update(new_content)
+
+    return fixtures, missing_tests
+
+
+def write_fixtures(
+    results: t.Iterable[TestResult],
+    remove_missing: bool = False,
+    dest: Path = FIXTURES_FILE,
+) -> None:
+    global FIXTURES
+    content, _ = prepare_fixtures(results, remove_missing)
+    FIXTURES = FixturesType(content)
+    dest.write_text(json.dumps(content, indent=0, sort_keys=True) + "\n")
+
+
+def _rename_records(screen_path: Path) -> None:
+    IMAGES_DIR.mkdir(exist_ok=True)
+    # rename screenshots
+    for index, record in enumerate(sorted(screen_path.iterdir())):
+        record.replace(screen_path / f"{index:08}.png")
+
+
+def screens_and_hashes(screen_path: Path) -> tuple[list[Path], list[str]]:
+    if not screen_path.exists():
+        return [], []
+
+    paths: list[Path] = []
+    hashes: list[str] = []
+    for file in sorted(screen_path.iterdir()):
+        paths.append(file)
+        hashes.append(_get_image_hash(file))
+    return paths, hashes
+
+
+def _get_image_hash(png_file: Path) -> str:
+    return hashlib.sha256(_get_bytes_from_png(png_file)).hexdigest()
+
+
+def _get_bytes_from_png(png_file: Path) -> bytes:
+    """Decode a PNG file into bytes representing all the pixels.
+
+    Is necessary because Linux and Mac are using different PNG encoding libraries,
+    and we need the file hashes to be the same on both platforms.
+    """
+    return Image.open(str(png_file)).tobytes()
+
+
+def _hash_files(path: Path) -> str:
+    files = path.iterdir()
+    hasher = hashlib.sha256()
+    for file in sorted(files):
+        hasher.update(_get_bytes_from_png(file))
+
+    return hasher.digest().hex()
+
+
+def get_last_call_test_result(request: pytest.FixtureRequest) -> bool | None:
+    # if test did not finish, e.g. interrupted by Ctrl+C, the pytest_runtest_makereport
+    # did not create the attribute we need
+    if not hasattr(request.node, "rep_call"):
+        return None
+
+    return request.node.rep_call.passed  # type: ignore
+
+
+def _get_test_name_and_group(node_id: str) -> tuple[str, str]:
+    test_path, func_id = node_id.split("::", maxsplit=1)
+    assert test_path.endswith(".py")
+
+    # tests / device_tests / bitcoin / test_signtx.py
+    _tests, group_name, *path_in_group = test_path.split("/")
+
+    # remove ::TestClass:: if present because it is usually the same as the test file name
+    func_id = re.sub(r"::.*?::", "-", func_id)
+
+    test_path_prefix = "-".join(path_in_group)
+    new_name = f"{test_path_prefix}::{func_id}"
+    new_name = new_name.replace("/", "-")
+    # Test item name is usually function name, but when parametrization is used,
+    # parameters are also part of the name. Some functions have very long parameter
+    # names (tx hashes etc) that run out of maximum allowable filename length, so
+    # we limit the name to first 100 chars. This is not a problem with txhashes.
+    if len(new_name) <= 100:
+        return new_name, group_name
+
+    differentiator = hashlib.sha256(new_name.encode()).hexdigest()
+    shortened_name = new_name[:91] + "-" + differentiator[:8]
+    return shortened_name, group_name
+
+
+def screens_diff(
+    expected_hashes: list[str], actual_hashes: list[str]
+) -> t.Iterator[tuple[str | None, str | None]]:
+    diff = SequenceMatcher(
+        None, expected_hashes, actual_hashes, autojunk=False
+    ).get_opcodes()
+    # Example diff result:
+    # [('equal', 0, 1, 0, 1), ('replace', 1, 2, 1, 3), ('equal', 2, 6, 3, 7)]
+    # For situation when:
+    # - first screen is the same for both
+    # - second screen has changes and there is new third screen
+    # - rest is the same
+    for _tag, i1, i2, j1, j2 in diff:
+        # tag is one of "replace", "delete", "equal", "insert"
+        # i1, i2 and j1, j2 are slice indexes for expected/actual respectively
+        # The output of get_opcodes is an ordered sequence of instructions
+        # for converting expected to actual. By taking the subslices and zipping
+        # together, we get the equal subsequences aligned and Nones at deletion
+        # or insertion points.
+        expected_slice = expected_hashes[i1:i2]
+        actual_slice = actual_hashes[j1:j2]
+        yield from zip_longest(expected_slice, actual_slice, fillvalue=None)
+
+
+@dataclass(frozen=True)
+class TestCase:
+    model: str
+    group: str
+    name: str
+
+    @classmethod
+    def build(cls, client: Client, request: pytest.FixtureRequest) -> Self:
+        name, group = _get_test_name_and_group(request.node.nodeid)
+        return cls(
+            model=f"T{client.features.model}",
+            name=name,
+            group=group,
+        )
+
+    @property
+    def id(self) -> str:
+        return f"{self.model}-{self.group}-{self.name}"
+
+    @property
+    def fixtures_name(self) -> str:
+        return f"{self.model}_{self.name}"
+
+    @property
+    def dir(self) -> Path:
+        return SCREENS_DIR / self.id
+
+    @property
+    def screen_text_file(self) -> Path:
+        return self.dir / "screens.txt"
+
+    @property
+    def actual_dir(self) -> Path:
+        return self.dir / "actual"
+
+    @cached_property
+    def actual_screens(self) -> tuple[list[Path], list[str]]:
+        _rename_records(self.actual_dir)
+        return screens_and_hashes(self.actual_dir)
+
+    @property
+    def recorded_dir(self) -> Path:
+        return self.dir / "recorded"
+
+    @cached_property
+    def recorded_screens(self) -> tuple[list[Path], list[str]]:
+        return screens_and_hashes(self.recorded_dir)
+
+    def build_result(self, request: pytest.FixtureRequest) -> TestResult:
+        _rename_records(self.actual_dir)
+        result = TestResult(
+            test=self,
+            passed=get_last_call_test_result(request),
+            actual_hash=_hash_files(self.actual_dir),
+            images=self.actual_screens[1],
+        )
+        result.save_metadata()
+        return result
+
+
+@dataclass
+class TestResult:
+    test: TestCase
+    passed: bool | None
+    actual_hash: str
+    images: list[str]
+    expected_hash: str | None = field(default=None)
+
+    def __post_init__(self) -> None:
+        if self.expected_hash is None:
+            self.expected_hash = (
+                get_fixtures()
+                .get(self.test.model, {})
+                .get(self.test.group, {})
+                .get(self.test.fixtures_name)
+            )
+
+    def save_metadata(self) -> None:
+        metadata = asdict(self)
+        (self.test.dir / "metadata.json").write_text(
+            json.dumps(metadata, indent=2, sort_keys=True) + "\n"
+        )
+
+    def succeeded_in_ui_comparison(self) -> bool:
+        return self.actual_hash == self.expected_hash
+
+    @classmethod
+    def load(cls, testdir: Path) -> Self:
+        metadata = json.loads((testdir / "metadata.json").read_text())
+        test = TestCase(
+            model=metadata["test"]["model"],
+            group=metadata["test"]["group"],
+            name=metadata["test"]["name"],
+        )
+        return cls(
+            test=test,
+            passed=metadata["passed"],
+            actual_hash=metadata["actual_hash"],
+            expected_hash=metadata["expected_hash"],
+            images=metadata["images"],
+        )
+
+    @classmethod
+    def recent_results(cls) -> t.Iterator[Self]:
+        for testdir in sorted(SCREENS_DIR.iterdir()):
+            meta = testdir / "metadata.json"
+            if not meta.exists():
+                continue
+            yield cls.load(testdir)
+
+    @classmethod
+    def recent_ui_failures(cls) -> t.Iterator[Self]:
+        """Returning just the results that resulted in UI failure."""
+        for result in cls.recent_results():
+            if not result.succeeded_in_ui_comparison():
+                yield result
+
+    def store_recorded(self) -> None:
+        self.expected_hash = self.actual_hash
+        shutil.rmtree(self.test.recorded_dir, ignore_errors=True)
+        shutil.copytree(
+            self.test.actual_dir,
+            self.test.recorded_dir,
+            symlinks=True,
+        )
+
+    def diff_lines(self) -> t.Iterable[tuple[str | None, str | None]]:
+        _, expected_hashes = self.test.recorded_screens
+        if not expected_hashes:
+            warnings.warn("No recorded screens found, is this a new test?")
+        _, actual_hashes = self.test.actual_screens
+
+        return screens_diff(expected_hashes, actual_hashes)
diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json
index af5e524ad5..5998ae0a52 100644
--- a/tests/ui_tests/fixtures.json
+++ b/tests/ui_tests/fixtures.json
@@ -1,4 +1,16 @@
 {
+"T1": {
+"device_tests": {
+"T1_bitcoin-test_authorize_coinjoin.py::test_cancel_authorization": "84d5223f94a7a31dc23d278121c4829f446611582065a67673be3b7d6a5b1274",
+"T1_bitcoin-test_authorize_coinjoin.py::test_get_address": "08338bd37d8fb2d53055b5e749a8bb0bf85b95cf13c78d3d17a4dd75b120e81b",
+"T1_bitcoin-test_authorize_coinjoin.py::test_get_public_key": "1257ec89d4620ed9f34c986cd925717676c9b1e9e143e040c33f1a88d1f8c8a7",
+"T1_bitcoin-test_authorize_coinjoin.py::test_multisession_authorization": "5628b8419edd4c5211aab8af46f146542c605e8e24e6cd79ef0d3b378c98982a",
+"T1_bitcoin-test_authorize_coinjoin.py::test_sign_tx": "0ffc9ee5242b69975c12aa901d47dc80e44c2bbc42f98e12bf35d36adbca70b7",
+"T1_bitcoin-test_authorize_coinjoin.py::test_sign_tx_large": "39ce1d721b7516f90c027c8abf28ebad28dce18b82618764624c93a5e2bf1736",
+"T1_bitcoin-test_authorize_coinjoin.py::test_sign_tx_migration": "3560ac3e7258a710c75827cf6eb0bdf2456d448c3c270b7971eaa0ea94670d3f",
+"T1_bitcoin-test_authorize_coinjoin.py::test_sign_tx_spend": "dd06d17f855486ae857c7d26e19f738e0743cabd2c88d6aad23e5aead1e51ba8",
+"T1_bitcoin-test_authorize_coinjoin.py::test_wrong_account_type": "84d5223f94a7a31dc23d278121c4829f446611582065a67673be3b7d6a5b1274",
+"T1_bitcoin-test_authorize_coinjoin.py::test_wrong_coordinator": "84d5223f94a7a31dc23d278121c4829f446611582065a67673be3b7d6a5b1274",
 "T1_bitcoin-test_bcash.py::test_attack_change_input": "6111e313995d38c3970c92e48047fe4088c83666c64c6c859f69a232ad62829b",
 "T1_bitcoin-test_bcash.py::test_send_bch_change": "6111e313995d38c3970c92e48047fe4088c83666c64c6c859f69a232ad62829b",
 "T1_bitcoin-test_bcash.py::test_send_bch_multisig_change": "0962a2e630e06b6d20282cc241be40f41bc1648d0a26247c7c008f32a197d0cb",
@@ -95,10 +107,18 @@
 "T1_bitcoin-test_getaddress_show.py::test_show[m-44h-0h-12h-0-0-InputScriptType.SPENDADDRESS-1F-1e4f2f74": "9e7c7d751f82daaab09cdc499a41988d8519ffbc1efb6ef23a58e48fc4960787",
 "T1_bitcoin-test_getaddress_show.py::test_show[m-49h-0h-12h-0-0-InputScriptType.SPENDP2SHWITNES-a986211d": "49058bad1db26efc3c7cdafcee64b0b0975ea7eab8de41994217d901c7e4f44c",
 "T1_bitcoin-test_getaddress_show.py::test_show[m-84h-0h-12h-0-0-InputScriptType.SPENDWITNESS-bc-a5f08dfb": "e2fa133ac77b590f7686e2af19483a67dd8354a59bcef78159ca6193eb9c6580",
-"T1_bitcoin-test_getaddress_show.py::test_show[m-86h-0h-12h-0-0-InputScriptType.SPENDTAPROOT-bc-f94d8b44": "ab2f29604a1dc2fcd9f22ba0897ad344f527f82ff4c5d873ee7102eb662e1ab5",
+"T1_bitcoin-test_getaddress_show.py::test_show[m-86h-0h-12h-0-0-InputScriptType.SPENDTAPROOT-bc-f94d8b44": "9cd4081c30d19a596436ec730c6a79483aa1064244d12aa4ec51f4f608c10f49",
 "T1_bitcoin-test_getaddress_show.py::test_show_multisig_15": "40f652d0e899d528605f472f47ec6cb727ced8fe90588a8904b46ed39c2088e8",
 "T1_bitcoin-test_getaddress_show.py::test_show_multisig_3": "05e4e5cd014bf96373788e4563a48f5cdb4c54d358a88e8a29247c2825c5669e",
 "T1_bitcoin-test_getaddress_show.py::test_show_unrecognized_path": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_bitcoin-test_getownershipproof.py::test_attack_ownership_id": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_bitcoin-test_getownershipproof.py::test_confirm_ownership_proof": "7e6fcf4df33bf876103f0f8b547c0bd7e5babd34cfe5be43d62c08fbc67f525b",
+"T1_bitcoin-test_getownershipproof.py::test_confirm_ownership_proof_with_data": "c0c6509ae54e7199cb457ababbc71cdb0ef1c53d535ba4b9fbf59db2cb5171cd",
+"T1_bitcoin-test_getownershipproof.py::test_fake_ownership_id": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_bitcoin-test_getownershipproof.py::test_p2tr_ownership_id": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_bitcoin-test_getownershipproof.py::test_p2tr_ownership_proof": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_bitcoin-test_getownershipproof.py::test_p2wpkh_ownership_id": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_bitcoin-test_getownershipproof.py::test_p2wpkh_ownership_proof": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path0-xpub6BiVtCpG9fQPx-40a56ca3": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path1-xpub6BiVtCpG9fQQR-1abafc98": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path2-xpub6FVDRC1jiWNTu-47a67414": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
@@ -142,8 +162,8 @@
 "T1_bitcoin-test_multisig.py::test_attack_change_input": "d8731108a403d5853de526b27e506d00909603ec0c89d1c20f917ca2ef012ab3",
 "T1_bitcoin-test_multisig.py::test_missing_pubkey": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_bitcoin-test_multisig_change.py::test_external_external": "e4a9c75e35046d5605d3663717ec025e7c7919ce757cdd9df66eba3bd7790d1d",
-"T1_bitcoin-test_multisig_change.py::test_external_internal": "9df8e8259d7b1dab24f0500aa2d39c89fca8f5d034a033e09d44f138971c6bae",
-"T1_bitcoin-test_multisig_change.py::test_internal_external": "97f523da0eee9d16b01d39800b283fce265979ce6906798d948a3cf5f850bb90",
+"T1_bitcoin-test_multisig_change.py::test_external_internal": "c3cc02dc9d002d8f392887248348fce3322f0fea2860d755a08fe5d9f7b21ffc",
+"T1_bitcoin-test_multisig_change.py::test_internal_external": "7a3a1e10b1b14561e2afb63650c1a6273e05232e90bfba15fd0f1bdb131c7d51",
 "T1_bitcoin-test_multisig_change.py::test_multisig_change_match_first": "602f0669af9084a07900170c00699512d1cd4646aba7ddcebf6af05e36eb224b",
 "T1_bitcoin-test_multisig_change.py::test_multisig_change_match_second": "ee110f116e966f842ffc174e3ab55e951aec31b1f0433fc697c9d7aaed3d7060",
 "T1_bitcoin-test_multisig_change.py::test_multisig_external_external": "0c398595da3162afee0f4734a155c0cf8d96b830350b58670b47aba40659e3cc",
@@ -161,6 +181,7 @@
 "T1_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths4-address_index4]": "c245c47efa462d2e6d487d81f131d3ae561c0f30ad90e55b53b48ba8b46ebea1",
 "T1_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths5-address_index5]": "81e4b1b39a135814413c96e9fa4e2639a8ab6b2cb9e945445ee12a99e994b523",
 "T1_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths6-address_index6]": "5d57a31f47490c5738af8136bf9ec8ee9d0db980d1653b9eaedace9d60e74119",
+"T1_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths7-address_index7]": "a28c13fc59443f3745bf794c002718c22ff39815e8961d7af4fbbd90777783b7",
 "T1_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-1195487518-6-255-script_types3]": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-1195487518-script_types2]": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-3h-100h-4-255-script_types1]": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
@@ -183,6 +204,7 @@
 "T1_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths4-address_index4]": "9f11f570c87a5fdf33dcd40fc7042b6beda409561b97d9b6cbe62df4b7979fd7",
 "T1_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths5-address_index5]": "9f11f570c87a5fdf33dcd40fc7042b6beda409561b97d9b6cbe62df4b7979fd7",
 "T1_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths6-address_index6]": "9f11f570c87a5fdf33dcd40fc7042b6beda409561b97d9b6cbe62df4b7979fd7",
+"T1_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths7-address_index7]": "9f11f570c87a5fdf33dcd40fc7042b6beda409561b97d9b6cbe62df4b7979fd7",
 "T1_bitcoin-test_op_return.py::test_nonzero_opreturn": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_bitcoin-test_op_return.py::test_opreturn": "d38174445b68e2119f9d141c071ae7a993f76597f4ca3c5fd8f6a2e1e89aebcf",
 "T1_bitcoin-test_op_return.py::test_opreturn_address": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
@@ -257,7 +279,10 @@
 "T1_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[AmountUnit.SATOSHI]": "177fd9048c7661977db228678f9be74b1e769deb4cec87aa146ef51d20c604a1",
 "T1_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[None]": "f2be7c23251127b50596f1a772a9eb933e0b1cef4c30afbc912930d1413f8694",
 "T1_bitcoin-test_signtx_external.py::test_p2tr_external_unverified": "19e56e826e17f0b5cb5ab26d684dd4d1ef73da2711edc8bef2a086962c1382b0",
+"T1_bitcoin-test_signtx_external.py::test_p2tr_with_proof": "5c2f96acb6e23f1e5698276e697c7afa299454fa12f1b2f6eae8b35490d69f6c",
 "T1_bitcoin-test_signtx_external.py::test_p2wpkh_external_unverified": "6695ba71c171c82c4335db3f70dbb5f861c44141ea0eeea98e295ab6b51da3bb",
+"T1_bitcoin-test_signtx_external.py::test_p2wpkh_with_false_proof": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_bitcoin-test_signtx_external.py::test_p2wpkh_with_proof": "8f55fbd32b618e6373ed0c68dee2b3e275e0fce6ff7502bbb34ab4702238dae7",
 "T1_bitcoin-test_signtx_invalid_path.py::test_attack_path_segwit": "ee152e7534c4dd60f939b7403a8169eb7d1703e3bdab819a575bc80f261212a9",
 "T1_bitcoin-test_signtx_invalid_path.py::test_invalid_path_fail": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_bitcoin-test_signtx_invalid_path.py::test_invalid_path_fail_asap": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
@@ -299,8 +324,8 @@
 "T1_bitcoin-test_signtx_segwit_native.py::test_send_both": "6634ded2c8af78bba59dd7ff2206d15b47f8637471e5b27f47b96df122239509",
 "T1_bitcoin-test_signtx_segwit_native.py::test_send_multisig_1": "b546ea334d8cbf87ea09f44b502a7cbb1be5a6db6180c6fd2046ee413e4ff4bb",
 "T1_bitcoin-test_signtx_segwit_native.py::test_send_multisig_2": "c5827829de525396d4f2e089f08a215a7cffd94883fa5a39fc55fc3f88a81e28",
-"T1_bitcoin-test_signtx_segwit_native.py::test_send_multisig_3_change": "e7a23d38028295e8a4efa6cbf61da5c969125ecc505540e9ba53728494c557de",
-"T1_bitcoin-test_signtx_segwit_native.py::test_send_multisig_4_change": "e6511ebd8b45ea980d5bcffcaf3ea11a133ee4d1e00f2861db17060e37ffdbb2",
+"T1_bitcoin-test_signtx_segwit_native.py::test_send_multisig_3_change": "82b3602530533c35f4e2bdd2af5e6795e4bb75667efcccd13270292c3eb75669",
+"T1_bitcoin-test_signtx_segwit_native.py::test_send_multisig_4_change": "e147ba0984c8ee2d74ce76293315529db61dffd148cf83bf5b50eb0a95fc3e6d",
 "T1_bitcoin-test_signtx_segwit_native.py::test_send_native": "f2be7c23251127b50596f1a772a9eb933e0b1cef4c30afbc912930d1413f8694",
 "T1_bitcoin-test_signtx_segwit_native.py::test_send_native_change": "e84023fa44000c99018eb95e4fd29a423c140f44d3ac9918be0b2854baffc93c",
 "T1_bitcoin-test_signtx_segwit_native.py::test_send_p2sh": "a4177cc812c88b18a3bec937adb2d286107833dcb52096a1bb26652975f93276",
@@ -333,14 +358,14 @@
 "T1_bitcoin-test_zcash.py::test_spend_old_versions": "d86d753fa98cc9a99fd635bb57e14e0cae500cab6199b0ba1d501fa4eca6a63e",
 "T1_bitcoin-test_zcash.py::test_v3_not_supported": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_bitcoin-test_zcash.py::test_version_group_id_missing": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-"T1_ethereum-test_getaddress.py::test_getaddress[ETC]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
-"T1_ethereum-test_getaddress.py::test_getaddress[GoChain]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
-"T1_ethereum-test_getaddress.py::test_getaddress[Ledger Live legacy path]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
-"T1_ethereum-test_getaddress.py::test_getaddress[Wanchain]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
-"T1_ethereum-test_getaddress.py::test_getaddress[parameters0-result0]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
-"T1_ethereum-test_getaddress.py::test_getaddress[parameters1-result1]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
-"T1_ethereum-test_getaddress.py::test_getaddress[parameters2-result2]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
-"T1_ethereum-test_getaddress.py::test_getaddress[parameters3-result3]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
+"T1_ethereum-test_getaddress.py::test_getaddress[ETC]": "efe11a5e9959ba001e33298ec4e00c4f224e325bd41fd713cf01192ac4dfb01a",
+"T1_ethereum-test_getaddress.py::test_getaddress[GoChain]": "1382242f4ee598a076b4ce007d63262a420cb38a0871e4679596ff61f2503197",
+"T1_ethereum-test_getaddress.py::test_getaddress[Ledger Live legacy path]": "16ccd6cf4421b1002d479f9ca633ac1ee8dca0fa3f1339fa66380d14e5109e2a",
+"T1_ethereum-test_getaddress.py::test_getaddress[Wanchain]": "ebaac4910879f20082df6b2755533ecbbd41d60d75bc86f181aa6c740fdba033",
+"T1_ethereum-test_getaddress.py::test_getaddress[parameters0-result0]": "a229f91ee8c13470faa74e086d582032072f8f2e3a38cf5e9941bef634abb626",
+"T1_ethereum-test_getaddress.py::test_getaddress[parameters1-result1]": "5eaa807f7ac37df989696049a1a5e19751f0c32b7541167e88f56a7aff353f42",
+"T1_ethereum-test_getaddress.py::test_getaddress[parameters2-result2]": "d2f4a0194a0dfeb082daec10639c0489ebe30389d7baf1a26dfe20538421592a",
+"T1_ethereum-test_getaddress.py::test_getaddress[parameters3-result3]": "c6323cb37b60ce8effa98da2fbeee0a734d8d3566fe7f2932b55ffee6d146f45",
 "T1_ethereum-test_getpublickey.py::test_ethereum_getpublickey[Ledger Live legacy path]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
 "T1_ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters0-result0]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
 "T1_ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters1-result1]": "37e446e17465ce9823c34c9162d94e4ad3c84faa86bae7966c753be5c5fd77a2",
@@ -362,6 +387,7 @@
 "T1_ethereum-test_sign_verify_message.py::test_signmessage[parameters5-result5]": "a6b54a1244c1c457de732c2d27371475c02e451a4820f283912a5e3c62fe2842",
 "T1_ethereum-test_sign_verify_message.py::test_signmessage[parameters6-result6]": "858c5f14ecf61cbc85acb7d11f85b65a88c3d14f2591f185e1925092a977a7d6",
 "T1_ethereum-test_sign_verify_message.py::test_signmessage[parameters7-result7]": "72795258943a821df0fca67a6e1d915883c414e5066cff8f93d4a5735c0ba45b",
+"T1_ethereum-test_sign_verify_message.py::test_signmessage[parameters8-result8]": "76c51c49c1ae5c4f77e15b9f053d8f27665d25a9866487b69d6eebb6386bf855",
 "T1_ethereum-test_sign_verify_message.py::test_verify[parameters0-result0]": "cdec0f79f2abbd90f4346494037f7bb4dd4dccc7c6739b497873d0c5603f2a26",
 "T1_ethereum-test_sign_verify_message.py::test_verify[parameters1-result1]": "9e51345ff0d3736f81a5c169768f9a80c555187eef2db3046f5ad12262990466",
 "T1_ethereum-test_sign_verify_message.py::test_verify[parameters2-result2]": "e2aff8a36dffd76b0e48256a5012ff191d0ce877a42cf31e1f25f7c3cd786d64",
@@ -381,8 +407,8 @@
 "T1_ethereum-test_signtx.py::test_signtx[Ledger Live legacy path1]": "90feef1fdcd162209a948c127df638c09bee0444fee40f2d30dbff21658d83ef",
 "T1_ethereum-test_signtx.py::test_signtx[Palm]": "9d3f44b5d6089919a9e50c3344e5210bdf4a127db33d91b4eeaf93403acb5578",
 "T1_ethereum-test_signtx.py::test_signtx[Pirl]": "159bb61626157fa11dbd7775d09b95af8b1269432ed83a649a04e700d944aa02",
-"T1_ethereum-test_signtx.py::test_signtx[Rinkeby]": "796c65c23c551065757a839dcac90a67841a12e4a6e520bb2f97e575d3b09368",
-"T1_ethereum-test_signtx.py::test_signtx[Ropsten]": "05db6420b63ecf8b96c61ea206bbc10edeaab5408e72e16e984db2c799ccd778",
+"T1_ethereum-test_signtx.py::test_signtx[Rinkeby]": "937894301354c759d2221ed56286e7df6c6696fa4be3d61846cb3307fd428d21",
+"T1_ethereum-test_signtx.py::test_signtx[Ropsten]": "937894301354c759d2221ed56286e7df6c6696fa4be3d61846cb3307fd428d21",
 "T1_ethereum-test_signtx.py::test_signtx[Unknown_chain_id_eth_path]": "a6e6d63cba839c897e80dc0b7cf5c2263be8ff64a5281a43fca992380cca872b",
 "T1_ethereum-test_signtx.py::test_signtx[Unknown_chain_id_testnet_path]": "a6e6d63cba839c897e80dc0b7cf5c2263be8ff64a5281a43fca992380cca872b",
 "T1_ethereum-test_signtx.py::test_signtx[data_1]": "8b432aba21bc4344814cceaf693e114b9d3e3d6ceb83c3a6af7c3ed0f9b37449",
@@ -401,6 +427,7 @@
 "T1_ethereum-test_signtx.py::test_signtx_eip1559[data_2_bigdata]": "28d2a0d397b4e9865ca8286cc1a3669c3a7d34bb31b430662354bf3ec69d1cc5",
 "T1_ethereum-test_signtx.py::test_signtx_eip1559[known_erc20]": "b8e205a40711e377f2185cec6e085fa2f6a4d5bbc6a03d9cf2758058b6c1e17b",
 "T1_ethereum-test_signtx.py::test_signtx_eip1559[large_chainid]": "5b008a081b4ef9e7b47c9d0c1fc4bb24d729d77841193694232bd2da4a386515",
+"T1_ethereum-test_signtx.py::test_signtx_eip1559[long_fees]": "ae698173acb069ced4d987735e53f8d46197dedb3d4b215c0dc02023ce8e986d",
 "T1_ethereum-test_signtx.py::test_signtx_eip1559[nodata]": "5b008a081b4ef9e7b47c9d0c1fc4bb24d729d77841193694232bd2da4a386515",
 "T1_ethereum-test_signtx.py::test_signtx_eip1559[unknown_erc20]": "548c1f22918351e9cbcc1e16d8ba67bc2e7460b9a92cfc6c8bfa0a2b063e68da",
 "T1_ethereum-test_signtx.py::test_signtx_eip1559_access_list": "f6c5f398d4e80fc8f93cf70e9b10de24b9a968db04dc6ea21b28d1a273f04ca1",
@@ -410,6 +437,12 @@
 "T1_misc-test_cosi.py::test_cosi_sign1": "6990c238036b79368fea1dc1e3e8871d7788322bbee7425d14c53623bc8182e8",
 "T1_misc-test_cosi.py::test_cosi_sign2": "0852e7433ec54a0ace301b683417107a9805095acd954010b665266503a79f36",
 "T1_misc-test_cosi.py::test_cosi_sign3": "d04fca2d97f7117ffc79ae52d192086aba2f9c64e89db27e20a930e9048f1d81",
+"T1_misc-test_cosi.py::test_invalid_path[m-10018-0]": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_misc-test_cosi.py::test_invalid_path[m-1]": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_misc-test_cosi.py::test_invalid_path[m-44h-0h-0h-0-0]": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_misc-test_cosi.py::test_invalid_path[m-44h-60h-0h-0-0]": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_misc-test_cosi.py::test_invalid_path[m-44h-60h-1h]": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_misc-test_cosi.py::test_invalid_path[m-84h-60h-1h-0]": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_misc-test_msg_cipherkeyvalue.py::test_decrypt": "a849d9e11e222d1348ce3135680a2a61ed265692adeba4bd48af2fdc65207e61",
 "T1_misc-test_msg_cipherkeyvalue.py::test_decrypt_badlen": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_misc-test_msg_cipherkeyvalue.py::test_encrypt": "e36d5b5db4b3733c9f484b149c0f966b3dd66e8b54e1b5bccf9da5cca7abed91",
@@ -476,16 +509,16 @@
 "T1_reset_recovery-test_reset_bip39_t1.py::test_reset_device_128": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_reset_recovery-test_reset_bip39_t1.py::test_reset_device_192": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 "T1_reset_recovery-test_reset_bip39_t1.py::test_reset_device_256_pin": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-"T1_stellar-test_stellar.py::test_get_address[parameters0-result0]": "294480ddac6d6e1a6ca470ff8029795de53d256788b38b1fa71cedb8caccf1e6",
-"T1_stellar-test_stellar.py::test_get_address[parameters1-result1]": "7f122e064b1af375d81504649708490d2556ffa8572f26abfc1167b02cab0a41",
-"T1_stellar-test_stellar.py::test_get_address[parameters2-result2]": "cf1eb8120ff50e9a3bc5639c2bb6fc2cd74cf9577a178aebbb48739da16e5f53",
-"T1_stellar-test_stellar.py::test_get_address[parameters3-result3]": "fd1be10f6eece1afcffba01d31d858e6f0906a0a9272a034ab93251992d5d8dd",
-"T1_stellar-test_stellar.py::test_get_address[parameters4-result4]": "434e747b119c808640551292d549066ba295d79756c62d6c90cd26f34cd5714e",
-"T1_stellar-test_stellar.py::test_get_address[parameters5-result5]": "1246b1a3b5ed05702a364ca1b5e32c63135464fb52f58f6b872182bbc8ff7b3e",
-"T1_stellar-test_stellar.py::test_get_address[parameters6-result6]": "23915de29ad1726a570dd08dae760afa1909a9476558d363ed5aa4519eb002df",
-"T1_stellar-test_stellar.py::test_get_address[parameters7-result7]": "b08077a2673f26535c95cdd9ef236484796d337ee3ae55a03bafe7914ae97bfe",
-"T1_stellar-test_stellar.py::test_get_address[parameters8-result8]": "2db2ea7492493c8f0381861ac613a57e1497147f0a68032b868ff3ab8d4591e3",
-"T1_stellar-test_stellar.py::test_get_address[parameters9-result9]": "52c99baadca90d07dda43b4282c399596d9c3bbe9a5879746639dc499d864423",
+"T1_stellar-test_stellar.py::test_get_address[parameters0-result0]": "b004cb1a815072ae3ba9f4aadeeb9d37d3309513e973f7ddeb2ee23a056db726",
+"T1_stellar-test_stellar.py::test_get_address[parameters1-result1]": "101692e06782269486e3f1093fdf03200e0cdce4b4ffc7cc5fc779b80f69d1fc",
+"T1_stellar-test_stellar.py::test_get_address[parameters2-result2]": "508bbd5285d2f3087fa3b872ff053a286630b80beacd0b8b30c8577aa5396c86",
+"T1_stellar-test_stellar.py::test_get_address[parameters3-result3]": "a2b19a4e0337cb47b02c4d79f571a7297ac273f3bd95d3d5886d908fa8313c8c",
+"T1_stellar-test_stellar.py::test_get_address[parameters4-result4]": "0d855560df510dfbb5cdb668fa84e3c6ba10b306c65929a6138d8c07d52f9087",
+"T1_stellar-test_stellar.py::test_get_address[parameters5-result5]": "953bd04ca03df48a1635b944044914676e3d397080d1f86c25a5605ba4c103c2",
+"T1_stellar-test_stellar.py::test_get_address[parameters6-result6]": "42b9120cba355febf542b6f6162c2ef2fe0265270f680802ce0aff1833c152aa",
+"T1_stellar-test_stellar.py::test_get_address[parameters7-result7]": "bd662518d9e136e5eae64e507994f7b74075294634317a38669dd2671001a188",
+"T1_stellar-test_stellar.py::test_get_address[parameters8-result8]": "c03fc37c6a4d2341b0081900b90ffc2faf09a228607d9d6c807efaff8ecc8fde",
+"T1_stellar-test_stellar.py::test_get_address[parameters9-result9]": "9f1f4cae47cb5e9602450d110fd1945dbdb059996955d74067204966c0cc1702",
 "T1_stellar-test_stellar.py::test_sign_tx[StellarAccountMergeOp]": "3f55b35c47b3f0cf896793263006d9bc4089227f21e46e4e68f67386c1c85040",
 "T1_stellar-test_stellar.py::test_sign_tx[StellarAllowTrustOp-allow]": "8fd4d210bda197e57ee660e71158b295dd3f51f8df9a235e245d5a72f54c68e8",
 "T1_stellar-test_stellar.py::test_sign_tx[StellarAllowTrustOp-revoke]": "0834c3ffb6c8a792cfa8146de3641e3a4b95276b9583cd729350aca372528ed8",
@@ -535,6 +568,8 @@
 "T1_test_bip32_speed.py::test_cache": "55f043b3e286b778a02baea8f7c3547208849e2e18f90837bd9374a4a14c5c0b",
 "T1_test_bip32_speed.py::test_private_ckd": "55f043b3e286b778a02baea8f7c3547208849e2e18f90837bd9374a4a14c5c0b",
 "T1_test_bip32_speed.py::test_public_ckd": "55f043b3e286b778a02baea8f7c3547208849e2e18f90837bd9374a4a14c5c0b",
+"T1_test_busy_state.py::test_busy_expiry": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+"T1_test_busy_state.py::test_busy_state": "fe7e762884268cf79e211eeb7c7ed7f85b8364e8bac27bd6790fc300f9a1429c",
 "T1_test_cancel.py::test_cancel_message_via_cancel[message0]": "de7fc40b2f35e82fa486f1b97ee3e34a96d0a67412537e8a0fddacc0b0b1649d",
 "T1_test_cancel.py::test_cancel_message_via_cancel[message1]": "af93b5d0a8ae6b297391a43ff3f6382d0bea1109f4f411f5b306e2e7ced6e814",
 "T1_test_cancel.py::test_cancel_message_via_initialize[message0]": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
@@ -617,1075 +652,1122 @@
 "T1_zcash-test_sign_tx.py::test_spend_multisig": "65533f5073ebf67927f3e14810708650236236cc50aa4078494fc02c5f91ac53",
 "T1_zcash-test_sign_tx.py::test_spend_v4_input": "436b7a43b7fc7fe0615340c6aa73d46a18e5a0d804469702941cea9c8fd9e390",
 "T1_zcash-test_sign_tx.py::test_spend_v5_input": "6d29a8023d4b8b9fa4d170afbbaeb7cf1895906ab74f75c9fcb12a601154b9d5",
-"T1_zcash-test_sign_tx.py::test_version_group_id_missing": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-"TT_binance-test_get_address.py::test_binance_get_address[m-44h-714h-0h-0-0-bnb1hgm0p7khfk85zpz-68e2cb5a": "e2e9e5b8698f4be3557725046942b37bf012ec409a1e98434946eec58db4b2bf",
-"TT_binance-test_get_address.py::test_binance_get_address[m-44h-714h-0h-0-1-bnb1egswqkszzfc2uq7-1adfb691": "c854684b9ebd3a284952d2d87bb8fb35d798a21dc243489e29c39894d3a7d956",
-"TT_binance-test_get_public_key.py::test_binance_get_public_key": "4616d6e80011c92fb50c0126cc6da4d979cdafa945447cfc7860e216c883d609",
-"TT_binance-test_sign_tx.py::test_binance_sign_message[message0-expected_response0]": "8ca1c246358e7220f765f13581e7936d9437684fa9af5ea06b1154fe2d08d2c6",
-"TT_binance-test_sign_tx.py::test_binance_sign_message[message1-expected_response1]": "5ebccd0784190a392c40ff5b96e58ca46aa588e66af02f9a4dfd0584dd467494",
-"TT_binance-test_sign_tx.py::test_binance_sign_message[message2-expected_response2]": "7748d33a502dcf121e2f9016fa2d3a08be9adddf291b140f5c24689efb88bc28",
-"TT_bitcoin-test_authorize_coinjoin.py::test_cancel_authorization": "1028683f41271a604331fc31a539817c327e7b1d9e218502c43a1a737697f5b8",
-"TT_bitcoin-test_authorize_coinjoin.py::test_get_address": "f8109795f7fa910f1c1c87a57e9ac4514da546285bdc378441a2778d2bfb3c02",
-"TT_bitcoin-test_authorize_coinjoin.py::test_get_public_key": "6096153081f06b4c24654068b5035298902ad5b42f687b2871518c561c93aebc",
-"TT_bitcoin-test_authorize_coinjoin.py::test_multisession_authorization": "f61fd1bb79b4a6062387bf49ef913fcd2d10d7f0fd0ddc359a0e94033761be07",
-"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx": "5219897e58b2d6d718bb1f2a6992402244aa9f00355e983bf18099e541c2252b",
-"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx_large": "e9e2ede5ed9c053112aa605fd0d4efb36d70c8ca879371135a7a6d800c9bc853",
-"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx_spend": "39dad2750b06cae3ee822a054625e2b9cde3b5855f8a27b67cb97ea63a09e1a9",
-"TT_bitcoin-test_authorize_coinjoin.py::test_wrong_account_type": "1028683f41271a604331fc31a539817c327e7b1d9e218502c43a1a737697f5b8",
-"TT_bitcoin-test_authorize_coinjoin.py::test_wrong_coordinator": "1028683f41271a604331fc31a539817c327e7b1d9e218502c43a1a737697f5b8",
-"TT_bitcoin-test_bcash.py::test_attack_change_input": "fe14043f36d03f17ec9a908aab33c5acb3ceb2570fe9351e3fa522831e12395f",
-"TT_bitcoin-test_bcash.py::test_send_bch_change": "fe14043f36d03f17ec9a908aab33c5acb3ceb2570fe9351e3fa522831e12395f",
-"TT_bitcoin-test_bcash.py::test_send_bch_external_presigned": "f5fcbf514fb2b86f56eec40ac255caff43ea29e9b00d27fe9ea6fc3674bc60f1",
-"TT_bitcoin-test_bcash.py::test_send_bch_multisig_change": "14ee2b674ba0d0977b8e5d6c1b5ba0c14d7a44966a4baf77fd0ba87045dc97d0",
-"TT_bitcoin-test_bcash.py::test_send_bch_multisig_wrongchange": "66f363c651c7d8e0f48376f369f8d30f47c105ab5f79016282d64c43b74a629b",
-"TT_bitcoin-test_bcash.py::test_send_bch_nochange": "a87a939901355c944f3b293cdef344e3ca82cdcc1d7c17239173be82046b4e24",
-"TT_bitcoin-test_bcash.py::test_send_bch_oldaddr": "fb2d2fb55b4f264e70b0311db78e4011df0e74512b4674cc50972dc911f52bc1",
-"TT_bitcoin-test_bgold.py::test_attack_change_input": "da2412379de5549664cb764a30150691062ac683cea4005e7b042dc0995664d2",
-"TT_bitcoin-test_bgold.py::test_send_bitcoin_gold_change": "da2412379de5549664cb764a30150691062ac683cea4005e7b042dc0995664d2",
-"TT_bitcoin-test_bgold.py::test_send_bitcoin_gold_nochange": "1d3cf9cb8249b25018bf370ed1c146f8d8821e9dbef7ff1108829cd7c58d6cac",
-"TT_bitcoin-test_bgold.py::test_send_btg_external_presigned": "3e755c0a414d6a2c5c006dd994ae8ea3607641a681000ce0d629b4d064f366ed",
-"TT_bitcoin-test_bgold.py::test_send_btg_multisig_change": "81725e92da7fac586fd070dae70f28ef5efd9e43130eede2a11f3ea79a3676cf",
-"TT_bitcoin-test_bgold.py::test_send_mixed_inputs": "68d8d3b9f6a610c2800da8e5ecd5d05478f65dc7270aff07d152dcd50d22890c",
-"TT_bitcoin-test_bgold.py::test_send_multisig_1": "8ef55efc4ce93fe30239e40c4d66a914faf1a1399ae04ae58d9a4809d7e1d2c8",
-"TT_bitcoin-test_bgold.py::test_send_p2sh": "0e4eb079e8baf9423562c82bdbbadf68b7fa97f6581ea756eab7f530f03be9a5",
-"TT_bitcoin-test_bgold.py::test_send_p2sh_witness_change": "e62398e6f5eca82e36fbb02f1e14a9b726fcee8a54863bda78f3abdaa27d6b89",
-"TT_bitcoin-test_dash.py::test_send_dash": "9b6c1133bb55919e80760fec79dc0030d7443cfe5de1c3077faa6998ce3602d9",
-"TT_bitcoin-test_dash.py::test_send_dash_dip2_input": "96139df9b94179ea5192fbba7814f8e6a3b8cdda1469c658cb98fd2b6e1c70ca",
-"TT_bitcoin-test_decred.py::test_decred_multisig_change": "16a4d7dfb66495ff268cf91763ec2ae4c6a739980754bcde5a0eb0b7fbe0d7e0",
-"TT_bitcoin-test_decred.py::test_purchase_ticket_decred": "36a136969249f5e07f992006b0a00f704a8f763ebab3891fb865eb46d48030ac",
-"TT_bitcoin-test_decred.py::test_send_decred": "502a346ad2190af3c8ecd54aac9110cea7afcdadb1ca40c16d324bdb8b102f81",
-"TT_bitcoin-test_decred.py::test_send_decred_change": "9174cc2a4383c5f3d6d45601a2de8fa83a5bd825c5049f4c6adfb08634370038",
-"TT_bitcoin-test_decred.py::test_spend_from_stake_generation_and_revocation_decred": "83b4f27318e17dac80591dcd475568849a22c1ca618a8c32a5543d6efb63e7aa",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDADDRESS-pkh([5-7a80e3db": "ad04cac909e9625ff43c87a71879620f024cd389e0454654d5f56a267369bca4",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDP2SHWITNESS-sh-03d56ac2": "e2e1c5825a8931c4b9cf2ae592c7e4bedb194914ee2e4433a6d19c8f82e06acf",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDTAPROOT-tr([5c-22751b2f": "061e1fd9cb4b861a3e51a593208c9587b073cc977e31dd2705dbee388bdcf9de",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDWITNESS-wpkh([-edfbc435": "d3394d0e46d9aba2811a8a8fea275dcbe0254754e8b7d2cb8edc825998363b4c",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDADDRESS-pkh([5-5ab06094": "8a6d12781781ebefbc031abd63eba8918b2f7ab183a01c07a132103f605e4807",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDP2SHWITNESS-sh-5dd6ae4b": "2b0c8f58bb7c62525d3bfaea1e78f13c98b4ad57a8be7b00880d95f4d8c5c3a7",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDTAPROOT-tr([5c-f4f20781": "88f6839d3c490ed4408e1cb4e71ec5f99afe50d0343b552d623c725ed7059c53",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDWITNESS-wpkh([-98a75f0a": "c676fe04617702f372026a4fabe0fa9fd50021c0c9ec184977e2fb201f1bb9e2",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDADDRESS-pkh([5-f63bf93f": "e54e2640b99959014baa589cd8e1726edffc2ad22de29b1abadbdc75db56c8cc",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDP2SHWITNESS-sh-fd42e1d9": "e2c56eaa4c79889c7d71b5510737654b047559ea56a67a101602b39cfc5928d3",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDTAPROOT-tr([5c-a794e72a": "13fa07dbb64d13b37570ede94a641670709f497eaca3e2bd9a35ed13585fb6a7",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDWITNESS-wpkh([-e70d0168": "027347d96980aa4b681054361c6aedf8903802e71f7383733b9e7352b1c3513f",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDADDRESS-pkh([5-2d5b32fe": "2552f937ff128ef67510be8e8234ed7bd883f88995a0cc55bc7874401cedf040",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDP2SHWITNESS-sh-e8c5303c": "96b14ce63d45712604c22c5f668b33903486bc0d50a6bc09e45871a2c742b42d",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDTAPROOT-tr([5c-ddc924d3": "7200647c4e7cc4166f162c46f0a05f7c509b0ec34748320804f5d1880067c670",
-"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDWITNESS-wpkh([-996ae319": "b39da1de17911b1c83ec0a3b313a9d3548b7322e2164a5bef9958dfc387755e2",
-"TT_bitcoin-test_firo.py::test_spend_lelantus": "04cc7695f552c2518e4f107c26ae672b706edeffefc37e47b1b2fd422e4f1ba2",
-"TT_bitcoin-test_fujicoin.py::test_send_p2tr": "9aa62165c4441aa85a041c875c4e4f95714fca5537e88e74901201c7d3a2d429",
-"TT_bitcoin-test_getaddress.py::test_address_mac": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_altcoin_address_mac": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_bch": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_bch_multisig": "b0b14a464274baae593a7bdaad52c972d66818623edd40545f8af5229286d687",
-"TT_bitcoin-test_getaddress.py::test_btc": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_crw": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_elements": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_grs": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_invalid_path": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_ltc": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_multisig": "775da58ea1dd7fbc69d646829bba219b6941ca456954f2dbc53ae501418ba008",
-"TT_bitcoin-test_getaddress.py::test_multisig_missing[False]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_multisig_missing[True]": "4616765b5066ef989e12e8fe14618c2340e203f13691a2e9ad56428342b11e4d",
-"TT_bitcoin-test_getaddress.py::test_public_ckd": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_tbtc": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_tgrs": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress.py::test_unknown_path": "56e8cf348e0410f4f88c5bd2925e0a1523d4b34d19997857d0c004825da2d8a5",
-"TT_bitcoin-test_getaddress_segwit.py::test_multisig_missing[False]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit.py::test_multisig_missing[True]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit.py::test_show_multisig_3": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit.py::test_show_segwit": "bfff8a228fc61dd516cb781bfc14737f7158dd7ef51d898aa5c0c683763025f2",
-"TT_bitcoin-test_getaddress_segwit.py::test_show_segwit_altcoin": "1566142663052f8e9472cb60c213315deeb470d3a500b1a2f0a492387bf61288",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_bip86[m-86h-0h-0h-0-0-bc1p5cyxnuxmeuwuvkwfem-dc12f29f": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_bip86[m-86h-0h-0h-0-1-bc1p4qhjn9zdvkux4e44uh-1f521bf2": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_bip86[m-86h-0h-0h-1-0-bc1p3qkhfews2uk44qtvau-d8b57624": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_multisig_missing[False]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_multisig_missing[True]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_multisig_3": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-84h-0h-0h-0-0-InputScr-6bc4ffc3": "d8658c1a6b942fa188ae9c8b892a84d34496b42a045f33e59381d767e23d4553",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-84h-0h-0h-0-0-InputScr-8943c1dc": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-84h-0h-0h-1-0-InputScr-016718c1": "3d2bf6b04b1e1dda1470d9eeba0ca9f0be3da31b4aa78f7ed30d1fe64b23b542",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-84h-0h-0h-1-0-InputScr-7656a4db": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-86h-0h-0h-0-0-InputScr-3d3cc8eb": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-86h-0h-0h-0-0-InputScr-8571d5e0": "d6fc2531a9650b7861e525dfa2143164c0e067d9ec568a485773602cadf65784",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-86h-0h-0h-1-0-InputScr-ab700de2": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-86h-0h-0h-1-0-InputScr-da3803e0": "827f45eac35ef79aa1d829e5050a947c7571a181111086c77a06ae0f653847ef",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Elements-m-84h-1h-0h-0-0-InputSc-490228be": "840cf5e2bf5622dfb99cbf65ec9df735c27ce56b63f397c538186d4c77484ea5",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Elements-m-84h-1h-0h-0-0-InputSc-ed587e90": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-84h-1h-0h--40b95144": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-84h-1h-0h--45b4ff5d": "e24dab05d43f9809bfc5b49fb80e2a042be0bb69a9f062db88ae42ea1522d889",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-84h-1h-0h--8f7c658b": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-84h-1h-0h--93c9c3ff": "47f8390cd2b1d1abc7bc241bd1efa6d96140eba395a1ad8dbdb88ee9fca9b2ba",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-86h-1h-0h--5feb8c64": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-86h-1h-0h--8d4476a1": "7831f223332401208a9cdd43328744c4711e384dc79a9969b5d0f5c6c24652f0",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-84h-17h-0h-0-0-Inp-0200a67b": "9dd78bdaae84045ea6c6ffc2706dca4b8dd4648449ab2277c788a65e8f8c5ed9",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-84h-17h-0h-0-0-Inp-e6c1098a": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-84h-17h-0h-1-0-Inp-9688a507": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-84h-17h-0h-1-0-Inp-f825f217": "1b2e170183613c2e1af97a7c01a4b291c7c4632940631879d5f91150e59847ab",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-86h-17h-0h-0-0-Inp-38cd93cf": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-86h-17h-0h-0-0-Inp-ebecce6e": "6d7dbdb912d007df4c7485cea16ef970f1d93fb83f90cf9104ff37cacf88263a",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-84h-1h-0h-0-0-InputScr-313b9443": "baa0b32a9b54b97b87308c4311f209318e8b1fe00e81067c4f124a4d9db2320f",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-84h-1h-0h-0-0-InputScr-ce15ec92": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-84h-1h-0h-1-0-InputScr-040186c0": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-84h-1h-0h-1-0-InputScr-b10918be": "908ec9db91b33cf15bdc5092dd832611aafd25f19bb64d2e69f3cd16a70a0ee4",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-0-0-InputScr-55ae0ae6": "75f95307b80e927084442b79ad5289e1b97df881d42156594a7ce7eaafc0c5aa",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-0-0-InputScr-821a199d": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-1-0-InputScr-9d2fa8bc": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-1-0-InputScr-d5b7f8fc": "65c77f722a6254749ad745926679a940888e1a827ab450dc201f8b7dd959c2f5",
-"TT_bitcoin-test_getaddress_show.py::test_show[m-44h-0h-12h-0-0-InputScriptType.SPENDADDRESS-1F-1e4f2f74": "f26353256ca30eb2999e808550af8c227fd22c287ef4dad40ff2d2dcad399d44",
-"TT_bitcoin-test_getaddress_show.py::test_show[m-49h-0h-12h-0-0-InputScriptType.SPENDP2SHWITNES-a986211d": "7b8015c2e9f0111f57a63fc06c0dfc9352335a0c6889adffca310da10a72d42d",
-"TT_bitcoin-test_getaddress_show.py::test_show[m-84h-0h-12h-0-0-InputScriptType.SPENDWITNESS-bc-a5f08dfb": "aa478b62783b5f6fbdfdee2989ae627d17dcb38162e36e35c824be0d40a3bba7",
-"TT_bitcoin-test_getaddress_show.py::test_show[m-86h-0h-12h-0-0-InputScriptType.SPENDTAPROOT-bc-f94d8b44": "933f478127a23d0d486258efad53b2243b03c0bdf27a2e851e6ca10cebc8db20",
-"TT_bitcoin-test_getaddress_show.py::test_show_multisig_15": "18a5fbf653c39d95a186df071cc13fe77fcd0ad5470502fa1ddfba6fd093e7f3",
-"TT_bitcoin-test_getaddress_show.py::test_show_multisig_3": "a0d1e2f4008da3a1a059d149c4a53a087a782a2044921785277c52f7a951c98c",
-"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-4efd9cf3": "8f98018dd187d0c7c1c40a39c028f27d11708e863b75ad154575ca52a64dc9e6",
-"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-98a7e339": "8f98018dd187d0c7c1c40a39c028f27d11708e863b75ad154575ca52a64dc9e6",
-"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--2cf5f03c": "fd4e5839208ca1e0c1c7e86fbb244a149917b2092fbc78a30ab4954a9fe4dd17",
-"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--5ea18367": "6d5c070d8eb9c407085d7060cffae1fdacd19ed6c8fd6d32f2e0cec549aac64a",
-"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-e70b56ea": "abc1f7a3211e875a7d77cd8fc2993b8babee92b52445d111b87dac1abe71e069",
-"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-f3c4650f": "01303f6e4d0bdfd643a4b00dbf5b5aa7737cee98821d29a827914e3966ec8fd0",
-"TT_bitcoin-test_getaddress_show.py::test_show_unrecognized_path": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getownershipproof.py::test_attack_ownership_id": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getownershipproof.py::test_confirm_ownership_proof": "0f64de87278eb016e573ece582e7dea2e1af187436f7f6bfd36a3993b0f37553",
-"TT_bitcoin-test_getownershipproof.py::test_confirm_ownership_proof_with_data": "6848c05ef24f0101b0dcda0c376fc4d00c122c1c5523a75e4ba6a6fc41b7dc18",
-"TT_bitcoin-test_getownershipproof.py::test_fake_ownership_id": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getownershipproof.py::test_p2tr_ownership_id": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getownershipproof.py::test_p2tr_ownership_proof": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getownershipproof.py::test_p2wpkh_ownership_id": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getownershipproof.py::test_p2wpkh_ownership_proof": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path0-xpub6BiVtCpG9fQPx-40a56ca3": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path1-xpub6BiVtCpG9fQQR-1abafc98": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path2-xpub6FVDRC1jiWNTu-47a67414": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path3-xpub6GhTNegKCjTqj-990e0830": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path6-xpub68Zyu13qjcQvJ-8285bd20": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Litecoin-27108450-path10-Ltub2dcb6Nghj3k-53e5db37": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Litecoin-27108450-path7-Ltub2Y8PyEMWQVgi-d0bb059c": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Litecoin-27108450-path8-Ltub2Y8PyEMWQVgi-98ae2c41": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Litecoin-27108450-path9-Ltub2dTvwC4v7GNe-8d6d95fb": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Testnet-70617039-path4-tpubDDKn3FtHc74Ca-f3b70aff": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_get_public_node[Testnet-70617039-path5-tpubDGwNSs8z8jZU2-8b5efa13": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_invalid_path[Bcash-path5]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_invalid_path[Bitcoin-path0]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_invalid_path[Bitcoin-path2]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_invalid_path[Bitcoin-path3]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_invalid_path[Litecoin-path4]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_invalid_path[Testnet-path1]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_script_type[InputScriptType.SPENDADDRESS-xpub6BiVtCp7ozs-9813cc48": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_script_type[InputScriptType.SPENDP2SHWITNESS-ypub6WYmBsV-0710fbb3": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_script_type[InputScriptType.SPENDWITNESS-zpub6qP2VY9x7Mx-84eaa56c": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_script_type[None-xpub6BiVtCp7ozsRo7kaoYNrCNAVJwPYTQHjoXF-c37a47fd": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey.py::test_slip25_path": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey_curve.py::test_coin_and_curve": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey_curve.py::test_ed25519_public": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey_curve.py::test_publickey_curve[ed25519-path4-002e28dc0346d6d30d4e-e6c7a440": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey_curve.py::test_publickey_curve[nist256p1-path2-0324c6860c25cdf7a8-d75f4900": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey_curve.py::test_publickey_curve[nist256p1-path3-03b93f7e6c777143ad-2d6b178b": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey_curve.py::test_publickey_curve[secp256k1-path0-02f65ce170451f66f4-9c982c22": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_getpublickey_curve.py::test_publickey_curve[secp256k1-path1-0212f4629f4f224db0-0209bb73": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_grs.py::test_legacy": "dcfabfd5151b17754b652ecec503c165679f2bda669e18de9a59cd58b879757b",
-"TT_bitcoin-test_grs.py::test_legacy_change": "aa3e3454bff80c653aef5c199ea3c879af83a83471728f9bfa7777ebced140eb",
-"TT_bitcoin-test_grs.py::test_send_p2tr": "31e0b74e3b0ea80b70d8220943a737ef079bfbdf3eca5facc5bd8fd3c13d7af3",
-"TT_bitcoin-test_grs.py::test_send_segwit_native": "a2e1ed81bb2524d20910bed8ff7eaa702fca325c5d6cd717875bc1da67f389d7",
-"TT_bitcoin-test_grs.py::test_send_segwit_native_change": "a93824baff74a2cc7c34bfdd43a03419e55c7778ec18ebbbcf3f129414a21e23",
-"TT_bitcoin-test_grs.py::test_send_segwit_p2sh": "0b3d5e4920f98b0f8230667ac50adb04e79aa26d1ac588f5159c334007efe793",
-"TT_bitcoin-test_grs.py::test_send_segwit_p2sh_change": "67cd99a325314f9ef9ecfb954ed9e4cf0c109de77a7146522ae0b8ee611befd4",
-"TT_bitcoin-test_komodo.py::test_one_one_fee_sapling": "90c68d14e0e7c6d01f1eb67e05c3194a52f798608142bde0421887aaeb42e8a8",
-"TT_bitcoin-test_komodo.py::test_one_one_rewards_claim": "805514e3fd668d2885b71eb81004042d3c2b568e46c13048e560bd7b0419bdee",
-"TT_bitcoin-test_multisig.py::test_15_of_15": "447f9163061ab7668f574959a7e80cfc7605d669e4abf0c17ed2934873f3cf51",
-"TT_bitcoin-test_multisig.py::test_2_of_3": "58d038355356d8db1e379ca34944a9e7290602f59256ced06ef8ed444e34f544",
-"TT_bitcoin-test_multisig.py::test_attack_change_input": "e71435d29542d5311775e91e10060cc32e043538306de4b9ee97ba98b99ddaaa",
-"TT_bitcoin-test_multisig.py::test_missing_pubkey": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_multisig_change.py::test_external_external": "98dc77db2812fedeba81b68687c788e7297305b1524ccd6ffffaf5ca5dfdf7f0",
-"TT_bitcoin-test_multisig_change.py::test_external_internal": "bd3b318d58fab493472b70ea5a26dbef3609f99a1283a047a383ec63276bb4f5",
-"TT_bitcoin-test_multisig_change.py::test_internal_external": "e65ac08242b22f6b25f05fdc63172cd7816c2ab3c06c2b774962532e5f235164",
-"TT_bitcoin-test_multisig_change.py::test_multisig_change_match_first": "83e30a0c1317a9613166860cb61f136ec29070d42c12092be9ef6348a08f5532",
-"TT_bitcoin-test_multisig_change.py::test_multisig_change_match_second": "e5e3a0e66738e0dc42b33951b783f774dc3a3fb2a17a4b612c375ca903fd1f42",
-"TT_bitcoin-test_multisig_change.py::test_multisig_external_external": "6ab25ae4c80fde6dd9caa6e34d114ba6b05d4a1d8135b07c845fd8d187caf623",
-"TT_bitcoin-test_multisig_change.py::test_multisig_mismatch_change": "c15aacbe4c3190c0570f3d11281ad768d8403983a54d09873eb492517aa17ec3",
-"TT_bitcoin-test_multisig_change.py::test_multisig_mismatch_inputs": "ec0895548550a3ac96f27535fa530bf809a3b4949211386b554ab99e9def4b00",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress[m-1195487518-6-255-script_types3]": "c1e2a55bc70cc9464c3a3790b747421a7e3cfe7d55dd1e9ab7cdcd66ab158b3a",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress[m-1195487518-script_types2]": "12a9859706807d8720a1e94b16786f135ab7e3a7c138d62990170d2e0a160156",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress[m-3h-100h-4-255-script_types1]": "ca667675c8396d5a36307e1f4d680b26b0f2da550011bce409efb993dd292904",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress[m-4-255-script_types0]": "d838e38405586bba70457f1f84057a267f62c31dc5cc110de6b55be787fd005b",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress[m-49-0-63-0-255-script_types4]": "d824669ddee9c2eb24a6a3525ac60b15bf78c316dfa29d5992c6727da823b381",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths0-address_index0]": "10d950f9d3002159e4bc3e076981bc882b6374b5d9475ff736a84523d4f5ab32",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths1-address_index1]": "c106ac4326a7bfe19f0df9bc49dee1130ec63787a556404c97406d719dc5ee05",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths2-address_index2]": "a61561585dcae1f4dc6535f8400b327145cc4a69b97a08bbf908d726ccc4520f",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths3-address_index3]": "ea5138b574b59b66b45dcde9bdd61a87cae73c9ee4c811f4089ed2661eaed3a5",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths4-address_index4]": "9c63afbe4dd7dad17b7ff320922b593f08196e9ca0d931849bdb877568f3f23b",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths5-address_index5]": "28fbd1cf9ceeb35b5988d280032193f9ca78effc5174c19e3270925dbf3c000f",
-"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths6-address_index6]": "697ed69dbf2a72f61f5952bcd54f766cc928e929e3bd204ec8ed967d976b3131",
-"TT_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-1195487518-6-255-script_types3]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-1195487518-script_types2]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-3h-100h-4-255-script_types1]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-4-255-script_types0]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-49-0-63-0-255-script_types4]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_nonstandard_paths.py::test_signmessage[m-1195487518-6-255-script_types3]": "44e660e6ef343f3eb196c400f6f33d9d38954660bfe12bd487e35e5051319199",
-"TT_bitcoin-test_nonstandard_paths.py::test_signmessage[m-1195487518-script_types2]": "de0c2a661d00c000702cf7f9f1a663856eae9602f231812bb9d49080064414ae",
-"TT_bitcoin-test_nonstandard_paths.py::test_signmessage[m-3h-100h-4-255-script_types1]": "de021393501e9d29934348006c179917c38a5d0dad6d4c2a1cb03956e7029787",
-"TT_bitcoin-test_nonstandard_paths.py::test_signmessage[m-4-255-script_types0]": "bd78a5e34417a0221452294291e719338082d970039ae4b5b3248ba4d42d46e6",
-"TT_bitcoin-test_nonstandard_paths.py::test_signmessage[m-49-0-63-0-255-script_types4]": "597c555edf3c5b28325340a58673530dbc05d9c17fa86ecacf6266dab963cb9f",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx[m-1195487518-6-255-script_types3]": "540e71cb9d7abb5fad13ef9f4a04485177c17465f1b2bf0353ec2660f22f6d7c",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx[m-1195487518-script_types2]": "4a4c06a6cba6584838693b699387885f40969ee5c42348d37efd39000e1d28be",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx[m-3h-100h-4-255-script_types1]": "6e85c507797512c587089823cd3709df82912dec76edb0a34ab491556e232668",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx[m-4-255-script_types0]": "6e85c507797512c587089823cd3709df82912dec76edb0a34ab491556e232668",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx[m-49-0-63-0-255-script_types4]": "0a2814f704d98ce8b1f61c10fbeaaed2a3cbc7e95904b899dd302e0b4394ca28",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths0-address_index0]": "600ce5be9cc20f0651200b38240056f461bd31933427546529c2333940547f0a",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths1-address_index1]": "600ce5be9cc20f0651200b38240056f461bd31933427546529c2333940547f0a",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths2-address_index2]": "73244d643dfb757c4deb2fe47e4cb6266c9b06b0f19c484a2e15e33efe28b91b",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths3-address_index3]": "03f239ccd7c433911846dd9ae37276b18e29ac8b5e16ad3c8c69355e381a95da",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths4-address_index4]": "600ce5be9cc20f0651200b38240056f461bd31933427546529c2333940547f0a",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths5-address_index5]": "600ce5be9cc20f0651200b38240056f461bd31933427546529c2333940547f0a",
-"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths6-address_index6]": "600ce5be9cc20f0651200b38240056f461bd31933427546529c2333940547f0a",
-"TT_bitcoin-test_op_return.py::test_nonzero_opreturn": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_op_return.py::test_opreturn": "181880970c28eace629b2053c83121dd719966cee230b7478d3f581f05f60d5e",
-"TT_bitcoin-test_op_return.py::test_opreturn_address": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_peercoin.py::test_timestamp_included": "0fe4e672f457423cf764383b8698ae4ecd3945efb4210a96ddbf9b08c9ce5336",
-"TT_bitcoin-test_peercoin.py::test_timestamp_missing": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_peercoin.py::test_timestamp_missing_prevtx": "675b0ddd450d18cd5c12eea82d732dfb578dafc357807623a07090bae3a01ede",
-"TT_bitcoin-test_signmessage.py::test_signmessage[NFC message]": "9bdeda55973832ef9133428fbe32043fafd03e803bb885f86e74fb9547ad3860",
-"TT_bitcoin-test_signmessage.py::test_signmessage[NFKD message]": "9bdeda55973832ef9133428fbe32043fafd03e803bb885f86e74fb9547ad3860",
-"TT_bitcoin-test_signmessage.py::test_signmessage[bcash]": "7c3afa23553401b65cc71e8c2499c1701fe46a58011d9193cbcb68c5b6ddec58",
-"TT_bitcoin-test_signmessage.py::test_signmessage[decred-empty]": "d079b4b5f10b82cd0abc36ee5c60e56697b2dd6a6b752b246ec6f14563a39111",
-"TT_bitcoin-test_signmessage.py::test_signmessage[decred]": "afa13029405626a07dae77142ee83d91426e8df48ff4c460155d07d9b6357858",
-"TT_bitcoin-test_signmessage.py::test_signmessage[grs-p2pkh]": "fb20dfd145a31a24f2b2d6329423598a8fa4d8e3b6cec4ef5fdcc22b743621e4",
-"TT_bitcoin-test_signmessage.py::test_signmessage[grs-segwit-native]": "7c124bc273f1011fdf1e14b1285f904b049933cf6e1d4a0735812faaac4a54a5",
-"TT_bitcoin-test_signmessage.py::test_signmessage[grs-segwit-p2sh]": "8bc37e8b472de9a0309617f4cbfaf0ad5228739f273061b1b162ce1f59fd2add",
-"TT_bitcoin-test_signmessage.py::test_signmessage[p2pkh long message]": "2b1c1790c1cb51c4d055995cab2509c792eb0bf758e1f4ec4bfadf8696243013",
-"TT_bitcoin-test_signmessage.py::test_signmessage[p2pkh0]": "c0311fdae8f0fa934f2367e5640cfcde92badd6019ffff966865207fca9ae7fe",
-"TT_bitcoin-test_signmessage.py::test_signmessage[p2pkh1]": "c0311fdae8f0fa934f2367e5640cfcde92badd6019ffff966865207fca9ae7fe",
-"TT_bitcoin-test_signmessage.py::test_signmessage[p2pkh2]": "2a7c124ceab47b1ca1120347d94049a755680b11afacb2e84b297832dc2f3b46",
-"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-native long message]": "41191056541a11bd55d1325099e9f7187464718c704f148cae36fa405dc6483d",
-"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-native0]": "2f382f843f1506f21a3fa79126548cd55180eda7ca55606da9e819a56f6d5653",
-"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-native1]": "2f382f843f1506f21a3fa79126548cd55180eda7ca55606da9e819a56f6d5653",
-"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-native2]": "ef8e2a506ddcfab4aa5fbeb79c0b7630e29ac61f9688bd50f5d33f659b0d2414",
-"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh long message]": "6a54ec566d99cfaa2bd619c3a6293bd035e7bc008f0708ca451129fae37caac7",
-"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh0]": "ee002ce0851daf9d71a43bbea055b33779ad38403c716417c1b3ca1a13ac5e18",
-"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh1]": "ee002ce0851daf9d71a43bbea055b33779ad38403c716417c1b3ca1a13ac5e18",
-"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh2]": "5c7758b049bb4a2870a5f0486e0a7bbf07e590ef7a18214076025ceb1da648c0",
-"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[long_words]": "ffdada0b56c548001cd31f3c7dcdc0d1f095b648cb085fdc6341b9f9843ad4d1",
-"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[newlines]": "791ff7121d6f0e92754706ffc51319f6980ff615acde6ede7f12aa891771475a",
-"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[no_spaces]": "6b1c656ec45a7725247c5c875373af0eb889a50f21979e95f6d8b7dbebad72e9",
-"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[normal_text]": "a5414f0e2387d8040c6943cb25b985b6b224770ec61fd74cf150200183245b83",
-"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[single_line_over]": "593bddd6f02a589f412a76e3299b2a5ac795e7282a1149b2a09bf7163793fda6",
-"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[utf_nospace]": "c6d93171f0dd8f95c71694ad0daf7d50e3837f62f2feb9e14ee64309540837d4",
-"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[utf_text]": "a9d278ebc3a4f32dc68b052d1c71577d96bdd2ea493048c9a410d3001526197d",
-"TT_bitcoin-test_signmessage.py::test_signmessage_pagination_trailing_newline": "8a787ffa2a016d3ea236fb2bd7b1b79ecb0e0605181b166278278ecb72bd5a00",
-"TT_bitcoin-test_signmessage.py::test_signmessage_path_warning": "2d9c06553c2def12610122e054417e67b705920a84af450d4b9d52d87c4c4b4a",
-"TT_bitcoin-test_signtx.py::test_attack_change_input_address": "8891bc222ec8168bb18eff526f916d0330efc56de00cc42fefaee9694e1fef67",
-"TT_bitcoin-test_signtx.py::test_attack_change_outputs": "27cfd2f10a25f5cc39ba9cb25e5b95ab362cb5045cbfa7362769665f96134630",
-"TT_bitcoin-test_signtx.py::test_attack_modify_change_address": "9958b7477a8046a598a48e16f337d6021c4eabcdfe33dae36e24a64172dd3d17",
-"TT_bitcoin-test_signtx.py::test_change_on_main_chain_allowed": "9958b7477a8046a598a48e16f337d6021c4eabcdfe33dae36e24a64172dd3d17",
-"TT_bitcoin-test_signtx.py::test_fee_high_hardfail": "018b7c1620d0fd8c107261c32fe30f3f4b398cccf4761103cf4a6f2aafbcce77",
-"TT_bitcoin-test_signtx.py::test_fee_high_warning": "2e235cb4711129ae0323d09c03b1cd10082b1de06a72fb92aad67fe690c647ca",
-"TT_bitcoin-test_signtx.py::test_incorrect_input_script_type[InputScriptType.EXTERNAL]": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx.py::test_incorrect_input_script_type[InputScriptType.SPENDADDRESS]": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx.py::test_incorrect_output_script_type[OutputScriptType.PAYTOADDRESS]": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx.py::test_incorrect_output_script_type[OutputScriptType.PAYTOSCRIPTHASH]": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx.py::test_lock_time[1-4294967295]": "3a2a9ef0fc414f27ea24288537ca93cbb62d4d14502dfe9feb321bc4583085dc",
-"TT_bitcoin-test_signtx.py::test_lock_time[499999999-4294967294]": "c8315a3717cb0afe902986b5c027c38de91ccb10f44d9fc8ce77970fb0237415",
-"TT_bitcoin-test_signtx.py::test_lock_time[500000000-4294967294]": "d61193705006f78217466de410d935564c69acc255c44fb4d39ae7921028434b",
-"TT_bitcoin-test_signtx.py::test_lock_time_blockheight": "c8315a3717cb0afe902986b5c027c38de91ccb10f44d9fc8ce77970fb0237415",
-"TT_bitcoin-test_signtx.py::test_lock_time_datetime[1985-11-05 00:53:20]": "d61193705006f78217466de410d935564c69acc255c44fb4d39ae7921028434b",
-"TT_bitcoin-test_signtx.py::test_lock_time_datetime[2048-08-16 22:14:00]": "1d2c594279a349dd6eba61219f728b67fa833edb6a0034b12c85b77ad2765198",
-"TT_bitcoin-test_signtx.py::test_lots_of_change": "487fc08a43cd2115b5897d02cd441970094bfd7cbc6c17b6b890bc87cd92462e",
-"TT_bitcoin-test_signtx.py::test_lots_of_inputs": "217172c0c149c2eb7c2840befa9b4a8bc6b7ea1730465ece719173231eecf627",
-"TT_bitcoin-test_signtx.py::test_lots_of_outputs": "2ada8e0cf595f0c7ef0f27f05132e2a28f7366fb4f2da1a9fd8ca9e26ef2f492",
-"TT_bitcoin-test_signtx.py::test_not_enough_funds": "3f1280d8006fb79a038c6cfa7a62968bcf873ce97f95ef41d814a6b1ad444a75",
-"TT_bitcoin-test_signtx.py::test_not_enough_vouts": "20b6d2b9d511a2ca564c8c2130218e9680c84ce53b37d5358a7974c956ec42ca",
-"TT_bitcoin-test_signtx.py::test_one_one_fee": "89015561eb7b8a664f54b797bb1123d1bb051a9b4800f7a28f594d26fe381993",
-"TT_bitcoin-test_signtx.py::test_one_three_fee": "8d4ec74337d28e59c43fa334f522fb842929fe397b0b63c073a81fa05c80dc8e",
-"TT_bitcoin-test_signtx.py::test_one_two_fee": "b5f0ac8c0029826e0f387dc00fb004631ac47826e3870660c7438dce4927e7ff",
-"TT_bitcoin-test_signtx.py::test_p2sh": "22a32ba67001865a911f694986cdddd44cd6de88a2d443fbd75104485b34e407",
-"TT_bitcoin-test_signtx.py::test_prevtx_forbidden_fields[branch_id-13]": "32dcbaab61c6e9931352455d8df01bf34021f0910e35f9c6198ae56548829fed",
-"TT_bitcoin-test_signtx.py::test_prevtx_forbidden_fields[expiry-9]": "32dcbaab61c6e9931352455d8df01bf34021f0910e35f9c6198ae56548829fed",
-"TT_bitcoin-test_signtx.py::test_prevtx_forbidden_fields[extra_data-hello world]": "32dcbaab61c6e9931352455d8df01bf34021f0910e35f9c6198ae56548829fed",
-"TT_bitcoin-test_signtx.py::test_prevtx_forbidden_fields[timestamp-42]": "32dcbaab61c6e9931352455d8df01bf34021f0910e35f9c6198ae56548829fed",
-"TT_bitcoin-test_signtx.py::test_prevtx_forbidden_fields[version_group_id-69]": "32dcbaab61c6e9931352455d8df01bf34021f0910e35f9c6198ae56548829fed",
-"TT_bitcoin-test_signtx.py::test_signtx_forbidden_fields[branch_id-13]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_signtx.py::test_signtx_forbidden_fields[expiry-9]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_signtx.py::test_signtx_forbidden_fields[timestamp-42]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_signtx.py::test_signtx_forbidden_fields[version_group_id-69]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_signtx.py::test_spend_coinbase": "f7e4e4689191d64d2376de4b56ae7a57eb7dcf0e64a1109f9e99fff6b689e699",
-"TT_bitcoin-test_signtx.py::test_testnet_big_amount": "2d8dedeb18c81449f32ec26119c2ea244c709fc98d72e4326999bf6d5ebe8e96",
-"TT_bitcoin-test_signtx.py::test_testnet_fee_high_warning": "ad364eb03db689c15b7b10c21621e02e230896f2edf838f03817c189d9f73722",
-"TT_bitcoin-test_signtx.py::test_testnet_one_two_fee": "9958b7477a8046a598a48e16f337d6021c4eabcdfe33dae36e24a64172dd3d17",
-"TT_bitcoin-test_signtx.py::test_two_changes": "f3bc69e2932beed020fbaaf1d590896562cb483dc1daa252e35a97d9f918d5ac",
-"TT_bitcoin-test_signtx.py::test_two_two": "40c26d19037eb771c0c65b6b96bfc31a64e19552f93cedb206b97ab52fd7944b",
-"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_btc[AmountUnit.BITCOIN]": "89015561eb7b8a664f54b797bb1123d1bb051a9b4800f7a28f594d26fe381993",
-"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_btc[AmountUnit.MICROBITCOIN]": "b0d822204abba0efe921c4b9b1a7305aec25210e8589b2872eb21fe6803c4b56",
-"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_btc[AmountUnit.MILLIBITCOIN]": "605b4ae175a66aa78b7acb575f68ad0aa02ae45dd494dbb7a009e5ed71d3d793",
-"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_btc[AmountUnit.SATOSHI]": "3b6bdced408c2ba3687b4c151d462bce5c9e2e47b617ea4510b6d09e4461ec0a",
-"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_btc[None]": "89015561eb7b8a664f54b797bb1123d1bb051a9b4800f7a28f594d26fe381993",
-"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[AmountUnit.BITCOIN]": "ad989109fcc4deee9fe4b519935008362e0afd86eb835cf272232e88bc4a297a",
-"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[AmountUnit.MICROBITCOIN]": "96ffd1ad676d73c719625c178f528208c6fe5b4ab817105d238c1cbb89a770ea",
-"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[AmountUnit.MILLIBITCOIN]": "e03f9b98762afb25a7c5d2ea7ea0563e4f7c6740b0a76a9e70dbb2e4f4101857",
-"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[AmountUnit.SATOSHI]": "084c10c18bef8a470dfedce059d8ff0c566eb33f10855eb486a396ee0b2528bb",
-"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[None]": "ad989109fcc4deee9fe4b519935008362e0afd86eb835cf272232e88bc4a297a",
-"TT_bitcoin-test_signtx_external.py::test_p2pkh_presigned": "1b1dd690450093088e56c724ec7e4ee1dc18b99959d63e127d6ab047e87961a3",
-"TT_bitcoin-test_signtx_external.py::test_p2pkh_with_proof": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_signtx_external.py::test_p2tr_external_presigned": "8bdfb73b3a158da161e598c64aa0fe4570a38a0a95259070c44e04ed388b24f3",
-"TT_bitcoin-test_signtx_external.py::test_p2tr_external_unverified": "dfd3dfd53c539d2f55c150ba5926fca5c6efed6cf0765978827b44b0243d83c9",
-"TT_bitcoin-test_signtx_external.py::test_p2tr_with_proof": "564455b0dea8ab4c2584152631a6516704288a2a0ce65397bd2b77b35eca6769",
-"TT_bitcoin-test_signtx_external.py::test_p2wpkh_external_unverified": "2f8f07ac717f15ce8ab0378da163d648b9b5cc6a2a533ef19fe01131182019a9",
-"TT_bitcoin-test_signtx_external.py::test_p2wpkh_in_p2sh_presigned": "42bc202309d8a44adbd20f18fcb0db12af3860cf169950594e6a1d27bfe6f3c9",
-"TT_bitcoin-test_signtx_external.py::test_p2wpkh_in_p2sh_with_proof": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_signtx_external.py::test_p2wpkh_presigned": "424848564ebb824119d4724c27c03ab364b891767236c27013f36f830475a3e4",
-"TT_bitcoin-test_signtx_external.py::test_p2wpkh_with_false_proof": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_external.py::test_p2wpkh_with_proof": "8c244b23c5e7d68a834ae436f5922e311b2843afadfb613ba3dd42eda0fd2cf4",
-"TT_bitcoin-test_signtx_external.py::test_p2wsh_external_presigned": "b0280f597ce0a9bded2e2fde3cd500711fbab407a1255208a9235aea834cc0f0",
-"TT_bitcoin-test_signtx_invalid_path.py::test_attack_path_segwit": "c35708f1972896f69130b4624eaf93fcce1708acd667035923f858ca836bcdd8",
-"TT_bitcoin-test_signtx_invalid_path.py::test_invalid_path_fail": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_invalid_path.py::test_invalid_path_fail_asap": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_invalid_path.py::test_invalid_path_pass_forkid": "b7a29bf58715748016a31054d157b3bf2a47fb75afdab1d150f3854806f55bb0",
-"TT_bitcoin-test_signtx_invalid_path.py::test_invalid_path_prompt": "06c05052796f728964a61d91ea8cea2bda25feb56b2579967ace3eae7c7e4c3c",
-"TT_bitcoin-test_signtx_mixed_inputs.py::test_non_segwit_segwit_inputs": "53b2405d7846d2d4a546279b329cdb4b5297f9af7dc000a9b080a5ebf96ce149",
-"TT_bitcoin-test_signtx_mixed_inputs.py::test_non_segwit_segwit_non_segwit_inputs": "263bb1ffccdc3240f54c03eb4c9525dbbe36da9d89b83c6c929821f72174e15e",
-"TT_bitcoin-test_signtx_mixed_inputs.py::test_segwit_non_segwit_inputs": "53b2405d7846d2d4a546279b329cdb4b5297f9af7dc000a9b080a5ebf96ce149",
-"TT_bitcoin-test_signtx_mixed_inputs.py::test_segwit_non_segwit_segwit_inputs": "e333085a6472e9fb4ee63a9a56001c71737592aaec8dc1eb36008dd84a09f92a",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_req_wrong_amount": "829da8d3cce348f519ad11b570fd5be69efc8c42f635ce4ddb68c5ddb316764b",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_req_wrong_mac_purchase": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_req_wrong_mac_refund": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_req_wrong_output": "4059a0e71b8899b55ecc85bafe67b67145c20816325150dcfed86e51b427aad8",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out0+out1]": "b9489a55ba2b246854ad5de3c12b67d7d5bf80c0b7057f5bf6d2fb5c5b8bb1fc",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out012]": "086a534eaa4bc5eb2fdfc3bf1e2de5383629709115ff6237911b0aacb7181b7f",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out01]": "a1986700a3714ee322ba29bf2d769eed0e2f9d83542419d5674cd5c535ab33fb",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out0]": "6560a267a319a5349ce4fdd2a3a2249c8070a5249fea8087db321e17e18c4575",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out12]": "a8cf09b64a282db9397e6fa3886c056c28a5ebb91f0af969b9e4b0f918ed8b05",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out1]": "9f908c511ca07c0c45be8720182f3c51a44bb1fc0419f49725c184993cb97c8a",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out2]": "829faf40697323c2044845ce9ca65c35bf22f53bc0bc0936e977d591aebdee78",
-"TT_bitcoin-test_signtx_payreq.py::test_payment_request_details": "03038915d06fee1b5e05ad230bd60052ddf56119e289465d78e1125f97735ffd",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash[]": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash[hello world]": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash[x]": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash[xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_attack[]": "0d9d8ded224606fdca37dcdd9d8a0926ea8520d4b96646cfaf6f091ca6397937",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_attack[hello world]": "0d9d8ded224606fdca37dcdd9d8a0926ea8520d4b96646cfaf6f091ca6397937",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_attack[x]": "0d9d8ded224606fdca37dcdd9d8a0926ea8520d4b96646cfaf6f091ca6397937",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_attack[xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]": "0d9d8ded224606fdca37dcdd9d8a0926ea8520d4b96646cfaf6f091ca6397937",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_in_prevtx[]": "0606849a7d0253e7157f2231c455740c1d8706b886bde4461c97fdf213df8e31",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_in_prevtx[hello world]": "0606849a7d0253e7157f2231c455740c1d8706b886bde4461c97fdf213df8e31",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_in_prevtx[x]": "0606849a7d0253e7157f2231c455740c1d8706b886bde4461c97fdf213df8e31",
-"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_in_prevtx[xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]": "0606849a7d0253e7157f2231c455740c1d8706b886bde4461c97fdf213df8e31",
-"TT_bitcoin-test_signtx_replacement.py::test_attack_fake_ext_input_amount": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_replacement.py::test_attack_fake_int_input_amount": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_replacement.py::test_attack_false_internal": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_replacement.py::test_attack_steal_change": "02a8c170fcded8f26d76960b5444bf8a6cb1b536306194ba76cb2845ad9070f5",
-"TT_bitcoin-test_signtx_replacement.py::test_p2pkh_fee_bump": "4a196a97801c461d6eb9e526da8acba4470a3ddbd8273d380e3be71d290d5102",
-"TT_bitcoin-test_signtx_replacement.py::test_p2tr_fee_bump": "1285e4060a9baedf87635633491d0a7cfc67786c58389d2403535e7488414965",
-"TT_bitcoin-test_signtx_replacement.py::test_p2tr_invalid_signature": "1285e4060a9baedf87635633491d0a7cfc67786c58389d2403535e7488414965",
-"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_finalize": "b832053d66f034d61e5776e039b891f31ca60d902d3afa3021dc2f219821c462",
-"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_in_p2sh_fee_bump_from_external": "04c4191d7f9b1cfcf7107f9e77027203af9e22fae00945db1bddb5e9b4762ee3",
-"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_in_p2sh_remove_change": "a6868b01860acd29b819fbf37e1ef89b8769d41c2b960e6f25207ed1eb90b163",
-"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_invalid_signature": "b832053d66f034d61e5776e039b891f31ca60d902d3afa3021dc2f219821c462",
-"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_op_return_fee_bump": "d714f49e220ed7d050eb2dbdbecf3469289aac325a47e5b346101efceebd2fbe",
-"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909659-90000-02483045022100aa1b91-c9b963ae": "10a274b994850a53ac2d05cf140e3e7425149a92e42e6401f4dbf408b8a67c25",
-"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909718-90000-024730440220753f5304-ecb983d1": "10a274b994850a53ac2d05cf140e3e7425149a92e42e6401f4dbf408b8a67c25",
-"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909800-89859-0248304502210097a42b-7a89e474": "10a274b994850a53ac2d05cf140e3e7425149a92e42e6401f4dbf408b8a67c25",
-"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909859-89800-02483045022100af3a87-80428fad": "d6bca6d6e6f2a8c91018805c3c6892270196ae5872ba6f183c86d892b6ade8df",
-"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909859-89859-02483045022100eb74ab-881c7bef": "10a274b994850a53ac2d05cf140e3e7425149a92e42e6401f4dbf408b8a67c25",
-"TT_bitcoin-test_signtx_replacement.py::test_tx_meld": "7b67a7549659d4358da4e4b78b0bac663ff2ee420ac3d761c291256715379585",
-"TT_bitcoin-test_signtx_segwit.py::test_attack_change_input_address": "14e671eb5ad2430ea6bc17864ac4785f44b0e6d1bf3287cba98a62a2cd5ded49",
-"TT_bitcoin-test_signtx_segwit.py::test_attack_mixed_inputs": "c0c49cc954d80e181e194a915b30375efaa56e3fd84f86e42d7fbdb49325cbcd",
-"TT_bitcoin-test_signtx_segwit.py::test_send_multisig_1": "5f3b585538238efda343de5b29dd50b608ec8c96d2cc606cfdaeb7a3f4e43b0f",
-"TT_bitcoin-test_signtx_segwit.py::test_send_p2sh": "153c813849363284dba75b17c9284b0bf4677b28ac0476800fdf2b60bab7533f",
-"TT_bitcoin-test_signtx_segwit.py::test_send_p2sh_change": "229f3a9b3b29523d428fa248f1b3ca3c37f8b6304751f5b223e7fdb3cad3695e",
-"TT_bitcoin-test_signtx_segwit.py::test_testnet_segwit_big_amount": "24f3efe72cbbe28b48ac7a7aedd09ffe3f5dfce8f32735869779df2320948dde",
-"TT_bitcoin-test_signtx_segwit_native.py::test_multisig_mismatch_inputs_single": "6360a0ba468fafa9890d10ed2d3f174a15f6697422cfb2e5e1bc2a586383c97b",
-"TT_bitcoin-test_signtx_segwit_native.py::test_send_both": "0b74f4e0aa1a59b2a5150111c09c5c36c79dc033e2d27bbeeee621539bfd7913",
-"TT_bitcoin-test_signtx_segwit_native.py::test_send_multisig_1": "bf536b22b6273d8990196a8cf91d5c2dfce99fbc3c827e60a811c987683dae15",
-"TT_bitcoin-test_signtx_segwit_native.py::test_send_multisig_2": "5c7e8ab6b12e723c6346f10e44d397d3e40914617b5b37d397ffa1a9e5cdfba2",
-"TT_bitcoin-test_signtx_segwit_native.py::test_send_multisig_3_change": "890f0a2e36bd9e72409a4bd21834b7240f2abf432aa9d5f454f4cffbbf526cde",
-"TT_bitcoin-test_signtx_segwit_native.py::test_send_multisig_4_change": "64129eb963fcc73c93d3035ea4746938af656bfbce1d1474f6f84c4812faf396",
-"TT_bitcoin-test_signtx_segwit_native.py::test_send_native": "ad989109fcc4deee9fe4b519935008362e0afd86eb835cf272232e88bc4a297a",
-"TT_bitcoin-test_signtx_segwit_native.py::test_send_native_change": "88593dfb096fb650747f725968a2c75b2d69baf2c6248d6c7b4ae8b44dacf9c5",
-"TT_bitcoin-test_signtx_segwit_native.py::test_send_p2sh": "8d46bf1d571f11c9f4dbb740092bf2dcd4e2748cce7fc7e52c4d2e33aaa91a72",
-"TT_bitcoin-test_signtx_segwit_native.py::test_send_p2sh_change": "96b6a031cdca4c3649d94fea6d56b3e3d452ac0d53104b1789c791c2ba2c82c3",
-"TT_bitcoin-test_signtx_segwit_native.py::test_send_to_taproot": "5b34dc642aee52e6155ac035eec8b6eac607d7db453edea6b12aade488b77314",
-"TT_bitcoin-test_signtx_taproot.py::test_attack_script_type": "f420d9a642a18e310c4bf6b5983ee6ccca243d06eebacb825225fcf72563153e",
-"TT_bitcoin-test_signtx_taproot.py::test_send_invalid_address[tb1pam775nxmvam4pfpqlm5q06k0y84e3-a257be51": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_taproot.py::test_send_invalid_address[tb1plllllllllllllllllllllllllllll-aaa668e3": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_taproot.py::test_send_invalid_address[tb1plycg5qvjtrp3qjf5f7zl382j9x6nr-5447628e": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_taproot.py::test_send_invalid_address[tb1zlycg5qvjtrp3qjf5f7zl382j9x6nr-880d4a6b": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_bitcoin-test_signtx_taproot.py::test_send_mixed": "8ab4199a9f1bd20e626e03912a9a777427e2fa5867b10b8ba591233d7359f35c",
-"TT_bitcoin-test_signtx_taproot.py::test_send_p2tr": "b71156d528de48899529b577360cdd68aac3442d7bea5de6d0adaf738b390330",
-"TT_bitcoin-test_signtx_taproot.py::test_send_two_with_change": "444eef035ca96dbda9fd9133c07084bcdec5e163a40c40ed7a458dea418f04c8",
-"TT_bitcoin-test_verifymessage.py::test_message_grs": "bb651a932064074e087ec89e3ffa6647e39e573ed4e717be109254fb2c00c8cd",
-"TT_bitcoin-test_verifymessage.py::test_message_long": "4f4d766b7c620cace16ce624059e38cfc60ac5a82f1d7e92f37420543779e959",
-"TT_bitcoin-test_verifymessage.py::test_message_testnet": "ed33548d6ae4241fe1b89624319a2454a2fb755d4f3eca1b4960a2445a103232",
-"TT_bitcoin-test_verifymessage.py::test_message_verify": "9a6ed19acea22bf4c8d435c06f6414566222ee9dead7ded9b4870a1184ad1cf6",
-"TT_bitcoin-test_verifymessage.py::test_message_verify_bcash": "9d24915046401402bde30e347b770e23aec3c49cd6d358625d8d09bbf33ec527",
-"TT_bitcoin-test_verifymessage.py::test_verify_bitcoind": "19f8b40229f0c53e1172610bd50f232130cfc788a4884e98eeddef396d887959",
-"TT_bitcoin-test_verifymessage.py::test_verify_utf": "aceb10fa31fcc165d15ce358d307f1c0bd92525d3f2c0f7233c1f369f6308818",
-"TT_bitcoin-test_verifymessage_segwit.py::test_message_long": "ac14b335e9e4aa1b557eb48818dab96797b4464a4228f07133b2679b69238736",
-"TT_bitcoin-test_verifymessage_segwit.py::test_message_testnet": "15fb716d6860edf168a21090c30e315dd360a3d8643334e833563c4e4b7ee762",
-"TT_bitcoin-test_verifymessage_segwit.py::test_message_verify": "478d6d13084723254e4c6797490820323c39a2b6f68a67c29a50bba4fa7afed7",
-"TT_bitcoin-test_verifymessage_segwit.py::test_verify_utf": "9cc80b94978aab0f88965897a3dfa846c18dcfc34c9f21031ef0df15d7a9a724",
-"TT_bitcoin-test_verifymessage_segwit_native.py::test_message_long": "fd42f8dec9682782a13bd50cb94278b5e641d01b1c478ef636596579cb456e7f",
-"TT_bitcoin-test_verifymessage_segwit_native.py::test_message_testnet": "de831f0ca069c6867d7309f7df71357e74ecc6013f9e63c19606828ec38f3be6",
-"TT_bitcoin-test_verifymessage_segwit_native.py::test_message_verify": "3a563246a21ca8a39696485cd2254eb6365a0abb82e9d10a714be8b9ef211597",
-"TT_bitcoin-test_verifymessage_segwit_native.py::test_verify_utf": "988cd0c1a2cc0dc9f7a6bdccee854f2b4edf564cface30b1888f41419587a6a4",
-"TT_bitcoin-test_zcash.py::test_external_presigned": "db6cce246954fb19c16ec47c6051f06386e8c3a7b6cdbd9d07214380ed8de80a",
-"TT_bitcoin-test_zcash.py::test_one_one_fee_sapling": "5f3a8d1a87bc927d7727ddd9bbed29f475739c262684d0e0841189268828fbbd",
-"TT_bitcoin-test_zcash.py::test_spend_old_versions": "feaae0c5c8c1873ca81c3b638cd6e3339209cd299a82d32e596a0bf6d1d0857e",
-"TT_bitcoin-test_zcash.py::test_v3_not_supported": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_bitcoin-test_zcash.py::test_version_group_id_missing": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[icarus-derivation]": "bdc08b11746ed0ab970019e169f171148a6122a1c9658c8d42e0fd8cbfabaa5e",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[icarus-trezor-derivation]": "20a65f98f98ea14039c1e58368af0a58e07894da7678e5319c8c526f0c0a0115",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[ledger-derivation]": "0f44e8ea22a1d7fc957b7a3b2adc08dd3dd7a240721209509fd021c6fe327cb9",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters0-result0]": "5f4ef9cc5d84903c968492a01252610cdfe0c5001c555c27a1a650d07d16dd05",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters1-result1]": "a9cfa5d796400d5696f37e63e5d73149ea91b548602266bdc04b7c2438892b05",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters10-result10]": "26fbf5615a9ebf4f985b386e4755f6c732af95947c5c7db9f527ea82de890c33",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters11-result11]": "845e1d8cb9ef1e2029b8886bfb6452216a2ba85586cfe654a8bbc7c9c23ecd30",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters12-result12]": "c6dff6e1d2a4f4ed1aafd770e0c9dd6b7e8e3ab3df86ee6859307c56424c66eb",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters13-result13]": "2fec1d04df002986c0cbbaffb970fc65876a498204186d915eadd4886fd3ed62",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters14-result14]": "5b1dbc1a85b0054674c2780aa1777a35a34dc61e93bde7a7d84bb5a1361e179c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters15-result15]": "7fba99efcf452998cf359cb161e18f4f0ea54076bc528371e01ec04c7ff197f2",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters16-result16]": "2f422135e705fd726f8b82506cb5bf087374c51c3912d7998e18b45931bfe7e8",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters17-result17]": "0ead3391cce49ae8323f4d5e072f12ed344435cc0f67231f8b676122eaaa6726",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters18-result18]": "2d66d01927221856e9c0802a4eeb1c40fd94157006b137e4ed7fc7e0d1e20c10",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters19-result19]": "4cd087edf7a673485a6d97a069c86ef067aa2cc2b6900d221901a12b1a418954",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters2-result2]": "5980eefc875faafd613381fbabd5f7db0abac23e9c42076a599480ef6fe1317a",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters20-result20]": "c3df0772f36def05635e6f5609588e0fcedd58acbc4ea9040361d860ac14905c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters21-result21]": "ea83e6efef02e41377abc687b6363637679f334b7f2c4deca517be57848f6001",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters22-result22]": "6269df3c87080ab8f9f22d233138b7188a6d2b7f1285388031fc47b7f4ee127c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters23-result23]": "f18cfc61377923f0d70ff6631323573fd9d8bd0e0a3406c0e1af9e49aa25ad7d",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters24-result24]": "5b45dcceb0972c1321efbfe55d843c57bf8bad21066e88a48246c1166182f01f",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters25-result25]": "7e1016befdfed33447d643702289b30ed1ac26dabe692f0670ba5df0b604faa1",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters26-result26]": "2964566a4bf1cfb15505abb30dde5a2390322dcbf6afe4df158b75ff2ee2c3c8",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters27-result27]": "462d2ee21d6d78f82eb34b1724dd0bb16e21d11aae6553c7545198b5cf447047",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters28-result28]": "dda20dcaf4014a5b26acac13c9114cca50836df6ef1c7c009a253ca22e48299c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters29-result29]": "60797ae0c30db6c029b88652f3a8eb4e364fc55c441bb8d4813c497596675745",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters3-result3]": "114b6d143060c6ba8bc1468b3e3e46d24b7b90642f2fb39573d5ff2305a8c25c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters30-result30]": "6cd8d25c54fbc0746cc3214db3ec79e50da40e7096ccf7ae1bce6360efe521ba",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters31-result31]": "0fc4bfa7b881192acc0a05e5967d92f41fdcabca330a97089b0af88d543540a9",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters32-result32]": "5afeed15d7bf8bdb7e6f30008f4c5758dfb851ae59a513b662ae9f5b807af085",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters33-result33]": "c33aa05e40224c9c6f7c3aad7001b3a826fe5c55919808708c58e506e41fe309",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters34-result34]": "b29ef19ae00917912a2005bc42fbcde600fbc5d44f80a1d3cf1750f21a50b239",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters35-result35]": "c3374f132613b75cb7fbbf4eca08cdf351af6f8d39725bbb4ce6e654ed678ac1",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters36-result36]": "70dc31765f88bbea82425490989abe610539a679e7119393e2fa9099398fd335",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters4-result4]": "e1501c5f37596774b9d5824b5769d9c2524275d02ba37d0fc5205cf346847e01",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters5-result5]": "f8520c1f0a7fde978fe7209c06b354c74487ee3a3bbe4e27ae960ba70495d430",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters6-result6]": "59a30e2e5ff1a779b48a8545283336348356f8e3a700c8aa101d8b9eaa2396d9",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters7-result7]": "2967df26a1d3422522b384f3a4bea993ad8b88032b0de5eb1928b785e0e5a30e",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters8-result8]": "5f3adc5e98c37a601b13f3c7dd97651a88fc214b97f2d0ec91b7f5fb7bf1c11f",
-"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters9-result9]": "1c4b6faa7ea231a085db303c479f8e85febe478796aca1456f8baa8d1811312c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[icarus-derivation]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[icarus-trezor-derivation]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[ledger-derivation]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters0-result0]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters1-result1]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters10-result10]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters11-result11]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters12-result12]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters13-result13]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters14-result14]": "db4a8f21cfd2bdaef28debb199e2296092b33ba26798b2ed52e708a51b62a569",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters15-result15]": "db4a8f21cfd2bdaef28debb199e2296092b33ba26798b2ed52e708a51b62a569",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters16-result16]": "db4a8f21cfd2bdaef28debb199e2296092b33ba26798b2ed52e708a51b62a569",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters2-result2]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters3-result3]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters4-result4]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters5-result5]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters6-result6]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters7-result7]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters8-result8]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters9-result9]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_cardano-test_derivations.py::test_bad_session": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_cardano-test_derivations.py::test_derivation_irrelevant_on_slip39[CardanoDerivationType.ICA-3b0af713": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_cardano-test_derivations.py::test_derivation_irrelevant_on_slip39[CardanoDerivationType.ICARUS]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_cardano-test_derivations.py::test_derivation_irrelevant_on_slip39[CardanoDerivationType.LEDGER]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_cardano-test_derivations.py::test_ledger_available_always": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[all_script]": "a52c22368ee7156164e78b14874d5d9ed013d2093bfdc5ac69b51fbadb57b191",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[all_script_cont-aae1e6c3": "2093d9c62b5e037c45b19a1c7a656e8f2e4d2d056f0c116107905f51ca9dd0ca",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[all_script_cont-e4ca0ea5": "6ad168aee0818c17b6ade059976314e6aebae4cf4aa332d51486bf9acb698d53",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[any_script]": "2be8e96c4bbd8e7531070b5c63acf04dee71ce00076b0a851e26827d64e8bf69",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[any_script_with-f2466a2e": "6c59b3a5c8420e3cfe0f0557b321af480dd657d9085f3bfdc012ba095ae5a483",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[invalid_before_script]": "c383a34fde84b054e9886e6289ca92d298b8cf6b749a105d6803a42577a86c2a",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[invalid_hereaft-d01d7292": "b74a971ef78190d2fff6b936c41b6fd2e8eb94ae9f8010f596372fcd1aecbe92",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[n_of_k_script]": "b35896a98a98e83565975daf713ae2d54cb7dbd2e321649b6f795f5675c035a3",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[n_of_k_script_c-d93f5fb0": "fcc3543d0aec9b6aa445dac7025526c488ea38a47532bdc0e79ae4828122f654",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[nested_script]": "7e3bb5918c781636f4d9073b0ec443e16ec28fd7f98f03eb5be0946865745e8a",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[nested_script_w-789238e6": "2fd8d071689edab5e611bbb28f3ea562b9f20231e78f96fbe46d5fb5c65b5dd1",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[pub_key_script]": "0741357649375673dfd5cf56b4e0e0c75d230c775b4793a9b0db2c1b32fffbb9",
-"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[pub_key_script_-1579fe2a": "c37aa27b95f8117e8878fea7b0c12a9a0e13698d52b627a5eec82d16f41c17ed",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[byron_to_shelley_transfer]": "0d51ef1fe746a2c5905d732ef03d52bce93e20396d0c179ad5bb98e53096b326",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mainnet_transaction_with_change0]": "1224c16621df898cd11a6cce817e9fcca8ad782e0f78710bcce0b8d9cf99051e",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mainnet_transaction_with_change1]": "4d5c91f8b4b27fcda4483c4801de7206afdaed013aee9c0dc13740f2bcba7a77",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mainnet_transaction_with_multiple_inputs]": "aa4f9eed5e70fff58c6018db8dbdaa319bfa256f2d088f1300849d9f8471c85f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mainnet_transaction_without_change0]": "aa4f9eed5e70fff58c6018db8dbdaa319bfa256f2d088f1300849d9f8471c85f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mainnet_transaction_without_change1]": "f3232b40261cedfac96647ac9a7d351c6c13c4b7acec60024a540b27c6e0e741",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mary_era_transaction_with_different_policies_-1dbb1bfb": "cd261ba77b06ca798741f135776ea6e0fecb5f4b7293ce5b8c6b3000f6abb456",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mary_era_transaction_with_multiasset_output]": "811db103bba50941df416dfa7cdb85e3cc7abb6402660d91c8022337681f6155",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mary_era_transaction_with_no_ttl-validity_start]": "6860b80bbb15e170015d41fef8a6e52b7cca56804cd806a71884b812b8c8402e",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_a_required_signer]": "e53cb22fcc618da83bd5651b6e759eb56b5995a7eb403ed5472ac0a33018ffce",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_most_elements_fille-29691455": "b5652b4ffa708f5fc40c9ab7f011d5f06417cb514abf333c05370e935a38e7f3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_output_datum_hash]": "cb36994cc7e412e9373d02b9cd5022c8cac08cc982f9951e615d80403ddde346",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_script_data_hash]": "cfce404c71472761a33246197347098c9e2f40c4d96678d93597cffca3da85ac",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_stake_deregistratio-1ab28f77": "c69b2de7e1749355bdba8e64805ea98933635b06e21f97f7240cf761c49f708a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_stake_deregistration]": "c69b2de7e1749355bdba8e64805ea98933635b06e21f97f7240cf761c49f708a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_stake_registration_-a144c34c": "b95645462e4e8f56b563a052bc912d7f76511b57dd5aeddefff251e3213f28c3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_stake_registration_-bf5f9707": "ecce012a8ec32a276a9d3c128ab15028e05046f7e7dc5087163d4693c5652385",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_token_minting]": "50e8951d5d9aca5e47c4de94ca37cc386227908287d87ccfaa3182357cea5d49",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_a_required_signer]": "ee4b66299e94b23dad944d8bb633faf1f7f01cbc7776b4ca84666a8f2179481c",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_both_output_formats]": "5552844c1bba97fcf068c5092ec6665080f4d67fbd06002a9fad7f029b903005",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_inline_datum,_refer-d1082570": "01b598832c2382557313026756eb558e0c2abef243b5827c767e39e36b5e40d7",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_long_inline_datum,_-1f681aaa": "d337d33b8f070e1fbd9fa10c64a9ffeb22a7688bf7efd0b978966d3d0bc46140",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_multiple_correctly_-6545455a": "57610b532a7e4dc4525128394190c88eb7e6e6b960a3fcad94be62b9412f9186",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_network_id_included-d9df16f9": "aa4f9eed5e70fff58c6018db8dbdaa319bfa256f2d088f1300849d9f8471c85f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_output_datum_hash]": "01b598832c2382557313026756eb558e0c2abef243b5827c767e39e36b5e40d7",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_output_datum_hash_a-84ad587a": "d337d33b8f070e1fbd9fa10c64a9ffeb22a7688bf7efd0b978966d3d0bc46140",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_script_address_but_-b0da7209": "34974c63739ad872aa3c36fa075b375a467d28e1690fbbf30c65a015a93258e7",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_script_data_hash]": "ee4b66299e94b23dad944d8bb633faf1f7f01cbc7776b4ca84666a8f2179481c",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_token_minting]": "81ab716d79d0155f6bfdb310175cb81e9bccdbd5206de15b53c76f884e1ca495",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_an_ordinary_input]": "6dddc9b2fb489feb47f6d728378bff1643cb6b6eacb3c93c2bdb995037103f76",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_base_address_device-o-a33e6741": "5d888a9403651b0ae608f877896f502ba4aa52b0d4576a58836c4d8f0d9ffef3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_base_address_device-o-a6481374": "096057cf80b8354ccff5fc152be7b79d3d354343138bd9180fe2e9fd6ce4e3e4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_base_key_script_addre-d3366a63": "8808d5114d5f533c3ce1de3aeffa88abd864dc7189a2067857db8054de725f37",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_device-owned_collater-8f38b4d7": "c738a360a2ece51a1e267f6dc723e51e0fe4922f9702019835380bb50d43ac22",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_external_collateral_return]": "7957c7b620bec186017604adb328c104fd22a780fec3a8a844ffc9bc1f38fbc3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_output_datum_hash]": "871fe7a57c54ffd44e74aa4195e6ed2566d092a9f2c02aa0de53e3ef6f5864bd",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_reference_input]": "c99ac282f16f760d7eff831632c17786dae787c28bc8feaf30d9a7e356d31f04",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_credentials_giv-6a67c1eb": "e2b271616f109f038977dce303743752733793eeceb6128bd00363a9f53833bb",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_credentials_giv-72ef969e": "739fd46934db0caa9ddbbe3a4ec9d5a60a0b10c4655d0c230ce3ed3f0eeb0f2c",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_deregistration]": "050343e95ffc962d6378ff05fe3b3ef3868db16b741d3d6bf242c421bb3f865c",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_deregistration_-78f5c748": "f79d0ad6249a819d02279a9d45d4098b19258ddf56fc1f9ba16a683fc4d50d82",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_registration_an-4da9385a": "1dbb541e857f9248ef8f7d60c56eb20dc533173089dc4c7ce0c0eca4541a2b84",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_registration_ce-46b0a250": "77ba119f9579509ca68e9d396cbef5b728e28385a603f34d8802ecb36183348b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_token_minting]": "51b25b17a16b5fdeca7598b1af1d674baf8931c1f706220f1aae25ea3f728d07",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_total_collateral]": "cc328394ba6d1f277429ad98e1850c0ffd1f575e77b536f65da75d0e672ce126",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_total_collateral_and_-3f0b305a": "64cb27553fb808a5eefb8555e1c4e4d41d0c042b1f6ad59d4afe373fb4fa29ad",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_total_collateral_and_-c92d773b": "da5b602e247c26fa1da56b9f8d27314b2f1a047bb0b230b68a33a73a5021aa54",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_without_script_data_hash_a-9590827f": "8e014e315ee81c916343b27b81931461aa0cadb08c86a5b003d8644bf6b03a1e",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[sample_stake_pool_registration_certificate]": "468c7e77aa51f5075526795c8051012548a601f594f923622a89270fa604c1bf",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[sample_stake_pool_registration_certificate_wi-336f4a44": "468c7e77aa51f5075526795c8051012548a601f594f923622a89270fa604c1bf",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[sample_stake_pool_registration_certificate_wi-d3427614": "5642c7a7605897c74fc69d26b2ca21d4c966edb2e2689ce4a545fb4693a6375d",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[sample_stake_pool_registration_with_zero_margin]": "251c52a758ed436690c2bbae5be59cd595f6f73e881dff272268f551beb45988",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_plutus_transaction]": "ca0c3df4c1857a5151a07e8b2450865bf834a9e0072991b9598f2af818281ae3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_plutus_transaction_with_additional_wit-36ba8ce8": "752219f0ae37b0c94c56ec10365b86559485cc75d84e0d8ea6217431da179ec3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_plutus_transaction_with_required_signers]": "416fdeff975e39807081c82b15c4df578c79fc143e2cc6149b078bdbfbea31c0",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_address_change_o-0c37e6dc": "3f4dda4543a1b835e445efd3123b77881d9c570cfffdb123a57b972b2bcac9bd",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_address_change_o-7f1d12f6": "ee600a4f85f25f2f0db2b93cda8f80e6c8ecd997248687f4b96e83e5858b8802",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_address_change_output]": "ee4b66299e94b23dad944d8bb633faf1f7f01cbc7776b4ca84666a8f2179481c",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_script_address_a-56fc16f7": "876aaa929ba082139ad02497220ac9193e2bf0a0619dec803116a6f77bfa3474",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_enterprise_address_ch-15518a4c": "7d292d03a5ec8ba8b3751c8ebe27a40c4649e509621fbc8fca72fe0b7c1c3d32",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_pointer_address_change_output]": "57e68f794f0c0d0a31aad3ec62d2be72e1b767ed9c08d6e3cc02cfaff2fb9876",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[stake_pool_registration_certificate_with_no_p-0bbad967": "c6a01842ab3b384ffeeffad39dbeb03a252d5766f2834c7810a2c9ea172590a7",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[stake_pool_registration_on_testnet]": "345265907d0d246543c1cb3cb3e5f76826d4e4801db7e248f028ecf1792aca21",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[testnet_transaction0]": "6e8805dfd99efb159061fe2bbee89d102b9bad292a5ac84756ab844dd5f8cc91",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[testnet_transaction1]": "5c5331ff5ecc9001b96d9d43ecb80120018c7f7a7993f01bca4511451fa84ecb",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_auxiliary_data_hash]": "ee4b66299e94b23dad944d8bb633faf1f7f01cbc7776b4ca84666a8f2179481c",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_base_address_change_output_p-3c7243e1": "72f3fa9a6498cf6ccab31afb218dc84050bd1aa24a562e4045cd19a637e39973",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_base_address_change_output_s-20438873": "41e0fff80231acaf86c0e11a5149fda4eb08d2cdd38bbf9e26d9cc9c688c56d3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_cip15_governance_registration]": "9b56d109ebc2eca2d049692a9c45cdb0ceb1d43dc54f84134079f2a4c3953a98",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_cip36_governance_registratio-35e04232": "f2b80c70a6dbe4614940f0afabc77f95941474df252239ae23d45f41a459da31",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_cip36_governance_registratio-f00c1b65": "4171ae144c0f8cdf9ee8661cf54c963682cb801d41eb63d1960116723d6fe683",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_everything_set_except_pool_r-1e1ef130": "a93a1511ef0f0e6f826e7bf73f3adeb6d8caf2dcb4eceea28feb4e29ca70716f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_deregistration]": "49d80162783ee61e5bbc7fac44a01197a433f46a2ff1f702b3e8be6a2d4f858f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_deregistration_and_withdrawal]": "49d80162783ee61e5bbc7fac44a01197a433f46a2ff1f702b3e8be6a2d4f858f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_deregistration_with_ac-9ca046f0": "f0cf27b72ea50836e94764074367de2c6427e50d9004bb19cc81363895aa7a87",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_registration_and_stake-3fdfc583": "3f53eeb86730f3461442842c082e403bc88d1fe916f55d20a480b80c618b1f68",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_registration_certifica-e7bd462a": "d486c7214a3b9269db0f204fdf6572e337e8872b4701243b8b08f1e012c7230c",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_registration_certificate]": "62fd7b52e0ff61353d005e3cfe6f1609f86ceb87d1ed600302de989546a0e87f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_ttl_equal_to_0]": "4ec0b5f501482f742aae69cf190ea0f0ebf24601a74e68fdd9a2fd02bf9e81f8",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_validity_interval_start_equal_to_0]": "7cffe9d4352d53d81f54d3f1355ad3db670be3f9f03eb88ec53522e3a9545386",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[1854_change_output_path_in_ordinary_tr-805f9bd0": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[1854_input_path_in_ordinary_transaction]": "aa4f9eed5e70fff58c6018db8dbdaa319bfa256f2d088f1300849d9f8471c85f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[additional_witness_requests_in_ordinar-9c4f94c0": "aa4f9eed5e70fff58c6018db8dbdaa319bfa256f2d088f1300849d9f8471c85f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[all_tx_inputs_must_be_external_(without_path)]": "ead7bd56b906d2ed7172b19f61be6fc75d4d28adc31f024d0e277bf7b2657178",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[asset_names_in_mint_token_group_in_wrong_order]": "63b06367ba0d4c71c1a9aa0e0d9b8d091041b2149c597dcb6e6a8893e192cb88",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[asset_names_in_multiasset_token_group_-7c1351bc": "5269748983fd41d70114f88f2dbaa3e302a010d84e7b432f05586f67c4e84843",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[auxiliary_data_hash_has_incorrect_length]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[both_datum_hash_and_inline_datum_present]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[byron_to_shelley_transfer_input_accoun-863fee7d": "0d51ef1fe746a2c5905d732ef03d52bce93e20396d0c179ad5bb98e53096b326",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[byron_to_shelley_transfer_output_accou-5a99fb35": "6860b80bbb15e170015d41fef8a6e52b7cca56804cd806a71884b812b8c8402e",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_both_path_and_key_hash]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_both_path_and_script_hash]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_invalid_pool_size]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_key_hash]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_multisig_path]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_non_staking_path]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_script_hash]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[change_output_and_stake_deregistration-e17db500": "13461846f8c98734093bfabbb6e16a41d3f441767dd0a1cbbbccdb814c4d1f5b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[change_output_and_withdrawal_account_mismatch]": "13461846f8c98734093bfabbb6e16a41d3f441767dd0a1cbbbccdb814c4d1f5b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[change_output_path_larger_than_100]": "13461846f8c98734093bfabbb6e16a41d3f441767dd0a1cbbbccdb814c4d1f5b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[change_output_staking_path_larger_than_100]": "13461846f8c98734093bfabbb6e16a41d3f441767dd0a1cbbbccdb814c4d1f5b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[change_output_with_script_in_payment_part]": "13461846f8c98734093bfabbb6e16a41d3f441767dd0a1cbbbccdb814c4d1f5b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[collateral_input_is_present]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[collateral_input_prev_hash_has_incorre-99d2dc0e": "47fc737f5b35bc245c6f6edfd4f4ddd1177c6564590554b250c62d6b95382226",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[collateral_return_is_present]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[collateral_return_with_datum_hash]": "0ed7eb08ce8f70d25f86d9ada26e6c18eb11b42faeb1ca744d6f6626e480fad6",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[collateral_return_with_script_address]": "0ed7eb08ce8f70d25f86d9ada26e6c18eb11b42faeb1ca744d6f6626e480fad6",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[contains_a_different_certificate]": "6982531771c4d2494974e8f37a720a50fd51d1e94438d0c6cd08bb25265118e3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[contains_multiple_pool_registration_ce-3000d4f0": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[contains_withdrawal]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[fee_is_too_high]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[inline_datum_present_in_output_with_le-43c025ef": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[input_and_change_output_account_mismatch]": "8cefd505b4543138d7ab774a0934e3471ef6a338caec5957ffc74664613a9911",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[input_and_stake_deregistration_certifi-b3383de2": "ef79fb6a5b446baa1abf2a1881be5ca50f75e91041c0e86b9b38143fa98386dc",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[input_and_withdrawal_account_mismatch]": "ee4b66299e94b23dad944d8bb633faf1f7f01cbc7776b4ca84666a8f2179481c",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[input_prev_hash_has_incorrect_length]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[invalid_pool_id]": "6982531771c4d2494974e8f37a720a50fd51d1e94438d0c6cd08bb25265118e3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[mainnet_protocol_magic_with_testnet_network_id]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[mainnet_transaction_with_testnet_output]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[margin_higher_than_1]": "6982531771c4d2494974e8f37a720a50fd51d1e94438d0c6cd08bb25265118e3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[missing_owner_with_path]": "b58aa2e0d82791dbd54296a2f4675b0b6767a260365025672cb32c3122f884c9",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_1852_multisi-b7679330": "da844bd901837ce64a377080b6746f4366071a738ae4cadfb8f1c5da569fd91d",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_a_collateral_input]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_collateral_return]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_long_token_m-9fb3cfe5": "a197605bcdc35040bea9a70e86421562611fcd9535436c43554cf117debf225e",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_output_conta-e3b36436": "58beffb093ceec399dcef3ba163cc0336a7bf5ed7c041dee4e04678b4df8b558",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_reference_input]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_repeated_withdrawal]": "af770c0c58be97298a77325fd64e1684eae2463565fdef199ed0b8e4569f8361",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_delega-19d1722c": "5e259f1a2369281756cb598dd8ce45759003617e5b97271e971c21249c38d155",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_delega-394991f1": "5e259f1a2369281756cb598dd8ce45759003617e5b97271e971c21249c38d155",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_deregi-351ce869": "5e259f1a2369281756cb598dd8ce45759003617e5b97271e971c21249c38d155",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_deregi-43da91d4": "5e259f1a2369281756cb598dd8ce45759003617e5b97271e971c21249c38d155",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_regist-456f1292": "5e259f1a2369281756cb598dd8ce45759003617e5b97271e971c21249c38d155",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_regist-84b1254e": "5e259f1a2369281756cb598dd8ce45759003617e5b97271e971c21249c38d155",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_total_collateral]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_withdrawal_c-9f7e1700": "af770c0c58be97298a77325fd64e1684eae2463565fdef199ed0b8e4569f8361",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_withdrawal_c-e98b1f5c": "af770c0c58be97298a77325fd64e1684eae2463565fdef199ed0b8e4569f8361",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_wthdrawal_ad-3291ee9e": "af770c0c58be97298a77325fd64e1684eae2463565fdef199ed0b8e4569f8361",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_without_minting_b-da5ba399": "da844bd901837ce64a377080b6746f4366071a738ae4cadfb8f1c5da569fd91d",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[ordinary_transaction_with_long_token_m-350c65f4": "43d4f4ee260c9ab0c68784afbf01c132be874acdbba2baf86a2b6b010b2b8427",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[ordinary_transaction_with_token_mintin-bc56f145": "47daf7e07af98666addf26f3c45f4cf279efb0942df26bba1005e7e91c76a066",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[ordinary_transaction_without_token_min-a128d577": "a4b6858b02efba3ea86e285005a4e911aae726623fbc09e30a02a60b4859c3ed",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_address_has_invalid_crc]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_address_is_a_valid_cbor_but_inv-ea3da215": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_address_is_invalid_cbor]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_address_is_too_long]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_address_is_too_short]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_datum_hash_has_incorrect_length]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_has_both_address_and_address_pa-2efc280f": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_total_is_too_high]": "3923f51972964b7cd5923c6603eea3b9960d59afcda14fa737accaef6d2c2571",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_with_reward_address]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[plutus_transaction_with_output_contain-74465253": "0a0ed967848d7e59ad0d8716125448a3875744b81f89e4bf3efc38b93b3f3dbf",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[policyids_in_mint_in_wrong_order]": "7ffbf98999d2008606af11a6ea5bc04350d6c716c80fb4a79774f79e2a6a218b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[policyids_in_multiasset_output_in_wrong_order]": "96eb42bbfbb2fb68b7fac4e468254c4c30f2dd7395d06b09d26d02e6e2ea14d9",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[pool_reward_address_belongs_to_differe-e79b6855": "6982531771c4d2494974e8f37a720a50fd51d1e94438d0c6cd08bb25265118e3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[pool_reward_address_is_a_base_address]": "6982531771c4d2494974e8f37a720a50fd51d1e94438d0c6cd08bb25265118e3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[reference_input_is_present]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[repeated_asset_name_in_mint_token_group]": "f4239a00f708dda4bae756d971cb50c0152e4abb992c7957a83bb6282c32f0e7",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[repeated_asset_name_in_multiasset_token_group]": "9940d1aa0e7483136588dc5cc634bb0dc66eed0dea6bbd7569d3d975bd0425c3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[repeated_policyid_in_mint]": "1874ddaa7146fa35b1b10a056e7730a4a80625162079f3f05f406a8b1009c212",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[repeated_policyid_in_multiasset_output]": "8410e4154f56bb0964320cbc2fdd49e91be2ac0ddb6344bb551c0c83330a0871",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[required_signer_with_both_key_path_and-7d9a3c59": "0ed7eb08ce8f70d25f86d9ada26e6c18eb11b42faeb1ca744d6f6626e480fad6",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-02b129f8": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-11c8b442": "468c7e77aa51f5075526795c8051012548a601f594f923622a89270fa604c1bf",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-2d1899d5": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-3f8170f6": "468c7e77aa51f5075526795c8051012548a601f594f923622a89270fa604c1bf",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-60961d51": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-790fc948": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-883e81d5": "5ac2865d67ee0c413678188fd9294f29dafb83cb88377b6efe2153a1a78163b1",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-9ae6620c": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-d0eba163": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-e7a533e7": "6982531771c4d2494974e8f37a720a50fd51d1e94438d0c6cd08bb25265118e3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-e908b1a8": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-f9976ae8": "6982531771c4d2494974e8f37a720a50fd51d1e94438d0c6cd08bb25265118e3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[script_data_hash_has_incorrect_length]": "0b057226d28b6cd151462ac74bea3fc2c1d54be2eb45db93949015bcd5719ce3",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[shelley_mainnet_transaction_with_testn-af110e3e": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[shelley_testnet_transaction_with_mainn-ba78ab8f": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[stake_deregistration_account_larger_than_100]": "13461846f8c98734093bfabbb6e16a41d3f441767dd0a1cbbbccdb814c4d1f5b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[stake_deregistration_certificate_and_w-003a1023": "eb6b198a90b7144d92e1e718d59a57a279c14f8e705e0f686fdc33d8be4731e9",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[testnet_protocol_magic_with_mainnet_network_id]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[testnet_transaction_with_mainnet_output]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[total_collateral_is_present]": "6f59841dc5e3597d0940a7b4be0813b25555652180043634c9018272c5a22a3a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[transaction_with_both_auxiliary_data_b-d83df998": "13461846f8c98734093bfabbb6e16a41d3f441767dd0a1cbbbccdb814c4d1f5b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[transaction_with_both_voting_public_ke-0ded7777": "13461846f8c98734093bfabbb6e16a41d3f441767dd0a1cbbbccdb814c4d1f5b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[transaction_with_governance_registrati-efb78b43": "13461846f8c98734093bfabbb6e16a41d3f441767dd0a1cbbbccdb814c4d1f5b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[two_owners_with_path]": "aa6d9385d60ad2ab9d73895a89c16046d3ac4c9e04ec1c4c7845754290d2ca11",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[unsupported_address_type]": "b5c8dfc7cc49f38e522dccad951a245534d1dde7a6e36beb0ce63c3333f214f4",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[with_multisig_transaction_signing_mode]": "5e259f1a2369281756cb598dd8ce45759003617e5b97271e971c21249c38d155",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[with_ordinary_transaction_signing_mode]": "13461846f8c98734093bfabbb6e16a41d3f441767dd0a1cbbbccdb814c4d1f5b",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[with_plutus_transaction_signing_mode]": "b91934b1d79d8acb91077ecd1ac862d8e47d3f6cf67e71c194edb5e77d3412e7",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_amount_is_too_large]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_contains_both_path_and_key_hash]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_contains_both_path_and_script_hash]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_has_key_hash]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_has_multisig_path]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_has_non_staking_path]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_has_script_hash]": "5c66ec7042d875d70f4b5063b3a61550687515f9214eaffc4719a9e9f9b7651f",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[mainnet_transaction_without_change]": "9b3c135bf9d0fa914156800ecf21c37d87bd3cd44769885635b348a6a1207e7c",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[multisig_transaction_with_a_requ-c2fba589": "0975ee263cbd8a57cb154ee6a1c5e0afd9eaa9736f41a1378c232018e5da4363",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[ordinary_transaction_with_a_requ-9728607e": "c15947cbfd4b9b9c422f94ddf0dee71ce01c7f6a6c908124419a19b0cee2c336",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[ordinary_transaction_with_long_i-708443f3": "77ee89006d113652413d8d51a9f4e6b84f8d9e28da53a9a778d0a2ea64f19392",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[ordinary_transaction_with_output-9ba7352d": "043e8ace7841d83e8a55ff5924072f01b55712f431c8ed6067a3d2380d4afb72",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[plutus_transaction_with_reference_input]": "edb3b7493cd0f946fbbae0bdb3f705cc2424214c1d02efb083e3f60308db7386",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[plutus_transaction_with_total_co-e846c221": "e6e3ac8ec60edf0a15498f28afa57bd109367944a01dbc3a3321fb16f73d0ae7",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[transaction_with_cip36_governanc-36bf9253": "e3a850158f6437b2b4f681cbaab90043218eac3034f4c0dab0c4ac624350584a",
-"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[transaction_with_stake_deregistr-6e84da2f": "1ab8c7d8e6e688146700da85796e5cd92208f8ea3f5558fc88924bd814b9c181",
-"TT_eos-test_get_public_key.py::test_eos_get_public_key": "3d1ba8c6d2132b7e7f61511a3b49c18dd1b5563578ae57e7ab476e23c49b20dd",
-"TT_eos-test_signtx.py::test_eos_signtx_buyram": "ed4c2fce8b8f9c65c4095239927fda115e3bb5a268e32a1c61c7f59d46072406",
-"TT_eos-test_signtx.py::test_eos_signtx_buyrambytes": "115173e4c4c5e820980d8bcd879c39b9d35894445cb9038aa45bc7dc84bca752",
-"TT_eos-test_signtx.py::test_eos_signtx_delegate": "cf4e897963c6a31597c64ff0e0a529e8bdece8d575ea15482ca891d73eb12230",
-"TT_eos-test_signtx.py::test_eos_signtx_deleteauth": "1476e34b6dfc63e64d7984e2bb1e20e3b8c7eff1d0ee940ce7e6358543c19526",
-"TT_eos-test_signtx.py::test_eos_signtx_linkauth": "503276fce84fe4a06d7b7fd51c62be2c93d034b72f14decb4b95ed03046ba7a0",
-"TT_eos-test_signtx.py::test_eos_signtx_newaccount": "e890e03610c0961d9fed284bf333f09825931695f51e5030beedf23b4480ead4",
-"TT_eos-test_signtx.py::test_eos_signtx_refund": "82577fdaa1c3d828d10ba7c305ffe7527d0200e6b7b6c0497635bad706717c88",
-"TT_eos-test_signtx.py::test_eos_signtx_sellram": "e658edccf9e9af8cc88097e0a064043a23bb1d12c7f7c3a51f9a99afe7edbf65",
-"TT_eos-test_signtx.py::test_eos_signtx_setcontract": "29029da6c7abce48eaea9ca41881d75a36581f1fb4446772f5ed1de457949f92",
-"TT_eos-test_signtx.py::test_eos_signtx_transfer_token": "54f93a28abcf81e13612eab851c37baddc6210ccf362a55e92cd989e9c3e6101",
-"TT_eos-test_signtx.py::test_eos_signtx_undelegate": "9ef78db2f691291abbe4520702985e1ba875b9ea08f79c305134d5f523df3aa9",
-"TT_eos-test_signtx.py::test_eos_signtx_unknown": "78b19a0a629d8aa6a9bc364a8c58ea4385e38e3780f9973b879f6ba1e3c110ea",
-"TT_eos-test_signtx.py::test_eos_signtx_unlinkauth": "71304f0fe5d3092d9a5d73c1e5adf1c474430d492e0d8b5ebf72693509b82eb6",
-"TT_eos-test_signtx.py::test_eos_signtx_updateauth": "6ec3c82516f5259d0a94e308a87f32c350c42c69e83965ef72db0dce14902e72",
-"TT_eos-test_signtx.py::test_eos_signtx_vote": "cd9b7e8c0b59da8ed57dbb1e842d9f9c3c47767dad47a170384c63ec87c63ac3",
-"TT_eos-test_signtx.py::test_eos_signtx_vote_proxy": "383e507f499274b5470e43631a74284d05163971cab80d0bf510807eaf5119fe",
-"TT_ethereum-test_getaddress.py::test_getaddress[ETC]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getaddress.py::test_getaddress[GoChain]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getaddress.py::test_getaddress[Ledger Live legacy path]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getaddress.py::test_getaddress[Wanchain]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getaddress.py::test_getaddress[parameters0-result0]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getaddress.py::test_getaddress[parameters1-result1]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getaddress.py::test_getaddress[parameters2-result2]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getaddress.py::test_getaddress[parameters3-result3]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getpublickey.py::test_ethereum_getpublickey[Ledger Live legacy path]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters0-result0]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters1-result1]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters2-result2]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[array_of_structs]": "d4cdb13cb952524cb9643df35185b7a5018cf3ac2b9c5d20006d7e11ad10b42f",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[bare_minimum]": "a373610eb3a47f876331b93f09f0adf464557d3f6fe88c607dbf00e633598727",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[basic_data]": "dff1b0e595c3794d56d85814fbe4a94465a2f602b2a1443a6ed510b7b3609ba5",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[complex_data]": "26843235253c899a57e7fc0fce1ff84e67c77b56e386df315a92f688ca2c9557",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[full_domain_empty_message]": "266069f67cd5f96f348046dff22a76744d626cfb184e230a59255db6de2e08be",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[injective_testcase]": "ad6d82d22e92ce23ae61286561c6ab75c6bba88f99c6e1e6c7af7f4f35c325e9",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[struct_list_non_v4]": "dff1b0e595c3794d56d85814fbe4a94465a2f602b2a1443a6ed510b7b3609ba5",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[struct_list_v4]": "dff1b0e595c3794d56d85814fbe4a94465a2f602b2a1443a6ed510b7b3609ba5",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[structs_arrays_v4]": "dff1b0e595c3794d56d85814fbe4a94465a2f602b2a1443a6ed510b7b3609ba5",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data_cancel": "5fdcecbcc9fe313b0b36b2b0419907e43480feae5590174a57a0ede123757473",
-"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data_show_more_button": "a2da9f029cd797a10b140b8e36d75aef264d83f938b6ccd34260920354296714",
-"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters0-result0]": "84d134d90391b168c62bb6f4f5bb57c66f3f0057c1befe49b4387292b0dfe8ac",
-"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters1-result1]": "6f3100bd596806639da44ee684cf77183c2f98b8b7929e51404d3ce06f6643de",
-"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters2-result2]": "aaa0cc0ec8efd2a7d4dfff1232f2c483f9f546e7f7c0228898d1ff523ee9e90e",
-"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters3-result3]": "f50caa7ee27d8d0a73fbfb4318c9479e3b3d611bc833cc3fb3830d46bdcc10ad",
-"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters4-result4]": "46cf0d9d1142f0e7e85382b77e812c8b1e2f4556b72fbcae9b7e3bb864b6c077",
-"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters5-result5]": "d7a794e47e0db3b622487f256ac2ea9e92400ce06ee23d148042d27966a7464f",
-"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters6-result6]": "57c5df05ba56fed413cd0b0fce6c66e202ca08fb9f175ecd15f93c41f460e627",
-"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters7-result7]": "330a4700eeb5925593b80dacb32f60244b5b15e935d5c0f4aaef603b8ba47c18",
-"TT_ethereum-test_sign_verify_message.py::test_verify[parameters0-result0]": "ca75d569edabbf4b873a9a52d4b322502ac88164e83797393b00e553b656d05c",
-"TT_ethereum-test_sign_verify_message.py::test_verify[parameters1-result1]": "fbb818769f7e3eea5d37dbc79d5908631e0ce88ba82f5923815ee8ce1fd6be69",
-"TT_ethereum-test_sign_verify_message.py::test_verify[parameters2-result2]": "cb38a45a5b27d1c34f342f0afd246bd71dd8e2448cf1eefd259b9ed919bc811d",
-"TT_ethereum-test_sign_verify_message.py::test_verify[parameters3-result3]": "48a63951a97f09cb8e30488c2db387a1831b1dc49a47b9b536572c1957ec8a9b",
-"TT_ethereum-test_sign_verify_message.py::test_verify[parameters4-result4]": "581fb7882acad3415bed13ba981789bb061a7ce9de75ca3cb95bf727827edd20",
-"TT_ethereum-test_sign_verify_message.py::test_verify[parameters5-result5]": "8b136869608760892802c650215c559f2311e17c3c05842d80a5ad760b93258e",
-"TT_ethereum-test_sign_verify_message.py::test_verify[parameters6-result6]": "0ff7438feee8acdc0e9bfe0a895f87d0f05b73981fcc8315de86dd4d02b697a9",
-"TT_ethereum-test_sign_verify_message.py::test_verify[parameters7-result7]": "9cebc4dcd03f069d3d842cccf0f41b3601c52478f7c98c8a062c34ef267108a2",
-"TT_ethereum-test_sign_verify_message.py::test_verify_invalid": "ca75d569edabbf4b873a9a52d4b322502ac88164e83797393b00e553b656d05c",
-"TT_ethereum-test_signtx.py::test_data_streaming": "5b34af4146ca3e1d66b6e1a45ca8b6b63f45453aa8f61764826de06110d31b1b",
-"TT_ethereum-test_signtx.py::test_sanity_checks": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_ethereum-test_signtx.py::test_sanity_checks_eip1559": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_ethereum-test_signtx.py::test_signtx[Auxilium]": "8210914d4e083ac53f0feec2bbbda3dffc2dc7ea13aad9ac1ba42cfdfd3a7fb1",
-"TT_ethereum-test_signtx.py::test_signtx[ETC]": "1be13e9824e3a299514e008dd223caf250e7a0729a707ec90b2f7bc4417b7c93",
-"TT_ethereum-test_signtx.py::test_signtx[Ethereum]": "42027bef9ba5f823920c3781732217b22b363422a5cc48b0d9f4e737e29be3a5",
-"TT_ethereum-test_signtx.py::test_signtx[Ledger Live legacy path0]": "e16fc853b349cf9dbf1aa23e44365290580b1db602e6194e5c44b1cde454c8c5",
-"TT_ethereum-test_signtx.py::test_signtx[Ledger Live legacy path1]": "42027bef9ba5f823920c3781732217b22b363422a5cc48b0d9f4e737e29be3a5",
-"TT_ethereum-test_signtx.py::test_signtx[Palm]": "ec2e670528d40506adf44c3e4d60f3a233b41a05d2ec9d055a394cce6a2dca67",
-"TT_ethereum-test_signtx.py::test_signtx[Pirl]": "7c3f0d3adb00139fa9e161c180d5a051198347f1dc0ce910ca73c776d119f767",
-"TT_ethereum-test_signtx.py::test_signtx[Rinkeby]": "986aee9ca42dc1d319a2f3f5d5dc6b205c80c8314e70fb39efb4afea66625299",
-"TT_ethereum-test_signtx.py::test_signtx[Ropsten]": "f4f2f7b08b8c0797cafb7e055b9435c80383b0ddafddb69ba8edf8f12a8e9fda",
-"TT_ethereum-test_signtx.py::test_signtx[Unknown_chain_id_eth_path]": "999f2dba5a4702dbfed806f541bca0f650f751e12fcba27af83239b6c93c5c35",
-"TT_ethereum-test_signtx.py::test_signtx[Unknown_chain_id_testnet_path]": "999f2dba5a4702dbfed806f541bca0f650f751e12fcba27af83239b6c93c5c35",
-"TT_ethereum-test_signtx.py::test_signtx[data_1]": "22db9b529eb20b2981e961e81dec26a686bb5e672d608b8fe3e8336a2cbb3396",
-"TT_ethereum-test_signtx.py::test_signtx[data_2_bigdata]": "c448a3487ebb722f83bef5c8260038e61f56e8afdc54b71f8b2b4d7931885f13",
-"TT_ethereum-test_signtx.py::test_signtx[known_erc20_token]": "5a9313f98c8953020e11e731526acb1a87dffe5b6c2114880f473cbecbbeefbb",
-"TT_ethereum-test_signtx.py::test_signtx[max_chain_id]": "999f2dba5a4702dbfed806f541bca0f650f751e12fcba27af83239b6c93c5c35",
-"TT_ethereum-test_signtx.py::test_signtx[max_chain_plus_one]": "999f2dba5a4702dbfed806f541bca0f650f751e12fcba27af83239b6c93c5c35",
-"TT_ethereum-test_signtx.py::test_signtx[max_uint64]": "999f2dba5a4702dbfed806f541bca0f650f751e12fcba27af83239b6c93c5c35",
-"TT_ethereum-test_signtx.py::test_signtx[newcontract]": "3e50a6b53b5ccc29ab7cd92df9b5fb5ca67ff64bed1c4b0a0d95e93cbca36e73",
-"TT_ethereum-test_signtx.py::test_signtx[nodata_1]": "07340b504562add1d5011bdce15683f696ac07307219ea084b6320d6e873d181",
-"TT_ethereum-test_signtx.py::test_signtx[nodata_2_bigvalue]": "d1dc780fa5e796f96c8d28058b9dab83014d2390aeddf3d2d012c49d485e8deb",
-"TT_ethereum-test_signtx.py::test_signtx[unknown_erc20_token]": "aa670aec57d9248b50d23787b3776c2e552624f19fd32b4f406966b5e06c9f66",
-"TT_ethereum-test_signtx.py::test_signtx[wanchain]": "20f0b34e41d4c2c4a412c5f5de03b2a6059d5ee874ec794e1706aed1c4e7b36e",
-"TT_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_go_back]": "1df6c7cc3074fdfa575d4a3dfc4d4603f611641d5c2894900e76fe364c4f3ee2",
-"TT_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_scroll_down]": "c8b0390ed5bdb8f3362bac4891f3b96cf6c1217bd575f75bcb77d0678261c214",
-"TT_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_skip]": "7882f2b019419acd1f5a7e196c63327ca4bb59436a94a34a104656a4badf36d1",
-"TT_ethereum-test_signtx.py::test_signtx_eip1559[Ledger Live legacy path]": "14f159d0b62d7697bcbcd56ed41b8affa86ffea1d7aa6f2d0c3ce168fb990431",
-"TT_ethereum-test_signtx.py::test_signtx_eip1559[data_1]": "6a4ab2fefa4d8fec26bfc8434371ba00859b9dbad37dac5ef04cd0c6c2da024b",
-"TT_ethereum-test_signtx.py::test_signtx_eip1559[data_2_bigdata]": "e6e66e9c54ae66f45ac83396611ae6ab6410bdc63eda3dc590dba13ebf382274",
-"TT_ethereum-test_signtx.py::test_signtx_eip1559[known_erc20]": "063198d50c0a9d5cb6b40d546f2f0af9cf1cb2e27ef385a18b46228f79ab5ff9",
-"TT_ethereum-test_signtx.py::test_signtx_eip1559[large_chainid]": "3df0408bb8f93821d26c9b2eae573d0ab55a89dab6d0468efd18a9be5a647b0d",
-"TT_ethereum-test_signtx.py::test_signtx_eip1559[nodata]": "14f159d0b62d7697bcbcd56ed41b8affa86ffea1d7aa6f2d0c3ce168fb990431",
-"TT_ethereum-test_signtx.py::test_signtx_eip1559[unknown_erc20]": "2189a082fe612b0821072ab5260aca76e77dfeccb592c013409f1ef7812c8226",
-"TT_ethereum-test_signtx.py::test_signtx_eip1559_access_list": "14f159d0b62d7697bcbcd56ed41b8affa86ffea1d7aa6f2d0c3ce168fb990431",
-"TT_ethereum-test_signtx.py::test_signtx_eip1559_access_list_larger": "14f159d0b62d7697bcbcd56ed41b8affa86ffea1d7aa6f2d0c3ce168fb990431",
-"TT_misc-test_msg_cipherkeyvalue.py::test_decrypt": "120f9e8e4cb99d8fbd4fe5f4ce5d6a24e7aa98fafb2329a0fde01b6fa6656361",
-"TT_misc-test_msg_cipherkeyvalue.py::test_decrypt_badlen": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_misc-test_msg_cipherkeyvalue.py::test_encrypt": "582b31d707b118bda01c9bd6ffab3b0a8d1ea6fa68583aa9b3032cd7921ae2c3",
-"TT_misc-test_msg_cipherkeyvalue.py::test_encrypt_badlen": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_misc-test_msg_getecdhsessionkey.py::test_ecdh": "3c448d188a8b64a1b778919d1bea3ae110ac853f68705c31a3ae504f5f3a37b9",
-"TT_misc-test_msg_getentropy.py::test_entropy[128]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[129]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[16]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[17]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[1]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[20]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[21]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[256]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[257]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[32]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[33]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[3]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[4]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[512]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[513]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[5]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[64]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[65]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[8]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_getentropy.py::test_entropy[9]": "876c0fabe6607ef190180f2d395f44b7535a129c4b4a9df8477cc89128b2fb8c",
-"TT_misc-test_msg_signidentity.py::test_sign": "fc070b17bb700b59348cc1d9416cecd9cd626a70dc45d633bd19a5ade7231db3",
-"TT_monero-test_getaddress.py::test_monero_getaddress": "ff1b89205bd11c81da75ed3971ce504cf709765b3db47c5fc87ff179730dc5bf",
-"TT_monero-test_getwatchkey.py::test_monero_getwatchkey": "bf70b5c85f9a0b3e76600cee79a51fc737019251ac104cfa0a9a69544fca11e1",
-"TT_nem-test_getaddress.py::test_nem_getaddress": "51bb62e102ddb17272ad6796aa61d0779307ba28b8457fb6a01ee6925873bbd2",
-"TT_nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_creation": "15a0e05575f0dfb3c390f61bd10b4d4b9cd0c47bee5e090d71ba525905fe05a5",
-"TT_nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_creation_levy": "0067265adb2ad9a3935e7117cdb0f2c9e48c17daec40e99b0c91f089e8c66666",
-"TT_nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_creation_properties": "81815307ee97434dd30c2ab615ca7e427b16c962f6668946fe9ca2bc5551cab5",
-"TT_nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_supply_change": "9a8f0a1855b65b6b3a1ae6f86c1d09731c1ad669cd33305d4a4bcb024286ce61",
-"TT_nem-test_signtx_multisig.py::test_nem_signtx_aggregate_modification": "3a6c1c634d519262f9de856dfa8f4966ceca8d207d11b0be6bd7e7f6e832069f",
-"TT_nem-test_signtx_multisig.py::test_nem_signtx_multisig": "1d916958e8b15128ca4ce8c3743ef24659cfce1b97a78d6fa8cfa41a12ce9fa5",
-"TT_nem-test_signtx_multisig.py::test_nem_signtx_multisig_signer": "94eea6553aa50aaa111396f10c4f4254aacf7ba3e9bbcae5bdf9dde7887e1b65",
-"TT_nem-test_signtx_others.py::test_nem_signtx_importance_transfer": "bccb1711e75f92a65e2e54a3b5cd2e086836adc947a3b3dbff9b250488df21a0",
-"TT_nem-test_signtx_others.py::test_nem_signtx_provision_namespace": "191e64b0df0c180309b0d77dbb1b823129486021eeb1514a905eceabad20857e",
-"TT_nem-test_signtx_transfers.py::test_nem_signtx_encrypted_payload": "12c595c359947044cf57e9eb9fc781b83c2100019cd8a236b9e6498ad8a651a8",
-"TT_nem-test_signtx_transfers.py::test_nem_signtx_known_mosaic": "b4e125c34f6b2e9e1e894c7480856eb6e4b199cc3ed48474fddfc861fb5c9455",
-"TT_nem-test_signtx_transfers.py::test_nem_signtx_known_mosaic_with_levy": "fd0ecaf352ccb48534ee9f15da5bb8e3e3e25e4ab7b529439fce8cf47b4aad62",
-"TT_nem-test_signtx_transfers.py::test_nem_signtx_multiple_mosaics": "f363e4b3862e4f8789086ce0ecb27962d0e87ccc7281526c50e7db9edeadf64e",
-"TT_nem-test_signtx_transfers.py::test_nem_signtx_simple": "456837c57ce8549365a587c41a65549c17fdda1a96924e27d114e2e4759b5232",
-"TT_nem-test_signtx_transfers.py::test_nem_signtx_unknown_mosaic": "0563d42b09fad59c044eab9737ccf9805cad07ce3ae2802cab31f84e2f7602e9",
-"TT_nem-test_signtx_transfers.py::test_nem_signtx_xem_as_mosaic": "a9d651b6574be0bdbf86fabe7f5a5e3e2b40ff0206b4d5a135394e75baeac17e",
-"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[label-test]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[language-test]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[passphrase_protection-True]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[pin_protection-True]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[u2f_counter-1]": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_dry_run": "d5cd3bdcfb744a516668abbbe1784ea82e123a2614337cf37d5d4c3d2eaf78c5",
-"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_invalid_seed_core": "9c793efe29ba1d3f848b12f0a3876e41744ef63aa826557c9ea10b8e2127ac6e",
-"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_seed_mismatch": "c231848f4040453a8201d9e9ccacd2095ad737da1a46b34f617174495b486cc2",
-"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_uninitialized": "8711e2fa6f7b301add7641e08ffb4bacf29bcd41530b1dd435fdbddb49b4bdf8",
-"TT_reset_recovery-test_recovery_bip39_t2.py::test_already_initialized": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_reset_recovery-test_recovery_bip39_t2.py::test_tt_nopin_nopassphrase": "575c3f9fe3f9fa7e9396c42b586bdafa82c07bcf18d5b6daab8b6533d5de679b",
-"TT_reset_recovery-test_recovery_bip39_t2.py::test_tt_pin_passphrase": "bcef3bb9d9b423276e1b06bbcd75af6aab6102b58d1b2fd61b4baa712af52340",
-"TT_reset_recovery-test_recovery_slip39_advanced.py::test_abort": "7717c45923e9f73efd1201a728e659db2cf3631c7d244418b77fc04301875a10",
-"TT_reset_recovery-test_recovery_slip39_advanced.py::test_extra_share_entered": "01642ed01267ba6d53524b8a01530e563e84983ef71559be4401de7799505d3b",
-"TT_reset_recovery-test_recovery_slip39_advanced.py::test_group_threshold_reached": "550337bf2577650d9c88b442b0fcb0e5f57a044a2360ed54ebbb44010293e124",
-"TT_reset_recovery-test_recovery_slip39_advanced.py::test_noabort": "9cd51efc9458359ff8fc0e3d10b809e885cc0cf5c21ec0fb2a5ce0a12d26b8ff",
-"TT_reset_recovery-test_recovery_slip39_advanced.py::test_same_share": "5f6ca704f20636a9a725c992895970f35928e57ce3b1595ee7b3528d70e171de",
-"TT_reset_recovery-test_recovery_slip39_advanced.py::test_secret[shares0-c2d2e26ad06023c60145f1-afc2dad5": "a65ca1d4bf588015ba1f6334cb20f6b4d9fa0136e40968ab1c42c9029752a30d",
-"TT_reset_recovery-test_recovery_slip39_advanced.py::test_secret[shares1-c41d5cf80fed71a008a3a0-eb47093e": "fe4de5cd82fa5af0c45c6dd890573763dd6babc1677e973d51ee8b80c18d9435",
-"TT_reset_recovery-test_recovery_slip39_advanced.py::test_secret_click_info_button[shares0-c2d2-850ffa77": "16efa172d1c4948067ac4813196e27f56693f4ebb4d27e3fd765e72dac0608d9",
-"TT_reset_recovery-test_recovery_slip39_advanced.py::test_secret_click_info_button[shares1-c41d-ca9ddec8": "0da05a609eeb7227122c3a70b19fd753efef9cfcfe340af7028e5367c732447e",
-"TT_reset_recovery-test_recovery_slip39_advanced_dryrun.py::test_2of3_dryrun": "592efc4818dd747b79952f2637f22c828934b000145828b9274e00ff6f9f6799",
-"TT_reset_recovery-test_recovery_slip39_advanced_dryrun.py::test_2of3_invalid_seed_dryrun": "d2956c6f897713a73a5e4dd8bee16a9f30f5449fd8645dfad656cc473c1e15c6",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_1of1": "645294f84e6639613afbd8c730cc5dc4e9cc1f46a062d83fc894d15d3d64d409",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_abort": "7717c45923e9f73efd1201a728e659db2cf3631c7d244418b77fc04301875a10",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_ask_word_number": "b096d90b3eafd3044eeeb56ef6dc41ed44656741f402d5a067a9fb1854c07210",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_noabort": "8d427091cd5050d6ce058de184a55fb8b103c52303e2b84027b5f7c22bf6f7b9",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_recover_with_pin_passphrase": "1d5b29035013aea4d12e1d8524c4d8b75257b1a6f914f7cc0993f44bcb3526c5",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_same_share": "779d26152cebfd00927406a690cd0b91a7e9159f0a7a5fc5229fdb2234c630a9",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_secret[shares0-491b795b80fc21ccdf466c0fbc98c8fc]": "975226cc64d04932e0668080667fae4405fa946a9962f3110c7cb925f4f38cc3",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_secret[shares1-b770e0da1363247652de97a39-a50896b7": "322df710ab6942fb092beab94b62c3d88bf40cdc47f19b04bcc1c4bd40371ec2",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_wrong_nth_word[0]": "dcee998e4a40ab4ce0db1d808d8ebe350152230f316d6f676f189d6de8f5f3db",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_wrong_nth_word[1]": "47944f740779f1a81e45d191732c0ffd499bb74ecc5b8912495ec028a745da3d",
-"TT_reset_recovery-test_recovery_slip39_basic.py::test_wrong_nth_word[2]": "69db953a31741cbbe48bd3d5e4e08a9b25da0dc6b6cea784d108041025098540",
-"TT_reset_recovery-test_recovery_slip39_basic_dryrun.py::test_2of3_dryrun": "c5760d953ec8322842e1cb0d4f040bce277cf6f690528417dc104f05c0a68237",
-"TT_reset_recovery-test_recovery_slip39_basic_dryrun.py::test_2of3_invalid_seed_dryrun": "f8174614db6d452299d49f2296183671f6248f411da79be1899574dd21b66312",
-"TT_reset_recovery-test_reset_backup.py::test_skip_backup_manual[BackupType.Bip39-backup_flow_bip39]": "781b3a4dec0764835ba8caf01a1ded3d0ca9293c6c3c2f0da039d64cf58752d5",
-"TT_reset_recovery-test_reset_backup.py::test_skip_backup_manual[BackupType.Slip39_Advanced-bac-f67baa1c": "dafc84bed542ffd801ece8a46e0a3dd7523d334e569be5b8aa6d4b9e083a895b",
-"TT_reset_recovery-test_reset_backup.py::test_skip_backup_manual[BackupType.Slip39_Basic-backup-6348e7fe": "0b87e12d402faacce2536f5c47849256d26a9b120730fe3eaf07c52975a4d68f",
-"TT_reset_recovery-test_reset_backup.py::test_skip_backup_msg[BackupType.Bip39-backup_flow_bip39]": "800dc315249ba794673c137379e2a4b2d9c4f6f4339305fd80cbfad11045df98",
-"TT_reset_recovery-test_reset_backup.py::test_skip_backup_msg[BackupType.Slip39_Advanced-backup-dcbda5cf": "b1f500f5f6d44569c010befbb1d2e77476a5c771c12f3af5582a357f74005e54",
-"TT_reset_recovery-test_reset_backup.py::test_skip_backup_msg[BackupType.Slip39_Basic-backup_fl-1577de4d": "6730a052cfbd7685f736fcb90dfee16ec4561b88cc7565ec8cb8cfe4a4949b15",
-"TT_reset_recovery-test_reset_bip39_t2.py::test_already_initialized": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_reset_recovery-test_reset_bip39_t2.py::test_failed_pin": "586559f16eb7b966abb521bcb57c65df3d6d78a82e295eb5868e5fd02a43d470",
-"TT_reset_recovery-test_reset_bip39_t2.py::test_reset_device": "b9c8c453db87b31777af9a6db5861d357d78633239862bc670591221aa4c7dfb",
-"TT_reset_recovery-test_reset_bip39_t2.py::test_reset_device_192": "fded148e118c4e874683d04b497d79e18e1b8a5fb6b362b8c32a11c31c8e7593",
-"TT_reset_recovery-test_reset_bip39_t2.py::test_reset_device_pin": "7ae5d8fcf616d070d4e696d05ff8d17d5e2043170aa296cd6892e23178df4fbf",
-"TT_reset_recovery-test_reset_bip39_t2.py::test_reset_failed_check": "483539f744e003d4216598c17a0e1487575c6fc6ca209a5cadfdfb4da7073968",
-"TT_reset_recovery-test_reset_recovery_bip39.py::test_reset_recovery": "bef3fc7817c8e727b4fd45e3fcd329f808495193a99ef897eccbd8f7b7d42ce9",
-"TT_reset_recovery-test_reset_recovery_slip39_advanced.py::test_reset_recovery": "052c4918766cc78b0e4f4e76451e1b9e05c70920348cf7a60735f40c1c6cc439",
-"TT_reset_recovery-test_reset_recovery_slip39_basic.py::test_reset_recovery": "e25e7b90f53018de09b71592d94f05597a2df5a3fba0e85d2021e0b81a7ebe1a",
-"TT_reset_recovery-test_reset_slip39_advanced.py::test_reset_device_slip39_advanced": "ddfe04e444886ce6396d41f0265a9df1c9cf9002716445419461f90120ef07b3",
-"TT_reset_recovery-test_reset_slip39_basic.py::test_reset_device_slip39_basic": "4a274ef77b76b63260303b95521739727496d61235dcc8653704722907614b18",
-"TT_reset_recovery-test_reset_slip39_basic.py::test_reset_device_slip39_basic_256": "5cdfe3e37d223458c40169d0c24c7cc949338ae26a88a23852a2de5ec9c89afd",
-"TT_ripple-test_get_address.py::test_ripple_get_address": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_ripple-test_get_address.py::test_ripple_get_address_other": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_ripple-test_sign_tx.py::test_ripple_sign_invalid_fee": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_ripple-test_sign_tx.py::test_ripple_sign_simple_tx": "2ffe8a81152b051d1e46ed8885704f81373429b021e4836b039978bdb167df38",
-"TT_stellar-test_stellar.py::test_get_address[parameters0-result0]": "b90cae42441f03cd7b5a1a9fe6bcf2ada37be3b5b949af8638477a4826c73302",
-"TT_stellar-test_stellar.py::test_get_address[parameters1-result1]": "7b20e6adacf6da1eaab8bd8dca5d48afcbeb2b35b05a036e10748cf8f8ccbb26",
-"TT_stellar-test_stellar.py::test_get_address[parameters2-result2]": "a0174a5e585f37eef3767ac4aa0ed7970a362cde2ba4fa9b3f59336f24163892",
-"TT_stellar-test_stellar.py::test_get_address[parameters3-result3]": "f1cfc7bf37befa7402cc8b59e689d656aa010687c9348c0ea59e086a7c0f149a",
-"TT_stellar-test_stellar.py::test_get_address[parameters4-result4]": "1c2508bd679680f0d6e79f4aabf9ba9eae55adadd4d7be9acf49ff5ca03375fc",
-"TT_stellar-test_stellar.py::test_get_address[parameters5-result5]": "2fe00085ac558aba502c47a4db75080d2c0c35dc35861f67ae478e00d318685b",
-"TT_stellar-test_stellar.py::test_get_address[parameters6-result6]": "66b800fcf8469544d3aa77f28564ef98876287eaa80ca324aa25b61e3edce7d6",
-"TT_stellar-test_stellar.py::test_get_address[parameters7-result7]": "f65bb9057ca5b0d7b74b3f149e43fb2481082496515afb9d85a16cd4d2dd7d7a",
-"TT_stellar-test_stellar.py::test_get_address[parameters8-result8]": "ff11fc9a9ae8201c64a87f281e62e5331e5f3bde6742f250090ed2c14cd2f049",
-"TT_stellar-test_stellar.py::test_get_address[parameters9-result9]": "909d5f138a24c7e9706bd45aa454488938515f50ed83ed9495c94496795ab8fc",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarAccountMergeOp]": "4f72a17970d0781f626bb58d414a4a75d1fd6cc66bae79337853da87c3e92bab",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarAllowTrustOp-allow]": "2796aa206e023839a3255c4f866252b0bae7fb79eebbf9c48888953643cdd53b",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarAllowTrustOp-revoke]": "fa48be1264b7223bdb79562a7384c71b69788df4ddd80778d64c558e4f444e88",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarBumpSequenceOp]": "378a7a40405d20d3480b425a527b29308eab52f1ac4a69d47bc200337984800d",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarChangeTrustOp-add]": "38f58b66b3619813cf6092f39efa78e8915292b910fd5fdc47fb4f954e169233",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarChangeTrustOp-delete]": "31924e87ac9faf0d110fd2d47fa2dac2a4a4aa904c9e487a124a4d4d1ab9c02e",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarCreateAccountOp]": "8d8139ccacd32acf01436554aef9cf8ba633854ff1b27da5c80a745f2852fa57",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarCreatePassiveSellOfferOp]": "a39df07777436208d3f803c5a866006f721e054a983301cf9e1b319c2cb630b7",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarManageBuyOfferOp]": "13d7d81b393dca866fb9c4a98c3ac7fc25ac41b2cd6b5a14533dfe45d04d9938",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarManageDataOp]": "774187f5c58b9c0fcab45ff464c29ec57e1ec1fcb6c33142c53d64406e54399e",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarManageSellOfferOp]": "55a8783e3a2139ec83b3e01bcb2955b30a5fe7cce19aa469f156b551e72633d1",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarPathPaymentStrictReceiveOp]": "bed7031be888e6488bde1afcaf4a8b20d1c2fff21c9795064bf80aa86b5b4442",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarPathPaymentStrictSendOp]": "85d94288f0ad4dbe8e6ca52d7db460721f9dfcb63bd6e265d40f045237f6770d",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarPaymentOp-asset12]": "5fdc2958c0a35486f355ea67899e0a8238154b23048e854c4b16149bd72baac8",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarPaymentOp-asset4]": "b6e1412b0bd9736186420d360a10baadc6d6dc989bbedafdeaa381be8d21d96f",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarPaymentOp-native_asset]": "c0ce436dc7fb64bf9dfd8a01fd2226d538b73daa1b9f4a544afdd3f0c94e1e22",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarSetOptionsOp-all]": "f84b5a46eedbc07620b037ce206727bae1ad602c5e7263b9ce3e8f0d6f7a051c",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarSetOptionsOp-one]": "1a5360bbca1558534acef21071ed80be4683867873ce8dea19903e5ef573143d",
-"TT_stellar-test_stellar.py::test_sign_tx[StellarSetOptionsOp-some]": "84a59ea87227660c92c29a40ead79dbcddc73189a2d52298c8c1160e52276709",
-"TT_stellar-test_stellar.py::test_sign_tx[memo_hash]": "b41c0c8063c09bcda6855c23686e9fbe1b11112191db814878dc4d59937c0860",
-"TT_stellar-test_stellar.py::test_sign_tx[memo_id]": "b53f9d1b80b270f9826507af23225823c402c657add0412d8bf7ceeb2c3054de",
-"TT_stellar-test_stellar.py::test_sign_tx[memo_return]": "f6c98efc0d1460190320ec4871ff1cff9646c404cc55a5305fa0d993593b3478",
-"TT_stellar-test_stellar.py::test_sign_tx[memo_text]": "63c54ae50374c494acedec431c12806d4cb56d3598978de21934933f67645f12",
-"TT_stellar-test_stellar.py::test_sign_tx[multiple_operations]": "2e3b48f233a86f91bb478d3786efdaf6ca41058b8277051bd670df4cb6f81815",
-"TT_stellar-test_stellar.py::test_sign_tx[source_account]": "7dbd6c2e7b39459508fb33a15f0f7e2fe9709ded829f2305ec61d8cf5a5f67a8",
-"TT_stellar-test_stellar.py::test_sign_tx[timebounds-0-0]": "1a7e7588d03289f01c5d0f9fa83e049c9bc9493b14dd0fe44bf02ecd66ffd431",
-"TT_stellar-test_stellar.py::test_sign_tx[timebounds-0-1575234180]": "a679ac9f594f6dc9c5f3fb4b0871e400fb37e434246084f00feb2375ff7e70c9",
-"TT_stellar-test_stellar.py::test_sign_tx[timebounds-461535181-0]": "a9253f97e3920e935d425310fa280033d838f33451c2d6399b4cea7add5cb46d",
-"TT_stellar-test_stellar.py::test_sign_tx[timebounds-461535181-1575234180]": "c0ce436dc7fb64bf9dfd8a01fd2226d538b73daa1b9f4a544afdd3f0c94e1e22",
-"TT_test_autolock.py::test_apply_auto_lock_delay": "d51ad160eeb8a73ba643e95dae14a06724efc398f6b7178fa0afd6d229989e3f",
-"TT_test_autolock.py::test_apply_auto_lock_delay_out_of_range[0]": "2e04a8e156327ad6d8147456d51c035013868886f6360ffa91705d3df619fa63",
-"TT_test_autolock.py::test_apply_auto_lock_delay_out_of_range[1]": "2e04a8e156327ad6d8147456d51c035013868886f6360ffa91705d3df619fa63",
-"TT_test_autolock.py::test_apply_auto_lock_delay_out_of_range[4194304]": "2e04a8e156327ad6d8147456d51c035013868886f6360ffa91705d3df619fa63",
-"TT_test_autolock.py::test_apply_auto_lock_delay_out_of_range[536871]": "2e04a8e156327ad6d8147456d51c035013868886f6360ffa91705d3df619fa63",
-"TT_test_autolock.py::test_apply_auto_lock_delay_out_of_range[9]": "2e04a8e156327ad6d8147456d51c035013868886f6360ffa91705d3df619fa63",
-"TT_test_autolock.py::test_apply_auto_lock_delay_valid[10]": "82e00b89d50d5401b28adfbae981bbb92cce60d2174b4d77db0394635f498d6b",
-"TT_test_autolock.py::test_apply_auto_lock_delay_valid[123]": "f11df7505872e387765c8b842b38414003ef8958bd4bc1a32208ab24f800279e",
-"TT_test_autolock.py::test_apply_auto_lock_delay_valid[3601]": "fca21ed846243b4e3c844867477b6a8762f02f61a87a3098d69d1e6ea7e2b436",
-"TT_test_autolock.py::test_apply_auto_lock_delay_valid[536870]": "709d2e8b2de24762737c8a8edd875a40ff6fbde5c9559b3203a2d7bd2f120153",
-"TT_test_autolock.py::test_apply_auto_lock_delay_valid[60]": "9f6a5026d1547070f16d0354ff44ebe3ec2f7daf18e3088efb4b9f0dc12a18e0",
-"TT_test_autolock.py::test_apply_auto_lock_delay_valid[7227]": "c7f7390392442a5f35c8c072b1b1f424366a29a2f63317f9735fa2b76e749e75",
-"TT_test_autolock.py::test_autolock_cancels_ui": "d81e7c4c8a365ef176894371af8c1e35290e5b12b765d6217ea083a6a320c003",
-"TT_test_autolock.py::test_autolock_default_value": "cecd5e89f9973e2fe3675006c010be1fba3291de17a298f8f410ac512ec2d2e3",
-"TT_test_basic.py::test_device_id_different": "73feab1d7f8665282dc3f3a12376d6cc1f79a0467640bd31025064821f786f29",
-"TT_test_basic.py::test_device_id_same": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_basic.py::test_features": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_basic.py::test_ping": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_busy_state.py::test_busy_expiry": "3e59ea446f4aa4fc9dd6c7980b32428181b79c5f92367fb7eebe053fe1aee4e0",
-"TT_test_busy_state.py::test_busy_state": "1a67fc79d7b26aa4a6d0d406a558e40ffe45920a2afc09c88fb9063a0e322acb",
-"TT_test_cancel.py::test_cancel_message_via_cancel[message0]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_test_cancel.py::test_cancel_message_via_cancel[message1]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_test_cancel.py::test_cancel_message_via_initialize[message0]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_test_cancel.py::test_cancel_message_via_initialize[message1]": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_test_cancel.py::test_cancel_on_paginated": "cf7416c7ee045a7e583061dc01d332be70455e790b77ea8e1482ede674c2e748",
-"TT_test_debuglink.py::test_softlock_instability": "119c2497c809c1db43b3ea6dbcf297ae69ea9c7caeb654192948f6f85cfd4fd0",
-"TT_test_firmware_hash.py::test_firmware_hash_emu": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_test_firmware_hash.py::test_firmware_hash_hw": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_msg_applysettings.py::test_apply_homescreen_toif": "f37429eb2022b604b5498db90fd733ee56bae3ed23e8001a822e2b2defba6c80",
-"TT_test_msg_applysettings.py::test_apply_homescreen_toif_fail[TOIf\\x80\\x00\\x80\\x00~\\x00\\x00\\x0-ba464b0c": "2e04a8e156327ad6d8147456d51c035013868886f6360ffa91705d3df619fa63",
-"TT_test_msg_applysettings.py::test_apply_homescreen_toif_fail[TOIf\\x90\\x00\\x90\\x00~XXXf\\x90\\x0-cb3c88da": "2e04a8e156327ad6d8147456d51c035013868886f6360ffa91705d3df619fa63",
-"TT_test_msg_applysettings.py::test_apply_homescreen_toif_fail[TOIg\\x90\\x00\\x90\\x00~\\x00\\x00\\x0-09cb7d43": "2e04a8e156327ad6d8147456d51c035013868886f6360ffa91705d3df619fa63",
-"TT_test_msg_applysettings.py::test_apply_settings": "2e9d4cd4d10939e0ff00329c3dd8c4b8b3c33605191abdc6c514ad2399c3bfe2",
-"TT_test_msg_applysettings.py::test_apply_settings_passphrase": "62a8ff0495ae35a6be4bbd2578264b7f5bd6da4c3cb4c8b58952ac97749eace6",
-"TT_test_msg_applysettings.py::test_apply_settings_passphrase_on_device": "9ee483bf455a0185bde3ba7ebc15c04ee9c3159e802818157beae60f23d41325",
-"TT_test_msg_applysettings.py::test_apply_settings_rotation": "4c0789149ffdf4e1a234dd82bcf5ef07c21bdebd0989330ccdd9040819a53f83",
-"TT_test_msg_applysettings.py::test_experimental_features": "f67b4537eb756dc98bf2a611cf5aa1f6a7980e9e882fa4b9a099944422c20853",
-"TT_test_msg_applysettings.py::test_label_too_long": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_msg_applysettings.py::test_safety_checks": "3b4ce2d35a1cebca782cdbb4820c2659c8beff382c925fa96390b529414edfdc",
-"TT_test_msg_backup_device.py::test_backup_bip39": "67b2774849c96ac1a7c7a2bbed3bdaaa58003e96b7e89bd8502aac119976ca21",
-"TT_test_msg_backup_device.py::test_backup_slip39_advanced[click_info]": "832bd97940210883b165de7c58f63d3dce750df61223cd33a566ad256cdf04ea",
-"TT_test_msg_backup_device.py::test_backup_slip39_advanced[no_click_info]": "48108986f776e027cc0fd2adf84a001398eeee1a7d7e8eb34acfb7e4417d1aaa",
-"TT_test_msg_backup_device.py::test_backup_slip39_basic[click_info]": "3c46086199f0d21daf5f17be4971490d5fab6a37de1278ab267977a321badf4f",
-"TT_test_msg_backup_device.py::test_backup_slip39_basic[no_click_info]": "1a77104caf9cfdb0fc8bcb168278689fdf5381b9f26515308d3d87cdbaab417c",
-"TT_test_msg_backup_device.py::test_interrupt_backup_fails": "a8b5bc47867681b496da4b7473cde4fa43027c01fb071c2b0dcf97804809643f",
-"TT_test_msg_backup_device.py::test_no_backup_fails": "ffc38ab2b61939fea6883a4805b2a4eb17a0be03afe0fed3b1cca492b50bb25c",
-"TT_test_msg_backup_device.py::test_no_backup_show_entropy_fails": "8711e2fa6f7b301add7641e08ffb4bacf29bcd41530b1dd435fdbddb49b4bdf8",
-"TT_test_msg_change_wipe_code_t2.py::test_set_pin_to_wipe_code": "b08bbe787f81903eeba3c2c61fdeb33ec49a57ac62b1d4143920d36a4bf86fb3",
-"TT_test_msg_change_wipe_code_t2.py::test_set_remove_wipe_code": "3cb12f582fc2c2ebacbff554479fd83bc28fb52bc2f01396fe0a6e640a5a7316",
-"TT_test_msg_change_wipe_code_t2.py::test_set_wipe_code_mismatch": "8f63a3bf93371a6df3af8f416e08e7a46aad3ea23e66f23cee9e45de65e9f33c",
-"TT_test_msg_change_wipe_code_t2.py::test_set_wipe_code_to_pin": "aed589ff77b0043db847bf9290f69f6b8a5a48b442b53e347b696c22c0ea083d",
-"TT_test_msg_changepin_t2.py::test_change_failed": "c41c6e1c4125cf071bc464b106da21dd4418e765d6fa88a0d4e2f0cae262ac88",
-"TT_test_msg_changepin_t2.py::test_change_invalid_current": "d90427015c30c66dc58dd415f1dd944afd92e60c910a5dab992efb3f5d04cae1",
-"TT_test_msg_changepin_t2.py::test_change_pin": "e5fe5dbf22c272b471851af59e340186af375881a0637b97b96cca45e3568dce",
-"TT_test_msg_changepin_t2.py::test_remove_pin": "29f886079a1d3430a94a40d4950731515c408efc7e6365d9d42ceae6ce5a7cbf",
-"TT_test_msg_changepin_t2.py::test_set_failed": "d6051691425c425f04060a6549b52637de0b0c2e29084adda4195b7b7bd28d07",
-"TT_test_msg_changepin_t2.py::test_set_pin": "c6be5263d435089601f7bfeb24dd47e51d56a9c17d47b7cbbe86d561e1471bcc",
-"TT_test_msg_loaddevice.py::test_load_device_1": "eeb5afb34b4bbf42b8c635fdd34bae5c1e3693facb16e6d64e629746612a2c3f",
-"TT_test_msg_loaddevice.py::test_load_device_2": "a95020926a62b4078cb0034f6e7a772e49fc42121c9197b534437e26c306a994",
-"TT_test_msg_loaddevice.py::test_load_device_slip39_advanced": "eeb5afb34b4bbf42b8c635fdd34bae5c1e3693facb16e6d64e629746612a2c3f",
-"TT_test_msg_loaddevice.py::test_load_device_slip39_basic": "eeb5afb34b4bbf42b8c635fdd34bae5c1e3693facb16e6d64e629746612a2c3f",
-"TT_test_msg_loaddevice.py::test_load_device_utf": "2177733bb8d39ea79a43cdd457238533dd4d79d8a8be3f43b519837db4888666",
-"TT_test_msg_ping.py::test_ping": "9b44725459426439bc27f2cf72ee926ab7146f3ee1236d197382524cdf9a89a1",
-"TT_test_msg_sd_protect.py::test_enable_disable": "fc801999f79d34e43f2f09fd91bcfae07e80af2a88729167692e43e843adb7bd",
-"TT_test_msg_sd_protect.py::test_refresh": "5558ccabb7878f5224d1130c176d6b6debd63f8a7f07b85385c1d46f874191e3",
-"TT_test_msg_sd_protect.py::test_wipe": "b1aa7408689efb7ef10af9f28f51f09ef4d925ac864619f00b172644ea601e45",
-"TT_test_msg_wipedevice.py::test_autolock_not_retained": "e82cec0a12c83236510fbfa1054b05b7c9f50bd52c81a0ceea411b81a8535777",
-"TT_test_msg_wipedevice.py::test_wipe_device": "73feab1d7f8665282dc3f3a12376d6cc1f79a0467640bd31025064821f786f29",
-"TT_test_passphrase_slip39_advanced.py::test_128bit_passphrase": "68e7d02ee3038fa20f0ccc226abdc29c422aa0d3b0c54533869276cd08a7a5b8",
-"TT_test_passphrase_slip39_advanced.py::test_256bit_passphrase": "68e7d02ee3038fa20f0ccc226abdc29c422aa0d3b0c54533869276cd08a7a5b8",
-"TT_test_passphrase_slip39_basic.py::test_2of5_passphrase": "db4a8f21cfd2bdaef28debb199e2296092b33ba26798b2ed52e708a51b62a569",
-"TT_test_passphrase_slip39_basic.py::test_3of6_passphrase": "db4a8f21cfd2bdaef28debb199e2296092b33ba26798b2ed52e708a51b62a569",
-"TT_test_pin.py::test_correct_pin": "2e04a8e156327ad6d8147456d51c035013868886f6360ffa91705d3df619fa63",
-"TT_test_pin.py::test_exponential_backoff_t2": "fd98021a35069ffc05143156453a99fe5afb356d44b737f8413ec871492754a7",
-"TT_test_pin.py::test_incorrect_pin_t2": "b8949e19b4978700b20e79ffd8463a95257c84450093f04680fa29b1c600b78a",
-"TT_test_pin.py::test_no_protection": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_protection_levels.py::test_apply_settings": "28c2ee2911b9f90de7c0ea5e34376a2842f46299e1a675cdefb79bca93120ff4",
-"TT_test_protection_levels.py::test_change_pin_t2": "36bf96ac65a768ba464467ccdd0ae29c87f74e717245d386c2b0900d672b7f3f",
-"TT_test_protection_levels.py::test_get_address": "0f8c342df6831aa84748daac30d2f9a2710835946fef3fa317516a59a842d5a3",
-"TT_test_protection_levels.py::test_get_entropy": "a305c9934384a5a4d679cbe37e2e54dfe19bde842cd1f4df02ed446ffa65cfb7",
-"TT_test_protection_levels.py::test_get_public_key": "0f8c342df6831aa84748daac30d2f9a2710835946fef3fa317516a59a842d5a3",
-"TT_test_protection_levels.py::test_initialize": "8c8d70df4266df41ca69324d9b81d0ab77eaeeb89a633c8b23bfc57aa8fbe604",
-"TT_test_protection_levels.py::test_passphrase_cached": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_test_protection_levels.py::test_passphrase_reporting[False]": "33507c11b872522eb3196916ae0046d19da75fb8bb709bcff8b993f94b0ffe32",
-"TT_test_protection_levels.py::test_passphrase_reporting[True]": "6148e0154ffa11e52c48fc2355561c5516a87ebf848fd5963fb383e3c9aa1e31",
-"TT_test_protection_levels.py::test_ping": "9b44725459426439bc27f2cf72ee926ab7146f3ee1236d197382524cdf9a89a1",
-"TT_test_protection_levels.py::test_sign_message": "8d3cce0711ba3e1cf7f9a4cac1d0e0cd857f7c9a6f972a7310fafe8f345ec9b4",
-"TT_test_protection_levels.py::test_signtx": "f45b6e9f41c3a85a16ec2f084b27c826bba534857296519f06de9c9ef02fbcbb",
-"TT_test_protection_levels.py::test_unlocked": "bb315d43cda7529736a9ce79a1919d50d8e18432fea5ee84f2787fcdd45cba5d",
-"TT_test_protection_levels.py::test_verify_message_t2": "ad6412a1e6167cb55d873577236368169c1677f51402be47bf6acbafd5ae8985",
-"TT_test_protection_levels.py::test_wipe_device": "268c8b8948909d952758ca67d3fa3fad657fb74c8bba04c7f9ec85f272df08b2",
-"TT_test_sdcard.py::test_sd_format": "83a3b2fdc0eda55c18a476868f4da957710ffcfd7f5300cd54c4c139a3aee72d",
-"TT_test_sdcard.py::test_sd_no_format": "e48ac8dc3f81340d89746a9a6bc2b89f8ebce54568c4c1805e626178ff1c509c",
-"TT_test_sdcard.py::test_sd_protect_unlock": "35a3629da12c2c1e3feff7194dd8970a5daf3e5f019c7808254537cbbd6b334a",
-"TT_test_session.py::test_cannot_resume_ended_session": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_session.py::test_clear_session": "ebf3e0055182a8cd5992df8051927a3686338662b2bcf17293370b5fb9564bb5",
-"TT_test_session.py::test_derive_cardano_empty_session": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_session.py::test_derive_cardano_running_session": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_session.py::test_end_session": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_session.py::test_end_session_only_current": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_session.py::test_session_recycling": "db4a8f21cfd2bdaef28debb199e2296092b33ba26798b2ed52e708a51b62a569",
-"TT_test_session_id_and_passphrase.py::test_cardano_passphrase": "9789521a743d9240ee65663bfdd63acef3b512a352dfdb7dcdb3b7b37ae38d13",
-"TT_test_session_id_and_passphrase.py::test_max_sessions_with_passphrases": "370cbe95d7295253b5069741da4d20be57b1eceee84e53fe874a1c3fbca2d3c4",
-"TT_test_session_id_and_passphrase.py::test_multiple_passphrases": "7f73c410413a655054ab7fcc95d9da528bd082a89cda3ee981c4c48b566e6660",
-"TT_test_session_id_and_passphrase.py::test_multiple_sessions": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_test_session_id_and_passphrase.py::test_passphrase_ack_mismatch": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_test_session_id_and_passphrase.py::test_passphrase_always_on_device": "e348385ec138e424448295c4aa1bb07ed7086cb06187a1b3c299346c37e13145",
-"TT_test_session_id_and_passphrase.py::test_passphrase_length": "928b70f715015cb291bcd9890190dc53a4a31a7965d7b7eadfa5ec2e7a3a47a1",
-"TT_test_session_id_and_passphrase.py::test_passphrase_missing": "95a40f79fa7ffceb10e89b513c203b4937112b8d764cdba3c1df538355dc129c",
-"TT_test_session_id_and_passphrase.py::test_passphrase_on_device": "898f4c603b4224a9c5fef0b9ed4d71fbcc1545edbf279effc5c4b13829daa7e6",
-"TT_test_session_id_and_passphrase.py::test_session_enable_passphrase": "9c96dc98e60e7b3a16d7f328f92a001e8c6727902e6912100fc45b3dabee612c",
-"TT_test_session_id_and_passphrase.py::test_session_with_passphrase": "a7046b2ffe82d6b5194ad34d17d0fa2e16bfa29ab8df798dc38d2b40de01c434",
-"TT_tezos-test_getaddress.py::test_tezos_get_address": "d5c6a3fcb7bf58d62be0eb6d3d51fa17ebeadfb8ec3359f11e5b3771bb33e4f4",
-"TT_tezos-test_getpublickey.py::test_tezos_get_public_key": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1",
-"TT_tezos-test_sign_tx.py::test_tezos_kt_remove_delegation": "8efcd5f20130427c6465f21159df335ce9212e73361ad17452ad8b14afc1301c",
-"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_delegation": "b904ceffd4ab9aa2ddfdee544ed6bd07fd56a5fb52a77c4c85a8cb4a6f1c31d5",
-"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_multiple_proposals": "1081161ff81fcce6ea55abd901a46305d3ed4ca504f356038f9e755a660e4622",
-"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_origination": "77d13c2abc07cb88419015f6bb04655a62c3ae6eec01d623754133cd2e8c9f29",
-"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_proposal": "95b379c0d836d857499e13b88556c3d98fa616cb076d6720844a109a067ebc11",
-"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_reveal": "6dbc00c8eebd105a7657b3f8fafdfa5d43880e1bc6b4361e8b16e45925682192",
-"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_tranasaction": "73d18b87f71c33c4bb5f8f5f1f6e76e96bb272eec5b4fea84fb4fa2abd08bb25",
-"TT_tezos-test_sign_tx.py::test_tezos_sing_tx_ballot_nay": "f1ecb8554bd816056f8027bc5588559e08f134cd1b53796a09d6b0850c06fd56",
-"TT_tezos-test_sign_tx.py::test_tezos_sing_tx_ballot_pass": "6d133819ed7b3ca148544c63858f275ec14f8276a47348765bc2a09f4dfbad3a",
-"TT_tezos-test_sign_tx.py::test_tezos_sing_tx_ballot_yay": "737966b740627e0e3e90c1ef560a0433afe4813ef4192fb4403968b891604818",
-"TT_tezos-test_sign_tx.py::test_tezos_smart_contract_delegation": "d6aa87d41dd4d6529904f9f293b3ed88538abb07f57de122eb76cd79a2420f15",
-"TT_tezos-test_sign_tx.py::test_tezos_smart_contract_transfer": "badc135456025bf9878d8a8276bdd722c8009d49502b9ca7aa4cd566547205a9",
-"TT_tezos-test_sign_tx.py::test_tezos_smart_contract_transfer_to_contract": "5f5033fb5debd0252fddc005de508c5074400cdfc31895e663d1ec1454c13675",
-"TT_webauthn-test_msg_webauthn.py::test_add_remove": "943e29255d6738cc6824c2565001c05906c2cd032aa2eb09993782564e890a16",
-"TT_webauthn-test_u2f_counter.py::test_u2f_counter": "c6a8e270ce726c7693e2ff88f9af57c56f2d3d8b1cc9c04b6f1dc71e13fcb88e",
-"TT_zcash-test_sign_tx.py::test_external_presigned": "db6cce246954fb19c16ec47c6051f06386e8c3a7b6cdbd9d07214380ed8de80a",
-"TT_zcash-test_sign_tx.py::test_one_two": "b0f75e54902165407718544e1f079761cfd7b211907870e5c9df52fffed1814c",
-"TT_zcash-test_sign_tx.py::test_refuse_replacement_tx": "43106624df7948079a4873fdbd34b2a1555e0abb2fc88a8c2e194f6b3a83bd3c",
-"TT_zcash-test_sign_tx.py::test_send_to_multisig": "2000a053d0fe3aff5f6b6c1a641568c9a5ed32687ad47fa598008cfb2472ecb5",
-"TT_zcash-test_sign_tx.py::test_spend_multisig": "42de89bf5d7d4fbd2e9a528a3cc5fd5ecb95713e90d96f81feba45ae0cb91e78",
-"TT_zcash-test_sign_tx.py::test_spend_v4_input": "641e5d09f3ca504faa9c1d5d5258bb67180673b2d24c7405ca00c30338bf932f",
-"TT_zcash-test_sign_tx.py::test_spend_v5_input": "07ba43c33427467c8cf435fbc0e60d969a8e2337e82077696c2dc0efc3bca99f",
-"TT_zcash-test_sign_tx.py::test_unified_address": "938b7218083d53aec136e7f963766b2dd97dc77e3352d0dad747cce49902815c",
-"TT_zcash-test_sign_tx.py::test_version_group_id_missing": "f03b50df7f4a161078fa903c44f37272961b70358d4014d30a12888e1fd2caf1"
+"T1_zcash-test_sign_tx.py::test_version_group_id_missing": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+}
+},
+"TT": {
+"click_tests": {
+"TT_test_autolock.py::test_autolock_interrupts_passphrase": "8e45b1e888f0d4a7df02cd3b41407cf8fb83389ba9faceb7eb75e45e56ce2d72",
+"TT_test_autolock.py::test_autolock_interrupts_signing": "59666e372f5c10ef2ed10427829a128d5bf4fbf4e7a4792f51327e34e4328d74",
+"TT_test_autolock.py::test_autolock_passphrase_keyboard": "0ff48a1a94222cce776b6c261c1a20167d71b970ee9a9ee5254db942f3aec970",
+"TT_test_autolock.py::test_dryrun_enter_word_slowly": "cf9761167b8b155c60db2da5a4a6a689dd9f598e9551e06b21551851d6873e2d",
+"TT_test_autolock.py::test_dryrun_locks_at_number_of_words": "aa479397af496496db214b5debb4ab4d30c0e8e7b347ec3169bb76aaf5ce735b",
+"TT_test_autolock.py::test_dryrun_locks_at_word_entry": "145c53e02422062fd3d6b2c48b624ef85f2c54d153fc583acfdd7fb3a62b2a6b",
+"TT_test_lock.py::test_hold_to_lock": "11a333c2bf616cefbdd8448b6fc54dd67610fd218c5007bcf3b796521885d017",
+"TT_test_recovery.py::test_recovery": "b8db4b084d0856a52e40f066e2b3edeb0918c98d8850397d8f172675ca72ce8c",
+"TT_test_reset_slip39_advanced.py::test_reset_slip39_advanced_16of16groups_16of16shares": "158704007511adc21633cc40a6a3ce8bc3e3f4316232f1b06ea392ad55e9e751",
+"TT_test_reset_slip39_advanced.py::test_reset_slip39_advanced_2of2groups_2of2shares": "b9fb1d5d5b43cb4ff30bb20f9f135bc691ee5711c1aa43a7bf7bb2d4bea3d4fb",
+"TT_test_reset_slip39_basic.py::test_reset_slip39_basic_16of16": "b0daed72d842a7e3c3ac4aed47debb5bf23da5b96c459d7fd173e42dc563a5ed",
+"TT_test_reset_slip39_basic.py::test_reset_slip39_basic_1of1": "1711b4a1a8cbccbee6f65c9dabbfbfbea886c80eedcfefff0e8175b708c488d9"
+},
+"device_tests": {
+"TT_binance-test_get_address.py::test_binance_get_address[m-44h-714h-0h-0-0-bnb1hgm0p7khfk85zpz-68e2cb5a": "1cb2b0665827b1c8521f2ec85615e3335d53ba227ae117b651bf4695953a7ee5",
+"TT_binance-test_get_address.py::test_binance_get_address[m-44h-714h-0h-0-1-bnb1egswqkszzfc2uq7-1adfb691": "e5975dd56994e4f1159207b0640de306619949e5cba2d9a5ef97dca369d47cdb",
+"TT_binance-test_get_public_key.py::test_binance_get_public_key": "9ef5e6a9bbf83a72367ee2020dc841985ce15967d5a7285c022ff7c245a01780",
+"TT_binance-test_sign_tx.py::test_binance_sign_message[message0-expected_response0]": "839873f4db4c5e2f268f11db80a690529b4dba6342fedb726de9007def9d99ff",
+"TT_binance-test_sign_tx.py::test_binance_sign_message[message1-expected_response1]": "0f8f0cb90960d0069d3adc2f78891c2bc74422420bdc72a3e809fac3a6396e2a",
+"TT_binance-test_sign_tx.py::test_binance_sign_message[message2-expected_response2]": "bfda5e585a303deb898f4ae61ad696c75cca9d88436e3b1ee48dd015b4180815",
+"TT_bitcoin-test_authorize_coinjoin.py::test_cancel_authorization": "0a37e7e07f7a7ed8cb00b311046e9e91e0fd211e6c2f22b6ebeb69ec22bdda55",
+"TT_bitcoin-test_authorize_coinjoin.py::test_get_address": "eda238e95c759391b5cd746720f2319f4f5b0b23327909457c79d0735eaa002d",
+"TT_bitcoin-test_authorize_coinjoin.py::test_get_public_key": "a29b9f19da5cb70a24c2cc89a8c8425d9f085a1f614affdacde891a531180223",
+"TT_bitcoin-test_authorize_coinjoin.py::test_multisession_authorization": "ba3ceb1ebc867d4be866a84714e78581563c0d6d185a20d1e154a4be70e4432c",
+"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx": "e7de0c58771e783bb71058b86760259143fd0fc8f6fb3e1ba9b9f18578972ed6",
+"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx_large": "8954120be7d17be42e0ac881c728fdfe79b7512e1d8744272751215f2502375e",
+"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx_migration": "8fa348051144e983e90c118cb26bc2c6a332650b5ff78cea910ed5ee162eb921",
+"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx_spend": "cd668beb0174f9142b78fb1573611c46669b066d84f1a09e7d3d0f99687883bf",
+"TT_bitcoin-test_authorize_coinjoin.py::test_wrong_account_type": "0a37e7e07f7a7ed8cb00b311046e9e91e0fd211e6c2f22b6ebeb69ec22bdda55",
+"TT_bitcoin-test_authorize_coinjoin.py::test_wrong_coordinator": "0a37e7e07f7a7ed8cb00b311046e9e91e0fd211e6c2f22b6ebeb69ec22bdda55",
+"TT_bitcoin-test_bcash.py::test_attack_change_input": "e201bc2aa26e4b51e7d6cc07490a7683783dc216ef745497931aaaff4eb679ae",
+"TT_bitcoin-test_bcash.py::test_send_bch_change": "e201bc2aa26e4b51e7d6cc07490a7683783dc216ef745497931aaaff4eb679ae",
+"TT_bitcoin-test_bcash.py::test_send_bch_external_presigned": "dace286fa857495ebf70db6ee9398e00040c2846fbbb57836dca3f2c3611e488",
+"TT_bitcoin-test_bcash.py::test_send_bch_multisig_change": "575b51f37ed98f8542434239ff89911c2ea99497a059b8339abfbc9e1c9575f6",
+"TT_bitcoin-test_bcash.py::test_send_bch_multisig_wrongchange": "93c7f8e72f1a31e685796e0a98f8d23b49f9c5f1ef67b76a10067ab82515a4f5",
+"TT_bitcoin-test_bcash.py::test_send_bch_nochange": "faefb55c8730250ea1dcd52d2aba61dcb46a8b7b7198691e4a006222e8904cda",
+"TT_bitcoin-test_bcash.py::test_send_bch_oldaddr": "b81b56caedafebff2657c5002d5ecbfa4b6610ae5ad138ce6eb18276f2fce35b",
+"TT_bitcoin-test_bgold.py::test_attack_change_input": "e6d8efdc0baa6e8fa8c468754a841a27d399158a86a1e23135795b0e7710e564",
+"TT_bitcoin-test_bgold.py::test_send_bitcoin_gold_change": "e6d8efdc0baa6e8fa8c468754a841a27d399158a86a1e23135795b0e7710e564",
+"TT_bitcoin-test_bgold.py::test_send_bitcoin_gold_nochange": "d66446582fd15cb58bc64491496dbb69dc423ef2f84579ab3f38654f242c2400",
+"TT_bitcoin-test_bgold.py::test_send_btg_external_presigned": "83217c06e51314c5f812fd9d84df7bb119a2207b74b48f001a768032773bee8e",
+"TT_bitcoin-test_bgold.py::test_send_btg_multisig_change": "119f2c103523aa3892b393532bf15c7983434cab64c2a6fb10bb52c3d8901ab7",
+"TT_bitcoin-test_bgold.py::test_send_mixed_inputs": "de33998196d4a4734ef665c6a4bf8708f0432a0a5ef84fd4dda5ad69832bd099",
+"TT_bitcoin-test_bgold.py::test_send_multisig_1": "515d1c21f35285d743afb96abbf10845191203f397c2d5d638c89051fd0c505a",
+"TT_bitcoin-test_bgold.py::test_send_p2sh": "a780f8b73b5be50f66000c7fa079f489721b5a7c8d896d113d8c5dd11fc54a7e",
+"TT_bitcoin-test_bgold.py::test_send_p2sh_witness_change": "a677e0f1eefa96db04d7c2febead4095108534566b57506bdd17bc81e8445946",
+"TT_bitcoin-test_dash.py::test_send_dash": "4ee1d3689b6c70ac071952136bafff9bdf2877fe16782ea92d2bc965ea7f2b28",
+"TT_bitcoin-test_dash.py::test_send_dash_dip2_input": "20733fe0c0213c284a4d42ea84477b10b829e58e1f6a9f9fc82a08abbe384f1a",
+"TT_bitcoin-test_decred.py::test_decred_multisig_change": "049c54a0137ed6ba8f032f7f63c174ce9d606f41684b651edffde957b1d28512",
+"TT_bitcoin-test_decred.py::test_purchase_ticket_decred": "cd5acf17c230ef59f177a415ca3a84c2d6fd6e68eda14b04c74a06d7843ebfdb",
+"TT_bitcoin-test_decred.py::test_send_decred": "50603ea43914abb0837c74acc504eaedc43a43e2768d98369429801bd01f5964",
+"TT_bitcoin-test_decred.py::test_send_decred_change": "6c59328a7b86d3390abc71ca832574f906ec951e87103471fcd1c771e8f8bf4b",
+"TT_bitcoin-test_decred.py::test_spend_from_stake_generation_and_revocation_decred": "ddf1e8bc210b39ba21efc7ecd1e91f1ee03804afca1db604940f8f6d6d1e6c3f",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDADDRESS-pkh([5-7a80e3db": "89c23e19d7b16bd845c14789a502d38e03dd1ffcf5b7638d0802639b046fb0a5",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDP2SHWITNESS-sh-03d56ac2": "d6db755cac33dd5714c817e8cf577fdb932b21e3d85090b2f18c3576ccdd6081",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDTAPROOT-tr([5c-22751b2f": "afbf9a433e6b0f592e3b1a02fd72a441d9540a5b668fd803322d77dc1b61dbc8",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDWITNESS-wpkh([-edfbc435": "181d69d92719ac12e8242352a271cf6e5f51a733e7d4d29794df8f90b43a7ce9",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDADDRESS-pkh([5-5ab06094": "4411accb99dfd000bffd96793484167ca9979384ec3800c8e8663871437b5423",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDP2SHWITNESS-sh-5dd6ae4b": "69e9b37f44a31a2b811783d8e5f30f25cdac6e0b75e20a136f0ae50b9cf2ef85",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDTAPROOT-tr([5c-f4f20781": "33e5ee0bf2e5147b5c841f6ab41ee56f6ba2b282abea2721bcfcccf5ca99f9cd",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDWITNESS-wpkh([-98a75f0a": "0837353fcc7afba6be9b75a22bc253d8f8f212cf754a1796a08c290e68db48f8",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDADDRESS-pkh([5-f63bf93f": "96e6dd1b907eb832318105fc8e06ffbb307f987e817ae6b7dad0bca768db6ee3",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDP2SHWITNESS-sh-fd42e1d9": "dc7897e1a5f57146edfae7bd999d6f9a09c878cd44cc499688eec870e7514918",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDTAPROOT-tr([5c-a794e72a": "e4e3031a241470d5387c3991885d0835174ead327a3854eb25c50ea833955518",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDWITNESS-wpkh([-e70d0168": "8a743224a12ec72b91e6b44064c81e4ff2e1a79f79bea29a572064d81af62b3d",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDADDRESS-pkh([5-2d5b32fe": "aa9eb7953ce0543e04ab0709d6396dcdfb2708dc69a26df506024e69d30219bc",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDP2SHWITNESS-sh-e8c5303c": "ab42ca218adde99e26642fa8e2d147d84c39dc14fb2838c41550030217c35e75",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDTAPROOT-tr([5c-ddc924d3": "d2be03f490b5770ca1adb34e4a21c78c5717db7e9894bca8697cbce2330b5ab9",
+"TT_bitcoin-test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDWITNESS-wpkh([-996ae319": "97a7649cadc2bc5fa7679c2c10eab3ee9dd311a604377c45ef70a5802d543208",
+"TT_bitcoin-test_firo.py::test_spend_lelantus": "1144c592c70cf924c8f8f7f9b96d5c827359e9f1a13c4f5e40eac1dc2761f5ca",
+"TT_bitcoin-test_fujicoin.py::test_send_p2tr": "4d6b10e8c36dbcd4bd32b0573b6320d07a26a63feff86b6a945029ca896bdee9",
+"TT_bitcoin-test_getaddress.py::test_address_mac": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_altcoin_address_mac": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_bch": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_bch_multisig": "347c2d67b3ddf9391230ef53633808869d89d09da67f0de2e4a84a5e5ad0be7d",
+"TT_bitcoin-test_getaddress.py::test_btc": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_crw": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_elements": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_grs": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_invalid_path": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_ltc": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_multisig": "b2a53e69d53b565b76b66696032e1123937bfe4914fb3efe79ad155b3d778d58",
+"TT_bitcoin-test_getaddress.py::test_multisig_missing[False]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_multisig_missing[True]": "f6bf78106130aaa306e2e4bdd72ceb383f08533b8046e51aa7cc0ccb473b5d6d",
+"TT_bitcoin-test_getaddress.py::test_public_ckd": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_tbtc": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_tgrs": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress.py::test_unknown_path": "36d711efcd14c4c91e272b95bc30626d327acf2b4626e9c5d4374510bdc5e80d",
+"TT_bitcoin-test_getaddress_segwit.py::test_multisig_missing[False]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit.py::test_multisig_missing[True]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit.py::test_show_multisig_3": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit.py::test_show_segwit": "55a15653608cc9c0500cc4854fc6a1655698e4904f347f8b020d79f7603ac5e1",
+"TT_bitcoin-test_getaddress_segwit.py::test_show_segwit_altcoin": "9f826c9260f54304f71a8e1f8a2a666fd9a3100bf9d42766173f428d165ee697",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_bip86[m-86h-0h-0h-0-0-bc1p5cyxnuxmeuwuvkwfem-dc12f29f": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_bip86[m-86h-0h-0h-0-1-bc1p4qhjn9zdvkux4e44uh-1f521bf2": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_bip86[m-86h-0h-0h-1-0-bc1p3qkhfews2uk44qtvau-d8b57624": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_multisig_missing[False]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_multisig_missing[True]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_multisig_3": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-84h-0h-0h-0-0-InputScr-6bc4ffc3": "ef7b44d1f3aa469efaacd73b630370c3e93e10fbeb32963485bf767f1031d981",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-84h-0h-0h-0-0-InputScr-8943c1dc": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-84h-0h-0h-1-0-InputScr-016718c1": "7d4e8ed9c5b7290eabdfb21da652b781b3e8190537e59ec8f88dc08a1f12e80e",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-84h-0h-0h-1-0-InputScr-7656a4db": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-86h-0h-0h-0-0-InputScr-3d3cc8eb": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-86h-0h-0h-0-0-InputScr-8571d5e0": "b4a4c24b1222fb18f466b3d5c9b3411b1b709b67a248b09c5acddaf73931f6ca",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-86h-0h-0h-1-0-InputScr-ab700de2": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-m-86h-0h-0h-1-0-InputScr-da3803e0": "fd243d6ef7b58adc1465637ce9ff1d729371c0884054fab435273c90131c6efa",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Elements-m-84h-1h-0h-0-0-InputSc-490228be": "5638222a8f8c77e788d61b68d9b5adad1ee786dc1817105825ade9cfb82256c5",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Elements-m-84h-1h-0h-0-0-InputSc-ed587e90": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-84h-1h-0h--40b95144": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-84h-1h-0h--45b4ff5d": "f0ea90ed62c46d60b593d6f5a305492cfc376a67d7bb4d535997bef7dd70c2af",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-84h-1h-0h--8f7c658b": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-84h-1h-0h--93c9c3ff": "086e775930f39b7d3d7f82a62f549ca94a4c581578f459571bbdff1265ba9ed8",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-86h-1h-0h--5feb8c64": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-m-86h-1h-0h--8d4476a1": "f26dc0d5ffda3d90ddb6cabe0bdc7903d78825ed8282d9d4d06d8c84b52be7c4",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-84h-17h-0h-0-0-Inp-0200a67b": "567f3ec19f93ee0b856328755e1c6f8f7a670e89e1716b31f9cba7ebf2aa6635",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-84h-17h-0h-0-0-Inp-e6c1098a": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-84h-17h-0h-1-0-Inp-9688a507": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-84h-17h-0h-1-0-Inp-f825f217": "643f05d294844f2a0e1bd7501b7c398122003d270480da2cf3ba53b61d25fa8d",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-86h-17h-0h-0-0-Inp-38cd93cf": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-m-86h-17h-0h-0-0-Inp-ebecce6e": "a26aff71ac96c043a89d072afb7766232d7a9e8a4c657c9a9fa27774e9df089a",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-84h-1h-0h-0-0-InputScr-313b9443": "99b52f4bfbd5f8d1d5e3879dac8a5a69ee86c3a5e66ea09e1fedf0a83a4b4947",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-84h-1h-0h-0-0-InputScr-ce15ec92": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-84h-1h-0h-1-0-InputScr-040186c0": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-84h-1h-0h-1-0-InputScr-b10918be": "834a9834b2f32d5cd6a371a5ffa8ee97517595e947f16ed42d3d01a12e539b63",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-0-0-InputScr-55ae0ae6": "35101158696b4efc79fe4edbb134e57eeb242875ae5de1544a4d877a56a8d310",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-0-0-InputScr-821a199d": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-1-0-InputScr-9d2fa8bc": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-1-0-InputScr-d5b7f8fc": "8888562660f406537561b078b8097834fd2a720d7682f6f6dcb137a738fbcec5",
+"TT_bitcoin-test_getaddress_show.py::test_show[m-44h-0h-12h-0-0-InputScriptType.SPENDADDRESS-1F-1e4f2f74": "7b496c8e545d9b3a7f8b6b94876f2da7806be8ad7efe98ca641b088a9b00abf8",
+"TT_bitcoin-test_getaddress_show.py::test_show[m-49h-0h-12h-0-0-InputScriptType.SPENDP2SHWITNES-a986211d": "fcd5013476e44aa220af98fa5da22466f3a6b62f9726caec1e7827f03dee3ae4",
+"TT_bitcoin-test_getaddress_show.py::test_show[m-84h-0h-12h-0-0-InputScriptType.SPENDWITNESS-bc-a5f08dfb": "6d1b93e7905f5a9359921a8613f3ccf12d18e3f23a768115f7cab88854a61dae",
+"TT_bitcoin-test_getaddress_show.py::test_show[m-86h-0h-12h-0-0-InputScriptType.SPENDTAPROOT-bc-f94d8b44": "d5e229d7792df56f7fedd9cb2353495026e56408544647f3107de74649f4a2fd",
+"TT_bitcoin-test_getaddress_show.py::test_show_multisig_15": "f7b789bee718fcfb7a885648450b862adf361a1f66423cae600de406e0c7e7a1",
+"TT_bitcoin-test_getaddress_show.py::test_show_multisig_3": "1d66a5039c91dc08bc74ae0c31ffcfb577782bda64803d579701669b07afa0cf",
+"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-4efd9cf3": "fe84bd2fd0952e3a02b46f68821203b6020c85638961f79b704bb106768060b3",
+"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-98a7e339": "fe84bd2fd0952e3a02b46f68821203b6020c85638961f79b704bb106768060b3",
+"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--2cf5f03c": "446bbbdefe259450279a212bfc6ed567c22b2e9fa95aa0462a2efe464f96cf04",
+"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--5ea18367": "2094483984183dedf8f8e2b28596b4ca343b6ee694b5936a128d24fe40d599fc",
+"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-e70b56ea": "22e1344ab7a0fcfa986359bf5236b9bc5175715c91e529f455a05571cba6c00a",
+"TT_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-f3c4650f": "f5b1900e4afa54bc00950421d4ad6d1e213b3adc7785abb5ea1678e762a7ca5e",
+"TT_bitcoin-test_getaddress_show.py::test_show_unrecognized_path": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getownershipproof.py::test_attack_ownership_id": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getownershipproof.py::test_confirm_ownership_proof": "c3c75ff51bcea27b517255b770417cdfa79ca020eec0e6329d2caf7957728820",
+"TT_bitcoin-test_getownershipproof.py::test_confirm_ownership_proof_with_data": "18854345dbbd4e0d6b4a6be7aff8f133e28c42ed4a21311d8c7b25722c4b2f19",
+"TT_bitcoin-test_getownershipproof.py::test_fake_ownership_id": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getownershipproof.py::test_p2tr_ownership_id": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getownershipproof.py::test_p2tr_ownership_proof": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getownershipproof.py::test_p2wpkh_ownership_id": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getownershipproof.py::test_p2wpkh_ownership_proof": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path0-xpub6BiVtCpG9fQPx-40a56ca3": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path1-xpub6BiVtCpG9fQQR-1abafc98": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path2-xpub6FVDRC1jiWNTu-47a67414": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path3-xpub6GhTNegKCjTqj-990e0830": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Bitcoin-76067358-path6-xpub68Zyu13qjcQvJ-8285bd20": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Litecoin-27108450-path10-Ltub2dcb6Nghj3k-53e5db37": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Litecoin-27108450-path7-Ltub2Y8PyEMWQVgi-d0bb059c": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Litecoin-27108450-path8-Ltub2Y8PyEMWQVgi-98ae2c41": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Litecoin-27108450-path9-Ltub2dTvwC4v7GNe-8d6d95fb": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Testnet-70617039-path4-tpubDDKn3FtHc74Ca-f3b70aff": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_get_public_node[Testnet-70617039-path5-tpubDGwNSs8z8jZU2-8b5efa13": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_invalid_path[Bcash-path5]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_invalid_path[Bitcoin-path0]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_invalid_path[Bitcoin-path2]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_invalid_path[Bitcoin-path3]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_invalid_path[Litecoin-path4]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_invalid_path[Testnet-path1]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_script_type[InputScriptType.SPENDADDRESS-xpub6BiVtCp7ozs-9813cc48": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_script_type[InputScriptType.SPENDP2SHWITNESS-ypub6WYmBsV-0710fbb3": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_script_type[InputScriptType.SPENDWITNESS-zpub6qP2VY9x7Mx-84eaa56c": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_script_type[None-xpub6BiVtCp7ozsRo7kaoYNrCNAVJwPYTQHjoXF-c37a47fd": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey.py::test_slip25_path": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey_curve.py::test_coin_and_curve": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey_curve.py::test_ed25519_public": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey_curve.py::test_publickey_curve[ed25519-path4-002e28dc0346d6d30d4e-e6c7a440": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey_curve.py::test_publickey_curve[nist256p1-path2-0324c6860c25cdf7a8-d75f4900": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey_curve.py::test_publickey_curve[nist256p1-path3-03b93f7e6c777143ad-2d6b178b": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey_curve.py::test_publickey_curve[secp256k1-path0-02f65ce170451f66f4-9c982c22": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_getpublickey_curve.py::test_publickey_curve[secp256k1-path1-0212f4629f4f224db0-0209bb73": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_grs.py::test_legacy": "6f9727e6535fdab37271fc10e1b30b98ce7c216feae902106fde07eef737d2c2",
+"TT_bitcoin-test_grs.py::test_legacy_change": "92c11bda9917f697ac0a56bb41b7f2cd0a532ba0b4b7d3185134baf67c8f3cdf",
+"TT_bitcoin-test_grs.py::test_send_p2tr": "ed06dd86561d879e579cf76222ec7d83f0fc991ac5e5039ad5eb526c0c33b96a",
+"TT_bitcoin-test_grs.py::test_send_segwit_native": "c2168f45f87efae86429845bc7699934b41d17ea34af178c7bf4bac267ff3a6c",
+"TT_bitcoin-test_grs.py::test_send_segwit_native_change": "12fabd1129c0a0d33dc4245db6cb796eff632fafb93ee7a50a281b6051824c80",
+"TT_bitcoin-test_grs.py::test_send_segwit_p2sh": "1a2c7357c72a5e3b48059f563f1acaa886b5c642fff85513b18eaf6406697056",
+"TT_bitcoin-test_grs.py::test_send_segwit_p2sh_change": "81a73510d220a2abfbe46e0071b49f15fd406200aaca3b5e90722e93ec6fbcc9",
+"TT_bitcoin-test_komodo.py::test_one_one_fee_sapling": "a111a15350ac841a67134d159bd346b3be345fb2d28ad93d212b636bb33ae91c",
+"TT_bitcoin-test_komodo.py::test_one_one_rewards_claim": "53fed49bce85711651b99733c164741be4387e8724dee044aecae290b7f118d2",
+"TT_bitcoin-test_multisig.py::test_15_of_15": "cdf23ce47a1823e4d3e196628f5db2e081e8beb42f8984ac82a143387c7728d3",
+"TT_bitcoin-test_multisig.py::test_2_of_3": "aa4228387b445eba4cace6ae1a8c9fa6fab8b5e9c5a0ca2da2d79de94db12d0c",
+"TT_bitcoin-test_multisig.py::test_attack_change_input": "adcd3cb376bc9dc1de9739f42a539321ff7c6fb2fbeeaf5428bc8a534df4940a",
+"TT_bitcoin-test_multisig.py::test_missing_pubkey": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_multisig_change.py::test_external_external": "8d67c21171128a224ce612f47ab3a95533f1c76cd61182146f1b969f382dfd71",
+"TT_bitcoin-test_multisig_change.py::test_external_internal": "2f41587169e72a6bc20f1fd6b6804827c278ee6529bd7723183b5515942a1b2b",
+"TT_bitcoin-test_multisig_change.py::test_internal_external": "dd1af10723f4e6bae0b644268591e9aa03e9175b1fcbb70e0dbafd665b3783e7",
+"TT_bitcoin-test_multisig_change.py::test_multisig_change_match_first": "730631a8d21dc5947ecac43a0aa3a1632ec17c9d7e1e5be438c283384d381fce",
+"TT_bitcoin-test_multisig_change.py::test_multisig_change_match_second": "5794c6e0707192bc7a9404bccacbb4bd78ff713ba447252f0104aa0e6bd060f6",
+"TT_bitcoin-test_multisig_change.py::test_multisig_external_external": "2e998ff5310889cbb5b27a1654304ca4851a4c2a0ed8a130c7d3b302454582cc",
+"TT_bitcoin-test_multisig_change.py::test_multisig_mismatch_change": "e687a4bec433745c05972cfe93496955592c4c81a384f65a9b597e3d97890896",
+"TT_bitcoin-test_multisig_change.py::test_multisig_mismatch_inputs": "039203db224f6132f1d800779df582a5d77fa90ef02314e4665e106234931066",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress[m-1195487518-6-255-script_types3]": "29ec760122416584c1d0898a1af80421832ae16254b1b92fba2ec7aab4c0a71f",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress[m-1195487518-script_types2]": "8948056f85610c47ff6696335a523e83999a4d3136fe985ff56d482710e11c25",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress[m-3h-100h-4-255-script_types1]": "ff744cb9a98f379e56562252c419b70f3e37ea8a54b9211155879fadea2db8a6",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress[m-4-255-script_types0]": "6f757653cc58cfdd3b37d01405b357460607bbeca6ffb80209fe2c44de3724d4",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress[m-49-0-63-0-255-script_types4]": "66480628afbc5bcda3fec2c53e6213a4df9b0643fcbdc2ea153ed2f8649c8032",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths0-address_index0]": "e0956390804c26d7cbae1f84aa5810b5b00a26e4f5430eb2eb371485ef5b68be",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths1-address_index1]": "ee61a979972b8b95aab1fa74b340ea07dc491984a3212ed6389bfeb5c2806318",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths2-address_index2]": "b28fe5d2e21e447ad657c258c6dc3c6768691600265c5b83f6c59926299112ef",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths3-address_index3]": "0298ab030b52465f9b57f1d55ca6d5fcd7374c9c3c98cf9e80607abdc6317f9a",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths4-address_index4]": "a5c35e4ba6cc251c584586890a4aec63a926b48640bd138c4444608c6229f573",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths5-address_index5]": "5c3c42bf8595f69f12ce2ef1d3a885dddef89d60afc9530ccb6b8f65b9d2ca0b",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths6-address_index6]": "b5add348788cdfa4c727e73179954ec14c6de94f1751b5e572d1337fbc273b58",
+"TT_bitcoin-test_nonstandard_paths.py::test_getaddress_multisig[paths7-address_index7]": "b2c960cd09f02a9b4ea741884dcc24479f8c127d3dc2c4744832072ad84f3285",
+"TT_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-1195487518-6-255-script_types3]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-1195487518-script_types2]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-3h-100h-4-255-script_types1]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-4-255-script_types0]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_nonstandard_paths.py::test_getpublicnode[m-49-0-63-0-255-script_types4]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_nonstandard_paths.py::test_signmessage[m-1195487518-6-255-script_types3]": "7afabcdac5f59c2199822eeb8045eaf5c4e45d2e170c071110e57301eaa8521c",
+"TT_bitcoin-test_nonstandard_paths.py::test_signmessage[m-1195487518-script_types2]": "ba82953b29cf79271e7f6e95b09df0cd4d8ba3b05a86652dbdd8e96648c96695",
+"TT_bitcoin-test_nonstandard_paths.py::test_signmessage[m-3h-100h-4-255-script_types1]": "3aff38f84b98ea8e5d7be7ac4a5e5aaed3ba48c8026678d585633243e6909221",
+"TT_bitcoin-test_nonstandard_paths.py::test_signmessage[m-4-255-script_types0]": "519176fa755b1869e3146c88d23fc874841606f9a304d4dfdf41413ceef4cc3e",
+"TT_bitcoin-test_nonstandard_paths.py::test_signmessage[m-49-0-63-0-255-script_types4]": "f854ab3f4dee7863b2dab681aa9e1cb1f15edfa5bfc10dcc1f3625a168dfcaab",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx[m-1195487518-6-255-script_types3]": "846dc0c5965084c39aa8f2f5d4aa057b0320984e28661380638ccf298a710e44",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx[m-1195487518-script_types2]": "8e5e6f1c0e54b1f54c49e31480870b24fd2480a48c47e1226466a339a1b3d39e",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx[m-3h-100h-4-255-script_types1]": "f2ebb2de12678658d527a96f92206015ca0b57f5d001de357550dde8f03be0f1",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx[m-4-255-script_types0]": "f2ebb2de12678658d527a96f92206015ca0b57f5d001de357550dde8f03be0f1",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx[m-49-0-63-0-255-script_types4]": "6e53c148891d9a9d9ec770ec5b3f17b96fe90a3db736ebf18c06916cf9957069",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths0-address_index0]": "0c8ca95f4fea968198c99426740039bccc2eb216869131be9474ccb18b9ad742",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths1-address_index1]": "0c8ca95f4fea968198c99426740039bccc2eb216869131be9474ccb18b9ad742",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths2-address_index2]": "38b1fd67e3c56600230279a8eecf5bf5d85892dfa436d939ea13904e79a0fe1c",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths3-address_index3]": "ba26a700372b59b7266c402063bd3681bae77c583b607b903fa45fd0f8794b68",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths4-address_index4]": "0c8ca95f4fea968198c99426740039bccc2eb216869131be9474ccb18b9ad742",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths5-address_index5]": "0c8ca95f4fea968198c99426740039bccc2eb216869131be9474ccb18b9ad742",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths6-address_index6]": "0c8ca95f4fea968198c99426740039bccc2eb216869131be9474ccb18b9ad742",
+"TT_bitcoin-test_nonstandard_paths.py::test_signtx_multisig[paths7-address_index7]": "6d66c4286ef32c83bc5fe1f0177a69a02bf4786669cd47b0a6d75729ab9552c1",
+"TT_bitcoin-test_op_return.py::test_nonzero_opreturn": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_op_return.py::test_opreturn": "bc8786461ab13dfcdd56aada668920f2d7fc1679fd4a21e3a97d01b3910e5a01",
+"TT_bitcoin-test_op_return.py::test_opreturn_address": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_peercoin.py::test_timestamp_included": "702eea34db340dde0f225fd9842a4b90e913f190b3f025b187f2bd18ca898971",
+"TT_bitcoin-test_peercoin.py::test_timestamp_missing": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_peercoin.py::test_timestamp_missing_prevtx": "a944d0c8b26a98e8e49a680f0c2f2116d48e8b1ae619c69cead9781fb516123e",
+"TT_bitcoin-test_signmessage.py::test_signmessage[NFC message]": "ab757fc854a23cd34d53426be3179293c39386d9e1331d95af0f04deb457b8b4",
+"TT_bitcoin-test_signmessage.py::test_signmessage[NFKD message]": "ab757fc854a23cd34d53426be3179293c39386d9e1331d95af0f04deb457b8b4",
+"TT_bitcoin-test_signmessage.py::test_signmessage[bcash]": "1bc86855d0cffd505ffd04306582eb4e60a6a568da762b8a7903e9e6d2555cd8",
+"TT_bitcoin-test_signmessage.py::test_signmessage[decred-empty]": "60a1f98fe4ae8711e8f26d5e62146a75d88b92bbf188cad24f817676f6ecca08",
+"TT_bitcoin-test_signmessage.py::test_signmessage[decred]": "78433fc9d4347b513dc981eae19060dd25e4c849677ad6a6d3d4ff98b85ba6ac",
+"TT_bitcoin-test_signmessage.py::test_signmessage[grs-p2pkh]": "48a0bbe237c43cc9560b704b21d375b33b07c63bb1fb4f576e6615c3adc5e2ed",
+"TT_bitcoin-test_signmessage.py::test_signmessage[grs-segwit-native]": "8026f5473708c8e86d43b1d6ed043dfacba6bb0124252110f930be6da1bab313",
+"TT_bitcoin-test_signmessage.py::test_signmessage[grs-segwit-p2sh]": "f46ee5065f33fd419821a1a1988ba28f333cc8ee844a8fcc47e6577d8a49d7c0",
+"TT_bitcoin-test_signmessage.py::test_signmessage[p2pkh long message]": "d23cf852f01c7b3132cca9e8780be49f8f295e2a8eceaddddc4741159a0e6a5b",
+"TT_bitcoin-test_signmessage.py::test_signmessage[p2pkh0]": "15fb9705bc79851421f64474adf614d48b3e4a1d6a6807b71448bcd58d43eab9",
+"TT_bitcoin-test_signmessage.py::test_signmessage[p2pkh1]": "15fb9705bc79851421f64474adf614d48b3e4a1d6a6807b71448bcd58d43eab9",
+"TT_bitcoin-test_signmessage.py::test_signmessage[p2pkh2]": "aa0d139652160d42b4283e418755eee12227fef03e084932fb681851f425e744",
+"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-native long message]": "43bbe4da02aea7861daf355173ac8ee85efc6890c61115158f6e26d0bbd5c705",
+"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-native0]": "a109817455e15a3651ea9773e0258e0dcc34f74f0c944403dd91b2333b0dc1e4",
+"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-native1]": "a109817455e15a3651ea9773e0258e0dcc34f74f0c944403dd91b2333b0dc1e4",
+"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-native2]": "4567cae6e6ba50f720dd3389fadce38ddcb55885072ec50473cb44edc089ffd3",
+"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh long message]": "dfbf39b9cf9891214f88503f334e8e2afd7901588b764defd612f0a32a890df5",
+"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh0]": "9bee69803e89897511cb72895e9398ce04bfe4647397b65b5e7d6eff6c53cf39",
+"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh1]": "9bee69803e89897511cb72895e9398ce04bfe4647397b65b5e7d6eff6c53cf39",
+"TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh2]": "64b97badfb2881b7824558e4f869a7e49a52c78ea28b10fd07041f470be2aab8",
+"TT_bitcoin-test_signmessage.py::test_signmessage[t1 firmware path]": "ac1c92ac1795a6b33a93a0e1ba82741a29b012912190e475c6be5d3189eebef2",
+"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[long_words]": "d5eb536ac72b1e5d9ac571b144472bfec0d5c63ad2a8b690342e096a4055fde3",
+"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[newlines]": "dabdac2b71c8306038d63003fd7e9c75e9926bc011841b8df07f857068a57d4f",
+"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[no_spaces]": "d3f5ed15db8cfd218dbd51658533974c41e652197384e10e7186a58aff6d04d8",
+"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[normal_text]": "b5def352f665644f99ae8d66475ccad9df4ce255c0e27213381569b8e72ac87d",
+"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[single_line_over]": "4c4917b4e1580982b20c97885653e49646693b4a8bf95e4d547acf02e9e2a130",
+"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[utf_nospace]": "8834f3ea0a66094ff7eaf710adaa969d47a3c37263f9a617676d54c3a0960706",
+"TT_bitcoin-test_signmessage.py::test_signmessage_pagination[utf_text]": "ee4eba9ea3be2785a0a39d3b252fac0596657ce226c6b50b4f68db04efc04bc4",
+"TT_bitcoin-test_signmessage.py::test_signmessage_pagination_trailing_newline": "42963a1b3aadba3c86f12bed989b456a0a5c20497bfbe47793a871bacb189f69",
+"TT_bitcoin-test_signmessage.py::test_signmessage_path_warning": "8940c72cba44df5a8c71fdeffb9fa5ba3518351f6ce694d5f558d4c4dfd151c2",
+"TT_bitcoin-test_signtx.py::test_attack_change_input_address": "5d6a0380c86c3c7a2743e4a6da9db9e0b49fea88f545ebd62b84bbe8e5f7dafc",
+"TT_bitcoin-test_signtx.py::test_attack_change_outputs": "ecb0405bb9cc5cf9532e1d35cb21e9c2752d80d299161924b3fce9fc82d1f622",
+"TT_bitcoin-test_signtx.py::test_attack_modify_change_address": "b15953ee45ba869b95840c2ac61a084184b652309eedd20987bcb507eb56da95",
+"TT_bitcoin-test_signtx.py::test_change_on_main_chain_allowed": "b15953ee45ba869b95840c2ac61a084184b652309eedd20987bcb507eb56da95",
+"TT_bitcoin-test_signtx.py::test_fee_high_hardfail": "16e1b89aac7d590436a542233a6fdda3fd806c9cfe35cbd422b23d607b6014d4",
+"TT_bitcoin-test_signtx.py::test_fee_high_warning": "39d9e2e53b1589c4ca861b6f760e0bc4b20d3e9d084857b2dcc7461e5947bdf4",
+"TT_bitcoin-test_signtx.py::test_incorrect_input_script_type[InputScriptType.EXTERNAL]": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx.py::test_incorrect_input_script_type[InputScriptType.SPENDADDRESS]": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx.py::test_incorrect_output_script_type[OutputScriptType.PAYTOADDRESS]": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx.py::test_incorrect_output_script_type[OutputScriptType.PAYTOSCRIPTHASH]": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx.py::test_lock_time[1-4294967295]": "52121fa39393d1dd90131be3efb1e9f69506a236e1673c5a8bf90cc4b3df2ae9",
+"TT_bitcoin-test_signtx.py::test_lock_time[499999999-4294967294]": "168499a31f8213bd205f9d8278a30c14adcdfeed64e1f140ad91797376c42817",
+"TT_bitcoin-test_signtx.py::test_lock_time[500000000-4294967294]": "148c28923d354a452bd59ac0478ff33a0bc8c88d8ebe3e63e14f4d14d463e1a2",
+"TT_bitcoin-test_signtx.py::test_lock_time_blockheight": "168499a31f8213bd205f9d8278a30c14adcdfeed64e1f140ad91797376c42817",
+"TT_bitcoin-test_signtx.py::test_lock_time_datetime[1985-11-05 00:53:20]": "148c28923d354a452bd59ac0478ff33a0bc8c88d8ebe3e63e14f4d14d463e1a2",
+"TT_bitcoin-test_signtx.py::test_lock_time_datetime[2048-08-16 22:14:00]": "cffaf4f9f4e71a4a770d21598c995d537a478d8b936e60df9c6f4abca9c83c93",
+"TT_bitcoin-test_signtx.py::test_lots_of_change": "5625e5c6c285a36922a8f2c8cf6ebe4f8193b92b20ff01393f9eb2aefe6211fa",
+"TT_bitcoin-test_signtx.py::test_lots_of_inputs": "bf11e5316ce2f53aa2ff58f4357765b74dc67c0e8fa44e83c9e4ae29e3696a4b",
+"TT_bitcoin-test_signtx.py::test_lots_of_outputs": "aee7988990f2b180e33100758bc26eebec0bded170b1781bfde85e8b9912dfcf",
+"TT_bitcoin-test_signtx.py::test_not_enough_funds": "730856ce83601f731c6a1c7b920d45bf06ae00467b77db3c4467d5c313d11985",
+"TT_bitcoin-test_signtx.py::test_not_enough_vouts": "882caf0aa7c29d4cb8a6856a3b6a16d489bffaf99147925f40251bd9de6638a7",
+"TT_bitcoin-test_signtx.py::test_one_one_fee": "ca42fed377fc4c429518b9e297402f2c95b1702df35fae9d788e519e9e0ab89a",
+"TT_bitcoin-test_signtx.py::test_one_three_fee": "4a3c2646678b99de5bc3d78cbbb232e5209223273951ea0758135cdb4e16eb03",
+"TT_bitcoin-test_signtx.py::test_one_two_fee": "490a62a2a6a4af266b15b0a1035c66fb82d2a577c4e59156af6c3c4d065b06f3",
+"TT_bitcoin-test_signtx.py::test_p2sh": "524dc66c374b7a2512e03bb44ea387258824416d131033c8d5c4dbe4e31edf78",
+"TT_bitcoin-test_signtx.py::test_prevtx_forbidden_fields[branch_id-13]": "4f96f64e65c29ef611103b9be4f4abfb3bbc92dfa354d6396b90a27feb80405b",
+"TT_bitcoin-test_signtx.py::test_prevtx_forbidden_fields[expiry-9]": "4f96f64e65c29ef611103b9be4f4abfb3bbc92dfa354d6396b90a27feb80405b",
+"TT_bitcoin-test_signtx.py::test_prevtx_forbidden_fields[extra_data-hello world]": "4f96f64e65c29ef611103b9be4f4abfb3bbc92dfa354d6396b90a27feb80405b",
+"TT_bitcoin-test_signtx.py::test_prevtx_forbidden_fields[timestamp-42]": "4f96f64e65c29ef611103b9be4f4abfb3bbc92dfa354d6396b90a27feb80405b",
+"TT_bitcoin-test_signtx.py::test_prevtx_forbidden_fields[version_group_id-69]": "4f96f64e65c29ef611103b9be4f4abfb3bbc92dfa354d6396b90a27feb80405b",
+"TT_bitcoin-test_signtx.py::test_signtx_forbidden_fields[branch_id-13]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_signtx.py::test_signtx_forbidden_fields[expiry-9]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_signtx.py::test_signtx_forbidden_fields[timestamp-42]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_signtx.py::test_signtx_forbidden_fields[version_group_id-69]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_signtx.py::test_spend_coinbase": "91386ce256773c6c3a7b22e25491215495971f582cdc99870c4efa97fb4a820f",
+"TT_bitcoin-test_signtx.py::test_testnet_big_amount": "921d60313683c8e1ceba539dbb4d0d1c61bb19180a6e797680ac0b43eceb99c5",
+"TT_bitcoin-test_signtx.py::test_testnet_fee_high_warning": "2146c57e5a8aa0710aa798b4ac54202b65e9aada8599cea4ff43595127932f59",
+"TT_bitcoin-test_signtx.py::test_testnet_one_two_fee": "b15953ee45ba869b95840c2ac61a084184b652309eedd20987bcb507eb56da95",
+"TT_bitcoin-test_signtx.py::test_two_changes": "63b7067d850391393ec93099714b1891908caddf7c31503540c74b0ce4ba57bb",
+"TT_bitcoin-test_signtx.py::test_two_two": "8d9e3f282e216962518f81d5b2d96e4d28f0cf1cce9fb706d3da81f05e58802e",
+"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_btc[AmountUnit.BITCOIN]": "ca42fed377fc4c429518b9e297402f2c95b1702df35fae9d788e519e9e0ab89a",
+"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_btc[AmountUnit.MICROBITCOIN]": "daf2ab7b5bac7ca6986c554e2491ea9ce5a5893b61f330adbd12b9f88333c103",
+"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_btc[AmountUnit.MILLIBITCOIN]": "629da2434554804ba5249ca351d5b390ab0c958d7dddde4e0f6e19fadf1a21c2",
+"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_btc[AmountUnit.SATOSHI]": "345049e1c86c6b92407226a7f4f56fcb0b26657c1ba590b9deb91899a7fd2dce",
+"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_btc[None]": "ca42fed377fc4c429518b9e297402f2c95b1702df35fae9d788e519e9e0ab89a",
+"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[AmountUnit.BITCOIN]": "3ef4169b93304aa6c0da5f46ffd44feca83d5de1173792e4b7db24b6820f875c",
+"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[AmountUnit.MICROBITCOIN]": "f9b0ff79ed19a4cb72eb97e4af6a3369da54acb90a31b7f40322293d1c1e2c26",
+"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[AmountUnit.MILLIBITCOIN]": "af7235121f6a01c2649ad03e6afd88f8afc47ec967393a06f4950f6b0e0f05a1",
+"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[AmountUnit.SATOSHI]": "c484c37668a5a91841f7eacbe5e4f1d837dca075b9393e08035f1c3c8f883aa3",
+"TT_bitcoin-test_signtx_amount_unit.py::test_signtx_testnet[None]": "3ef4169b93304aa6c0da5f46ffd44feca83d5de1173792e4b7db24b6820f875c",
+"TT_bitcoin-test_signtx_external.py::test_p2pkh_presigned": "083b08962d37697d2f9d4b70886c4157ec0603259bcde0bf2bf425053d031117",
+"TT_bitcoin-test_signtx_external.py::test_p2pkh_with_proof": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_signtx_external.py::test_p2tr_external_presigned": "d4a781ece8725848767d70497ef0a8c8095039c5d0ae668ac9720da6004e1f3d",
+"TT_bitcoin-test_signtx_external.py::test_p2tr_external_unverified": "5ad25fb0a86a6396a814259669b9d6650cf89f52b713831952ff8e2e649dee1d",
+"TT_bitcoin-test_signtx_external.py::test_p2tr_with_proof": "6be7ca9e17d4081fceb4d56ef104525118fb04bfb2592e49fb2f7d78d1e722c1",
+"TT_bitcoin-test_signtx_external.py::test_p2wpkh_external_unverified": "13eb291aa7765bdea69978a3eab6e117365496505e15b77600f4f56b2f5f9a5f",
+"TT_bitcoin-test_signtx_external.py::test_p2wpkh_in_p2sh_presigned": "f483dedffa0da13ea56ac36eb7ce491e8f9631904dc32f200d10778bbdb9efde",
+"TT_bitcoin-test_signtx_external.py::test_p2wpkh_in_p2sh_with_proof": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_signtx_external.py::test_p2wpkh_presigned": "f08ed6a8e79127ac50b49794e4e49c9115957cbb1e7cc69975ebc4e41f0d8b60",
+"TT_bitcoin-test_signtx_external.py::test_p2wpkh_with_false_proof": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_external.py::test_p2wpkh_with_proof": "f63466746453223e76140789df3d3fd4656b9dffd06e1bcb62896946201e4c27",
+"TT_bitcoin-test_signtx_external.py::test_p2wsh_external_presigned": "aedec1b4a70a5b2f8f827f6a1bba5ddc3bd9b2b23f8c40f527d0c28e987fd8ed",
+"TT_bitcoin-test_signtx_invalid_path.py::test_attack_path_segwit": "876e565cc142f0540f18ee6b666ce2fa6017057db63625e62b97d26fe71a9daf",
+"TT_bitcoin-test_signtx_invalid_path.py::test_invalid_path_fail": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_invalid_path.py::test_invalid_path_fail_asap": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_invalid_path.py::test_invalid_path_pass_forkid": "95f2f76b67228e679107c7cc4cf0c211038775404e5b0697ddb4896a7c26af84",
+"TT_bitcoin-test_signtx_invalid_path.py::test_invalid_path_prompt": "ad8573ce5becded27381fe6bc6506ba1a74a0f63c75a906e11d065cf12da44e4",
+"TT_bitcoin-test_signtx_mixed_inputs.py::test_non_segwit_segwit_inputs": "c7aced27b2418d6e923905807ca280ad5ab842bd5e59259c549b677e8a63d522",
+"TT_bitcoin-test_signtx_mixed_inputs.py::test_non_segwit_segwit_non_segwit_inputs": "fa8747c4a05ccf8042dcf4d28696f711eea160f5ca50d2cbb78d61ba31744ba7",
+"TT_bitcoin-test_signtx_mixed_inputs.py::test_segwit_non_segwit_inputs": "c7aced27b2418d6e923905807ca280ad5ab842bd5e59259c549b677e8a63d522",
+"TT_bitcoin-test_signtx_mixed_inputs.py::test_segwit_non_segwit_segwit_inputs": "514136a9349b27a99687ada0f669886612bec2c61939cfbe7c39c799d5afc42e",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_req_wrong_amount": "44b2dc4cdf7b8be37b77be206c6ec77d630f949c2a173807cc59eeb4a7171e1e",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_req_wrong_mac_purchase": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_req_wrong_mac_refund": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_req_wrong_output": "2b16e17efffed1c3e495b48eb32a93457edf26769c972b3d5bc050912df90750",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out0+out1]": "53dae65ce84c7fb269f6a6c7522f7ef512705ec530c493a332f4e6b605653d2b",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out012]": "2e7ccc1c98fedaef60d472573a4e97c00b6bb045973d24591badc491becb1231",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out01]": "68a4ce74efd9c19be57affb75d50b803e41bed8786c9fcb927c6167b7941eadb",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out0]": "6215beee8203bd9cd195d182fb264abfe70fcd38f43f05fd5df7eabc2cb12f7e",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out12]": "a26cd5e302a9952a4bf16731c473d7eeb5b6c9a37504d075b82751a86e77c4e9",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out1]": "d42aed2d6328749060d0f798268a3e44376838ea095fdd82210bac75c6f89598",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_request[out2]": "90fe9841b0a31880481dde2dbe95c3eb2f59652066d746907c5f84fa90b9c6c3",
+"TT_bitcoin-test_signtx_payreq.py::test_payment_request_details": "167e37c0ec10db4f020805153e4d6ee29f14b1506bbb855a68cc488b5cb50c9f",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash[]": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash[hello world]": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash[x]": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash[xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_attack[]": "b9536187c92aac09cdcaf5494e17970c865bce2b0b82ad56431374c46b39bf90",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_attack[hello world]": "b9536187c92aac09cdcaf5494e17970c865bce2b0b82ad56431374c46b39bf90",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_attack[x]": "b9536187c92aac09cdcaf5494e17970c865bce2b0b82ad56431374c46b39bf90",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_attack[xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]": "b9536187c92aac09cdcaf5494e17970c865bce2b0b82ad56431374c46b39bf90",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_in_prevtx[]": "b1cafc4b954df220e9aa0fb8a59e55f7b95a077701b2e521af9cba74c7fed427",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_in_prevtx[hello world]": "b1cafc4b954df220e9aa0fb8a59e55f7b95a077701b2e521af9cba74c7fed427",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_in_prevtx[x]": "b1cafc4b954df220e9aa0fb8a59e55f7b95a077701b2e521af9cba74c7fed427",
+"TT_bitcoin-test_signtx_prevhash.py::test_invalid_prev_hash_in_prevtx[xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]": "b1cafc4b954df220e9aa0fb8a59e55f7b95a077701b2e521af9cba74c7fed427",
+"TT_bitcoin-test_signtx_replacement.py::test_attack_fake_ext_input_amount": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_replacement.py::test_attack_fake_int_input_amount": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_replacement.py::test_attack_false_internal": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_replacement.py::test_attack_steal_change": "1e9f05fadfc845bc0200fae81520488bfacfbeb1177f8cdccce3c9effb21ecda",
+"TT_bitcoin-test_signtx_replacement.py::test_p2pkh_fee_bump": "8ead4229886abb992d437a87fc9846a4c69fee29141bea398a4c5c1b3ec77329",
+"TT_bitcoin-test_signtx_replacement.py::test_p2tr_fee_bump": "a9cc967ffe73ce77e0fb021e9a3b3713cf80ea7f9ca1b0e9d03cc7734395aab6",
+"TT_bitcoin-test_signtx_replacement.py::test_p2tr_invalid_signature": "a9cc967ffe73ce77e0fb021e9a3b3713cf80ea7f9ca1b0e9d03cc7734395aab6",
+"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_finalize": "725cfd58565a6e5fc6b75bdb7c241eb9ead6ca854c92e2fbe16cfc87db5b6f71",
+"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_in_p2sh_fee_bump_from_external": "92c2f7240857e0c281936d932639bfea621cb420e8c694a5d2568da454c68e1e",
+"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_in_p2sh_remove_change": "0412c924c6c4a70be825939cf5580b89367605aec3a34b6adb3563593f277bc5",
+"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_invalid_signature": "725cfd58565a6e5fc6b75bdb7c241eb9ead6ca854c92e2fbe16cfc87db5b6f71",
+"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_op_return_fee_bump": "70979eb7d90fea454c1a462ba6e3cc517fd2077903f8d9183c1a50d362f734fd",
+"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909659-90000-02483045022100aa1b91-c9b963ae": "ee5d048b4ea8f2b3ac04e8125f76d507c4e37637327745ce87c2e856fb0351cd",
+"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909718-90000-024730440220753f5304-ecb983d1": "ee5d048b4ea8f2b3ac04e8125f76d507c4e37637327745ce87c2e856fb0351cd",
+"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909800-89859-0248304502210097a42b-7a89e474": "ee5d048b4ea8f2b3ac04e8125f76d507c4e37637327745ce87c2e856fb0351cd",
+"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909859-89800-02483045022100af3a87-80428fad": "41dff38ece3d197987d7d4e897c7ebad0a40c96095259526bff86d2713508b24",
+"TT_bitcoin-test_signtx_replacement.py::test_p2wpkh_payjoin[19909859-89859-02483045022100eb74ab-881c7bef": "ee5d048b4ea8f2b3ac04e8125f76d507c4e37637327745ce87c2e856fb0351cd",
+"TT_bitcoin-test_signtx_replacement.py::test_tx_meld": "866e85dbc876809da28430f787e36dee624ceb40638a338e26bc119edea2e32d",
+"TT_bitcoin-test_signtx_segwit.py::test_attack_change_input_address": "4b58fb22162c36e7d5de9aee92b5b78d17fcf64fd58667fb48f02c0417d51864",
+"TT_bitcoin-test_signtx_segwit.py::test_attack_mixed_inputs": "58fb6e213fc13bee6f13e5a6cd170e87d68a5a1f2ee8e33be8ffc9853f414b80",
+"TT_bitcoin-test_signtx_segwit.py::test_send_multisig_1": "ab0c9c03a2eb6d4e8395622e984ff1a813cf635dbf7025e139a7eb2724943fd5",
+"TT_bitcoin-test_signtx_segwit.py::test_send_p2sh": "8083b36636a1c0d9b245db896e1d32fa541256262984300e99ea1043ead9c60a",
+"TT_bitcoin-test_signtx_segwit.py::test_send_p2sh_change": "eb0c28af96a651dbb60a76f49ec7ddd43b95cd2beed284beffbfc3790dd0e4e0",
+"TT_bitcoin-test_signtx_segwit.py::test_testnet_segwit_big_amount": "e52298904833589b797d982d2357ea19b4f6ecfbc9e4ecd2b09b86d2892e4085",
+"TT_bitcoin-test_signtx_segwit_native.py::test_multisig_mismatch_inputs_single": "a239ad7734fa2bc316241bd607b6b2fedd6802154590f99c8c711040f43383ae",
+"TT_bitcoin-test_signtx_segwit_native.py::test_send_both": "3eec77e0f79eae561dbaa0468b3743634e09f984a90fba46ba479be032174e9a",
+"TT_bitcoin-test_signtx_segwit_native.py::test_send_multisig_1": "56704b7138799085989a95f7cc8d25ed7535107329c3a2a6524b69bdf48b2dac",
+"TT_bitcoin-test_signtx_segwit_native.py::test_send_multisig_2": "d13ce17eaa563814181aa6201f588fda1c26208fb2bede56cdf1f4f0032d8341",
+"TT_bitcoin-test_signtx_segwit_native.py::test_send_multisig_3_change": "382d126d6123d2340a253a9ce82927632e3bba6e383060dfa85d9d9c4ce9f707",
+"TT_bitcoin-test_signtx_segwit_native.py::test_send_multisig_4_change": "093db1ae1d609c163c0ac373ecae474e32704e699a5328b6f12a7c8118bd5cc0",
+"TT_bitcoin-test_signtx_segwit_native.py::test_send_native": "3ef4169b93304aa6c0da5f46ffd44feca83d5de1173792e4b7db24b6820f875c",
+"TT_bitcoin-test_signtx_segwit_native.py::test_send_native_change": "3cb6fd481ac140583c7db43d739837a18d0878b916b0139b656a3d4c18e32c48",
+"TT_bitcoin-test_signtx_segwit_native.py::test_send_p2sh": "e1b3f5961ed2f24c997cb4a5abf399324de65af6a1004d9b242ff4e971784ddb",
+"TT_bitcoin-test_signtx_segwit_native.py::test_send_p2sh_change": "3e015c8c1342d994989daee93e8adcda67ebcb6d20033ec9817dc08dac9aaf10",
+"TT_bitcoin-test_signtx_segwit_native.py::test_send_to_taproot": "382792ee568e207f2c7a076038cd5ca6e47e18965e3cd9a5a799e19bc922fa34",
+"TT_bitcoin-test_signtx_taproot.py::test_attack_script_type": "f844ba42a7942916bbead80688ba571e5717132508bf140b44ea96ea1a290084",
+"TT_bitcoin-test_signtx_taproot.py::test_send_invalid_address[tb1pam775nxmvam4pfpqlm5q06k0y84e3-a257be51": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_taproot.py::test_send_invalid_address[tb1plllllllllllllllllllllllllllll-aaa668e3": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_taproot.py::test_send_invalid_address[tb1plycg5qvjtrp3qjf5f7zl382j9x6nr-5447628e": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_taproot.py::test_send_invalid_address[tb1zlycg5qvjtrp3qjf5f7zl382j9x6nr-880d4a6b": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_bitcoin-test_signtx_taproot.py::test_send_mixed": "a87dcb0b64784ebf9e128e16c930e4b6b48976b2cbbfba81f5630ac493e03e3c",
+"TT_bitcoin-test_signtx_taproot.py::test_send_p2tr": "db7a4b7858009f495f48a11aba5de963304e317cad1b02c76afac33ea8307da7",
+"TT_bitcoin-test_signtx_taproot.py::test_send_two_with_change": "66ebda7850262d9a9124224587524b894672c905f3a50ad48f5d8dfa1acec56d",
+"TT_bitcoin-test_verifymessage.py::test_message_grs": "e85317b1ec4db49d6bc9cdb5a30b72e716efd6650585574f0cfdad973ad19bae",
+"TT_bitcoin-test_verifymessage.py::test_message_long": "7b491a28c9014e17057f575cb96ee03f8524175c950776e79c7b4e6a53b8b680",
+"TT_bitcoin-test_verifymessage.py::test_message_testnet": "252f2b8da802164a0503c2d63f5621a0b0528b9bb84108d4d5803963a501198c",
+"TT_bitcoin-test_verifymessage.py::test_message_verify": "885b9b487c01fb83ffaa91ca740f793dd8ba882b99d9a27170a93903acf1491c",
+"TT_bitcoin-test_verifymessage.py::test_message_verify_bcash": "7456259180268b7738ceea85aa987e630fd2713aeebf197217ba8340a8ae6dfd",
+"TT_bitcoin-test_verifymessage.py::test_verify_bitcoind": "a97a2f53511a7e9ba8ef531b648aa3ad64cb4c48fb5ef5c5562fba3c29f33f8d",
+"TT_bitcoin-test_verifymessage.py::test_verify_utf": "f6659aa84dad552be97dcabf577fa82f479f5a0a4c18bbfdc0e63e60285a6d64",
+"TT_bitcoin-test_verifymessage_segwit.py::test_message_long": "cd2a7d6b403d21724e90ce0f767239cfd37ab6a22f37226bb3c9dfc2dec7fc5c",
+"TT_bitcoin-test_verifymessage_segwit.py::test_message_testnet": "a1686ef6eeb956b5686ecf011b7453b70dde99ff7331e637e4da9b820ea83b09",
+"TT_bitcoin-test_verifymessage_segwit.py::test_message_verify": "3feedfb0f721c7aab89a1a071b566210e99333cbc12a9312c9f532210cf7b603",
+"TT_bitcoin-test_verifymessage_segwit.py::test_verify_utf": "2777fad6f73ed0ab4500f5ab45819e408cd499f7bf49a36310a0519aa785972b",
+"TT_bitcoin-test_verifymessage_segwit_native.py::test_message_long": "b3d8044f556779da1b93a30aacd4bb451c0c60bb7fb5f63f6b15605bd97f851f",
+"TT_bitcoin-test_verifymessage_segwit_native.py::test_message_testnet": "aebbc131623713bfd9244fff960b6ebb1afd75743b3c1c60585799339ff42e05",
+"TT_bitcoin-test_verifymessage_segwit_native.py::test_message_verify": "5e8b6cc0fd5f80b8150cb56db7b537c52f5962a1c1d1930d8cc40c7b80627a83",
+"TT_bitcoin-test_verifymessage_segwit_native.py::test_verify_utf": "2b6d15f2988b60e864125b7128425bb6f5591a777f6e831de8587c4f446652ed",
+"TT_bitcoin-test_zcash.py::test_external_presigned": "7b201d92d16993d244288ab05cef393c059a3a7726a6d66fa4c00a90b4f22859",
+"TT_bitcoin-test_zcash.py::test_one_one_fee_sapling": "cefacdc965487236e1d6549536a5727b27883c8d19855d247dea0f7fdedcc0a6",
+"TT_bitcoin-test_zcash.py::test_spend_old_versions": "1104ea4f6ceaafc28714f52a536d47d2658942a59a4ac3484d3cb992fa2c3233",
+"TT_bitcoin-test_zcash.py::test_v3_not_supported": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_bitcoin-test_zcash.py::test_version_group_id_missing": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[icarus-derivation]": "cfaf149124b0aaa5a2a02f1169d72c82dc0b0f3dfcc3d5f07dd15e2c37285946",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[icarus-trezor-derivation]": "aeda35a0f3bc5c213b9a1ba0c4b5f5f5ff5105462f1d152b40300eb916038e14",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[ledger-derivation]": "58500634f584dad80fc24c87ee3ac88ac7a464dc3edbb835714e9ee02d3f7bdf",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters0-result0]": "8aaf0e5a06e75dd7de1f1bc467c2e02df93da325c29f691b22197c3c3ec260bb",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters1-result1]": "66b7b6ff32cd03fdbb664afef74f9c18581372ae0f2793c88c18786b8d2ddd24",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters10-result10]": "4890398f9642ecef39d6576acce97e035fb9fa095dc2dee621945b338c440edc",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters11-result11]": "c7300ede35d220018fd4ee809bb08b9405bfdcb3afb7e1e2cdb7749b377bca46",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters12-result12]": "0669644b1e158c340a0510b69810560344c5d4ee5a59de37b0154e88f5478737",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters13-result13]": "c5b773d6d359cbe94ed72851cb3d26fb3adc76a7a03bda0b895b41021be1387d",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters14-result14]": "4de1960d1a4a0125880f52da6d8e7b3f9d29304e061ea1589bacece65f944528",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters15-result15]": "40d1d4141b84756f5833dd30f6b5dde39d2289fe446b4690b3482a3bb6c96831",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters16-result16]": "e5a376238b64de1ffcb3662eca46c487639fa004e62971f076c4ec7230950571",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters17-result17]": "29b37cad985f7a45e5958b5c00e9479c802bc2798201358f70ba9a2cfa507e8b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters18-result18]": "1c624da6bdb7c7b79627b0d2365b634ef13db257abcb978a76f5843455efb1c5",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters19-result19]": "2b0eabe9a2f69a320d059a29f0920dd356b9136e7dff82daf5d19b715f44cef7",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters2-result2]": "c83962ace9eeaf319a702a1f569c2160b7185217bacaf860f091dcf9ffdcc5c4",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters20-result20]": "d9e03f78fdb12b1137bbb1ac91cb286135cb73083853ccaed99ca5889dac2610",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters21-result21]": "f69d18cae431ceacbf9d44ab749bd08588ba5fadb684f55db52e0e1626f033ff",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters22-result22]": "634f7a4648a1640cea50d5779756e8b9230ce3f43f2c72bab65700970657582e",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters23-result23]": "229015ec6fbc321f6d9aecb9a6b2aa31007ce968362fd94450466ccc3763c794",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters24-result24]": "a6d6df10904d329e6b562127181e2229682fab37542186ab2ef81f4d29fc322b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters25-result25]": "f9265c7c761afeb2ed484a6a8cb6efde7ae89fb9605eaa3eabb1b8e548fc43e5",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters26-result26]": "893edaabbbef15dd82ea4d7adfc4ee0823662cb5f4228d309f6581c55fddb948",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters27-result27]": "95c56dfed6eac28056f3e0f9a72744746054dab8c6464e394fddc8e02a52419a",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters28-result28]": "922300183a293633305f22fe06646eeacbd4dfc13de9e0942fdec6af1af4e950",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters29-result29]": "845b6d7f9677affc69427df91d2f76a9c1f85abd62be8bd876d6b1ba49475d99",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters3-result3]": "3434a0c494cc67cb4f88f4d151a82f7c117a2e8129c9a1fe2912e5e5e8d26791",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters30-result30]": "ceb19b2580469417d84c1e9f509a718ece369eebee3abbc0b48ae0266b425b92",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters31-result31]": "5ffb55dd377b713a179c6dd08aabeee21a4f658c5f14dc8746b8d336d26b31ed",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters32-result32]": "dd3bf14d0b159d84a5a2890f92c149b9b73ed4194f5bbd30751dad308aeb767a",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters33-result33]": "8be64e55e61b724c8c6df3fbc609964032cd3374f200f1bc9dcb96d192c41deb",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters34-result34]": "f6550b74e974979d69c603e385892dd833359968f37d086d93213b83902749e5",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters35-result35]": "9ce85a63f5e0ad207ce40c7a80e5c6edc02dfc052ab89d822d15f661b664b3f8",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters36-result36]": "8480f18151cf59e13f8056cb56696317e9d2d1fb4d35ef5be73609cea3da4243",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters4-result4]": "6c268cdef12031b1ddf9958704400aa25152fec7d8b329de6f49f8492b18965a",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters5-result5]": "d23f7d49050cd0813670156f0601cf598530a47014afe73173a211ab0682654d",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters6-result6]": "93717f9329efcb419a2e1abb193d4203eb642c3d72056f1e226113e6990f16f5",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters7-result7]": "ba876b54c10ef1ce579c5af67d4851b29fd674d80bd990f5f587ca92128c3bb9",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters8-result8]": "c60d8ae7c7b0b88d05836fda81e2c94e4686edb6b42685de60512ae0d2a1a027",
+"TT_cardano-test_address_public_key.py::test_cardano_get_address[parameters9-result9]": "e3149087c2bf0a1f7e178a5e640953944de67dcc82a01c3817e57479e8989d42",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[icarus-derivation]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[icarus-trezor-derivation]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[ledger-derivation]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters0-result0]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters1-result1]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters10-result10]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters11-result11]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters12-result12]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters13-result13]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters14-result14]": "07f265234a3269c8c99172e2f67abf626e17a542e6f4c00b45c5b685d0e4c240",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters15-result15]": "07f265234a3269c8c99172e2f67abf626e17a542e6f4c00b45c5b685d0e4c240",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters16-result16]": "07f265234a3269c8c99172e2f67abf626e17a542e6f4c00b45c5b685d0e4c240",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters2-result2]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters3-result3]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters4-result4]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters5-result5]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters6-result6]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters7-result7]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters8-result8]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_address_public_key.py::test_cardano_get_public_key[parameters9-result9]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_cardano-test_derivations.py::test_bad_session": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_cardano-test_derivations.py::test_derivation_irrelevant_on_slip39[CardanoDerivationType.ICA-3b0af713": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_cardano-test_derivations.py::test_derivation_irrelevant_on_slip39[CardanoDerivationType.ICARUS]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_cardano-test_derivations.py::test_derivation_irrelevant_on_slip39[CardanoDerivationType.LEDGER]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_cardano-test_derivations.py::test_ledger_available_always": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[all_script]": "49604458b3b87f38ffcc46d38328523ddd05a7f3d49dbd7e799124d905fdaaba",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[all_script_cont-aae1e6c3": "09f68be71ee7e43fac666f4c94fb6fb9cee7b68f0a48baf6c420f4b594ec138c",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[all_script_cont-e4ca0ea5": "94fced3d548783272efb947b82ee13a6e9add6dd9d62dece563cda06bf3a9547",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[any_script]": "a9e04840e11c414de228468716f4130e50eddbf95c89ffbbb9bcc3f9d4269e92",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[any_script_with-f2466a2e": "9d2411cbd58cb849172c2390f3f1392ddd8fcc47142fe143d2fe773e41191d19",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[invalid_before_script]": "7912059adafe24613dd6c5b75f9bc43056c9d1ca6dfb00264b90a8729c96e072",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[invalid_hereaft-d01d7292": "4f7e16ae0f5b72067c6a2ef40c28a22add6422c3c74cf9aaa2058ee00cf90e38",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[n_of_k_script]": "20740aa15f2d89df34f6ab3507517d649d69a0212874c2c8a1ec61866b020221",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[n_of_k_script_c-d93f5fb0": "3422cf4854ef7b892de5e53d4a372fa239f3192c99f07b5ae0894132e6aadfe6",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[nested_script]": "ef780268717946ba2367073ace2470ad2c421f5e0b9f49c923fd0c59fd66ae85",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[nested_script_w-789238e6": "9f96a8ba997875aaf73778c8b87fc16f4de3f87e82138b7de8ab7d58a64314ef",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[pub_key_script]": "b9fbd293e3d49d40dcbfd03bf11eb961acd03b9e8d76cca40ef42946ffac0acc",
+"TT_cardano-test_get_native_script_hash.py::test_cardano_get_native_script_hash[pub_key_script_-1579fe2a": "64d69ecd43a942401127a0894bb0b7990997a0302829448b9bf4e7f6269911fd",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[byron_to_shelley_transfer]": "cc814dd371bfb807e3bf2afecba1927fd4e738d2575e98c5e2103b3d292fcaea",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mainnet_transaction_with_change0]": "f5029026ff504e03266d7ed87571e69794b941e387fe31497b9143ce77bed81f",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mainnet_transaction_with_change1]": "a771b70540f70e7bf77dd0c7aa7d56a620867172bfb2b238ca23a906ffe46a58",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mainnet_transaction_with_multiple_inputs]": "29d0b4131588d173f8a82cdd18979222ac53aab3b7096d0bb51e54dcd39469f0",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mainnet_transaction_without_change0]": "29d0b4131588d173f8a82cdd18979222ac53aab3b7096d0bb51e54dcd39469f0",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mainnet_transaction_without_change1]": "565eb0b3850442afd17adbdcb42514028950892d743ff636b4636c517f1b491a",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mary_era_transaction_with_different_policies_-1dbb1bfb": "d5bd221dae46e4578fea32fa3a84777fc1a2924671a5f27641048ef76af9a555",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mary_era_transaction_with_multiasset_output]": "78d58d3bcfdd470e365ef69c0f9925c23c1b9f9e2a699d7d301165c39db02c96",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[mary_era_transaction_with_no_ttl-validity_start]": "e3dddd0e9c2c17b4c4c3747a76f929e4765844b9d5b53c4ae69f408258a7661f",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_a_required_signer]": "0c287475252492051549ce0b96d1247f163f63b90d19e5203ae7d075eef4fb97",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_most_elements_fille-29691455": "39c567b82bc2a7602bf225436f5358627640c0c11146e594a8b7be09a72edfc5",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_output_datum_hash]": "ca2479e6246c8df5a8bbe1e14bb8028a8990ae1618fa79181ef51aa0b6e3ad8c",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_script_data_hash]": "3d5dd593126f8bc820a82f8bc9ca539947cbffb39840a56c233bae1fcf18840c",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_stake_deregistratio-1ab28f77": "2608f0241fa9f09af928b34d4500986e92edb880890f77869f4c6a57de4dde35",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_stake_deregistration]": "2608f0241fa9f09af928b34d4500986e92edb880890f77869f4c6a57de4dde35",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_stake_registration_-a144c34c": "e5a39189381f1eeeb5b060fcc20fa0452f0c95432cd3ec4b83f9fa6428072e6e",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_stake_registration_-bf5f9707": "b0408c611e2a2fae945fc2fb02fc082c99aa5b8c267f7abfe92fb3d22acc6fce",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[multisig_transaction_with_token_minting]": "a410c4953601c55c04851983254e9cbca20d5180952bf3843205d46d9326b896",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_a_required_signer]": "76b5e07db73b2a5fbafd59da0a68bcb573b53bc2d27b68318223812bc1abb1ed",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_both_output_formats]": "3130ca1189504a5e8f7bf543a7547b8b297759bd4dd2caabbe3c9c78b11db8a3",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_inline_datum,_refer-d1082570": "d7b2e8ab7d54b4d0754dfa677afae90fb11231c231727a0e5ac2431f00f3e351",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_long_inline_datum,_-1f681aaa": "32a238145073e393b0f2f8568f1f05989529ab4a548b791354e239d2f7188048",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_multiple_correctly_-6545455a": "4a7b61e32ce01460602fa2f49d8b2b8a730fdc30f8cdf3a866e959525641e3e1",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_network_id_included-d9df16f9": "29d0b4131588d173f8a82cdd18979222ac53aab3b7096d0bb51e54dcd39469f0",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_output_datum_hash]": "d7b2e8ab7d54b4d0754dfa677afae90fb11231c231727a0e5ac2431f00f3e351",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_output_datum_hash_a-84ad587a": "32a238145073e393b0f2f8568f1f05989529ab4a548b791354e239d2f7188048",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_script_address_but_-b0da7209": "762b7a5146798c16e29e8a9bb75db96732834bedec26db8e84b4324f5ab8ddbf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_script_data_hash]": "76b5e07db73b2a5fbafd59da0a68bcb573b53bc2d27b68318223812bc1abb1ed",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[ordinary_transaction_with_token_minting]": "bc4ec7795175a2b8d6914d4c4ca7f1272d5cb5470ad5ccdc81c407288f626b45",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_an_ordinary_input]": "0f61e0d4c9b0860e0a4ce7bed55b59975f91170b31a865d5ce826d99c2916e1c",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_base_address_device-o-a33e6741": "80b0efd9441efb18fa25f2f7c918d55d837d5bfaa54b3cae70f897299d77c8dd",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_base_address_device-o-a6481374": "e1042cc2f908d42e4f40eb8f44f5896e69005ff5cf399a0a3e4602005f079010",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_base_key_script_addre-d3366a63": "e059086c88139341fb6f0cc1bf28465f6f7f7889ec9a3e16b91ee9a17840dcd0",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_device-owned_collater-8f38b4d7": "ef0519ee4186bc2c7695e1c32d1cf987412dd7f5992f594f4abaaf7772f7a615",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_external_collateral_return]": "61f0e9af6eeb749c2821de06f21e3c2484ed366128b7ebaf42df4321f476a8a8",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_output_datum_hash]": "e538cb50de6105fd0169e4a1ea7c3d5c2b12c48d13d8926c18960e989cf13eb9",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_reference_input]": "beb2ddab6de602de2f0d0cdfacdb2c283fea49cc033d3d5eb892022c6c24d041",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_credentials_giv-6a67c1eb": "8a91b886140ac815dd677818a54ca90898906dcd6ff62cec85024067eaf3053c",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_credentials_giv-72ef969e": "8bbb8a35bf0ce108eaddaa9282dd928d23860c359129bd5cc4af0dd1cdff48dc",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_deregistration]": "1ffdce2fd515e450f992a5095a70e92dad932abf3adcbaca4c8d4d333b5d3d58",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_deregistration_-78f5c748": "d9afbbb1d8c68485ef25f2a0ebe95ce2dbe4ee6a626fb1301c5cacdac77de5e1",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_registration_an-4da9385a": "36c61bf738060379a96f021bddff20424231625b90643db6e068ba7d0adb1f29",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_stake_registration_ce-46b0a250": "5eee42c1c56ce777d91e3de49033abdd04b7a5153dfea2046cb1333c49068c43",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_token_minting]": "2386bdf53599d07ac52f012addb90f1d005bc7ecedd4c57115bfbccd6e41af14",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_total_collateral]": "17aab7d723a0871690f25067e67bbecce04e53e988cc9cb928669497860d951f",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_total_collateral_and_-3f0b305a": "0ce03708aeb9d87b892e1caf2042ae01e66b9cfd022ce9ab6c6e1fc60a736afc",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_with_total_collateral_and_-c92d773b": "5ce0033c0e6f8f36adaafb052e06e5607b263e9e7b658273abf2d8789102f986",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[plutus_transaction_without_script_data_hash_a-9590827f": "39c3bbb15bf6b04a8dc75529576d1093dd8e2778358b9c0809562f645457d23e",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[sample_stake_pool_registration_certificate]": "62b831912e3f38c26bdec456740f01a6ea76fa240e87129ee5824d3209990aec",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[sample_stake_pool_registration_certificate_wi-336f4a44": "62b831912e3f38c26bdec456740f01a6ea76fa240e87129ee5824d3209990aec",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[sample_stake_pool_registration_certificate_wi-d3427614": "75d66a42f38e4c477487f7c9cc4362730c63e608ef1b27d04c3cb3a99079d1dd",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[sample_stake_pool_registration_with_zero_margin]": "93ec13bdaf2a707bb846a209b05a1a939dde8c5c3b37c4083c17bb021322ff2d",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_plutus_transaction]": "83da12e138d8f300c989ac3857007514e88b8a7aa5c981c4d9208e6aa443d497",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_plutus_transaction_with_additional_wit-36ba8ce8": "7c948ef1ef4bc910689c995edd86b7947bc96794b84edc8bce6357a326b1e2ce",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_plutus_transaction_with_required_signers]": "e3dfcce3dab011cb52ad161ee04be00b51061a5f97e55494624ea9a78a7d9a0a",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_address_change_o-0c37e6dc": "4500f47f4b0edf078191a287ca8edd1afa67d98c2fbe36d038c2f5590634fbcf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_address_change_o-7f1d12f6": "aca7731f6ca4a4da0594da9124382c7bd6421c85732ffbbfa9fed33dd17d04b4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_address_change_output]": "76b5e07db73b2a5fbafd59da0a68bcb573b53bc2d27b68318223812bc1abb1ed",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_script_address_a-56fc16f7": "884ecb83ae0e382eed3de74b86e5beb009a2505b5633a8a96bea275b06f0d88c",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_enterprise_address_ch-15518a4c": "012e44071968574a42c9a0ebbde086305327a99da632c4bc032e256028a18daa",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_pointer_address_change_output]": "3043e91528f67fc6ed53d55ce8d950047c578b1eb7421f50ab363ef247635590",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[stake_pool_registration_certificate_with_no_p-0bbad967": "9ef0023585a29b2d5df67db81771ffd7678809f8d8ddc8c1ac7b458c4344dff5",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[stake_pool_registration_on_testnet]": "4c8f00f85b53bd4951b9104105bcc23f4501b4bdfe8184dcfd4ad87b963ce6b0",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[testnet_transaction0]": "43baf7461ab2853c0552a514f55e49d23efa2dff56999ced6fa3787724aa2ba8",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[testnet_transaction1]": "f190dc1f245d3bba7ac0f448ed73f34007e17f73d7ec0d67f6f781bf1ada7a57",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_auxiliary_data_hash]": "76b5e07db73b2a5fbafd59da0a68bcb573b53bc2d27b68318223812bc1abb1ed",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_base_address_change_output_p-3c7243e1": "fdade80af23d9da945ebc5b04876c279f3ea65a2f39c51df1c9e72f15f2ac068",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_base_address_change_output_s-20438873": "209d21981953ec98948ce26b6fa38f72bd9e8a3b63cfaf0ffb099e4391d7974e",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_cip15_governance_registration]": "b0939305ce716649c323c23a542fe93a546ed4b306d06d1418eab52752572c9e",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_cip36_governance_registratio-35e04232": "5617684b2e1db7dbd1c3f0d63c488551cccf59273139821bb643af8f3ccf8fd4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_cip36_governance_registratio-f00c1b65": "b4979e2b6d4685c8ceefd99efecb6c720bd3b5f6e23561772aa99300837a30a1",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_everything_set_except_pool_r-1e1ef130": "6cba7634386644ca2b691ddbee08b1991fac31f11af691913c58a37e7780a936",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_deregistration]": "aa8bd9f0bab1452d6326eca3b4a1f6c083fdc77975efe02a4aa17dc8853405e4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_deregistration_and_withdrawal]": "aa8bd9f0bab1452d6326eca3b4a1f6c083fdc77975efe02a4aa17dc8853405e4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_deregistration_with_ac-9ca046f0": "00caed63fc846ea409f497a8761efb4f73f006761b4f745e7d831dd014b39229",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_registration_and_stake-3fdfc583": "dc54ede58c13cf0cada619da12db86df7f4d9ec1c7279200eda83f530d552da1",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_registration_certifica-e7bd462a": "b5f20211529016d5ff4b88088df7be36b6bdb36c3e507e42a32df59549c45bf3",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_registration_certificate]": "0eae1bd883963bb0cfe00a27d1408dea10d6d5a4711c8f4988870216ecb3a537",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_ttl_equal_to_0]": "88455969e0e897db2c62df0ec48f73f636232a34b819c6d23a8c559890265065",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_validity_interval_start_equal_to_0]": "0aef8bbb89592b6f733ca7e3f6955e928fe51b4bcd6b2dbbc654f0470e5046ac",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[1854_change_output_path_in_ordinary_tr-805f9bd0": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[1854_input_path_in_ordinary_transaction]": "29d0b4131588d173f8a82cdd18979222ac53aab3b7096d0bb51e54dcd39469f0",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[additional_witness_requests_in_ordinar-9c4f94c0": "29d0b4131588d173f8a82cdd18979222ac53aab3b7096d0bb51e54dcd39469f0",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[all_tx_inputs_must_be_external_(without_path)]": "ebeeae10798481c37766262bb6e33f3ef7c289609b67a79ea1a173d1dc257ebc",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[asset_names_in_mint_token_group_in_wrong_order]": "4e10d5434c122c6365dd418a32ce3701a638df8b037780584b52e54918f234b6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[asset_names_in_multiasset_token_group_-7c1351bc": "188a76028aa5f68a8b49b645a5207e595c076519dd238068e069cf49594b3e38",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[auxiliary_data_hash_has_incorrect_length]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[both_datum_hash_and_inline_datum_present]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[byron_to_shelley_transfer_input_accoun-863fee7d": "cc814dd371bfb807e3bf2afecba1927fd4e738d2575e98c5e2103b3d292fcaea",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[byron_to_shelley_transfer_output_accou-5a99fb35": "e3dddd0e9c2c17b4c4c3747a76f929e4765844b9d5b53c4ae69f408258a7661f",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_both_path_and_key_hash]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_both_path_and_script_hash]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_invalid_pool_size]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_key_hash]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_multisig_path]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_non_staking_path]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[certificate_has_script_hash]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[change_output_and_stake_deregistration-e17db500": "617fb5575799f6d6a7ef35525f12d8a148be9987e21b4e925836b41413c471bf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[change_output_and_withdrawal_account_mismatch]": "617fb5575799f6d6a7ef35525f12d8a148be9987e21b4e925836b41413c471bf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[change_output_path_larger_than_100]": "617fb5575799f6d6a7ef35525f12d8a148be9987e21b4e925836b41413c471bf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[change_output_staking_path_larger_than_100]": "617fb5575799f6d6a7ef35525f12d8a148be9987e21b4e925836b41413c471bf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[change_output_with_script_in_payment_part]": "617fb5575799f6d6a7ef35525f12d8a148be9987e21b4e925836b41413c471bf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[collateral_input_is_present]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[collateral_input_prev_hash_has_incorre-99d2dc0e": "1709c672f3620f54c8b2069cad0decb73f88f56a607435bad794af08a8d4f62a",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[collateral_return_is_present]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[collateral_return_with_datum_hash]": "5d13e90a5b710581f5d108ae9d12fa8fc2cc2257eb46964397e4207d31692722",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[collateral_return_with_script_address]": "5d13e90a5b710581f5d108ae9d12fa8fc2cc2257eb46964397e4207d31692722",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[contains_a_different_certificate]": "01582a649c3912eb6d16b77f2a0d118733bb1aa40d0ed2c8ba7b99450f2cdef4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[contains_multiple_pool_registration_ce-3000d4f0": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[contains_withdrawal]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[fee_is_too_high]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[inline_datum_present_in_output_with_le-43c025ef": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[input_and_change_output_account_mismatch]": "48aed70953697792c88de9384f522136e91c1c7776894cd4b0f602a069b06f6a",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[input_and_stake_deregistration_certifi-b3383de2": "6d80a5b4ab9da5566695b06cf881258c07fe67f77e35a2695242ba69cc657de8",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[input_and_withdrawal_account_mismatch]": "76b5e07db73b2a5fbafd59da0a68bcb573b53bc2d27b68318223812bc1abb1ed",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[input_prev_hash_has_incorrect_length]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[invalid_pool_id]": "01582a649c3912eb6d16b77f2a0d118733bb1aa40d0ed2c8ba7b99450f2cdef4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[mainnet_protocol_magic_with_testnet_network_id]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[mainnet_transaction_with_testnet_output]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[margin_higher_than_1]": "01582a649c3912eb6d16b77f2a0d118733bb1aa40d0ed2c8ba7b99450f2cdef4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[missing_owner_with_path]": "9884f332efbc6181e1135835d954d6fd9298b53cfb46c5b2e97be9da02d1f8c2",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_1852_multisi-b7679330": "475e1226f3758f434d8adbec551b3984d452db05717bcec8036aca4ce83796f1",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_a_collateral_input]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_collateral_return]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_long_token_m-9fb3cfe5": "0221d12d3f7668e77714045a37b6b1c3e21e562d3b91b3560e466a12a5a40f91",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_output_conta-e3b36436": "190e04a58730ba2c6dee6620cbd55cf25e0b950252457db06e0b2891692ccf5f",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_reference_input]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_repeated_withdrawal]": "d048b8ace3b7e1c58aa0b337f89437227621df9695e4e195660c5644232fa417",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_delega-19d1722c": "9f3de00426d0b19931d7e7bc607b5738b2f4d0d2dc696e51c80dd133ab550fad",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_delega-394991f1": "9f3de00426d0b19931d7e7bc607b5738b2f4d0d2dc696e51c80dd133ab550fad",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_deregi-351ce869": "9f3de00426d0b19931d7e7bc607b5738b2f4d0d2dc696e51c80dd133ab550fad",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_deregi-43da91d4": "9f3de00426d0b19931d7e7bc607b5738b2f4d0d2dc696e51c80dd133ab550fad",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_regist-456f1292": "9f3de00426d0b19931d7e7bc607b5738b2f4d0d2dc696e51c80dd133ab550fad",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_stake_regist-84b1254e": "9f3de00426d0b19931d7e7bc607b5738b2f4d0d2dc696e51c80dd133ab550fad",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_total_collateral]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_withdrawal_c-9f7e1700": "d048b8ace3b7e1c58aa0b337f89437227621df9695e4e195660c5644232fa417",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_withdrawal_c-e98b1f5c": "d048b8ace3b7e1c58aa0b337f89437227621df9695e4e195660c5644232fa417",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_with_wthdrawal_ad-3291ee9e": "d048b8ace3b7e1c58aa0b337f89437227621df9695e4e195660c5644232fa417",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[multisig_transaction_without_minting_b-da5ba399": "475e1226f3758f434d8adbec551b3984d452db05717bcec8036aca4ce83796f1",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[ordinary_transaction_with_long_token_m-350c65f4": "4624dd2ca57bdf2c80d7406e349c9d950ce80172b96c16244e53d3661fea8129",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[ordinary_transaction_with_token_mintin-bc56f145": "faea04fc61fc8d34c7e05fb89292f373f664b8d728a8bdaa32e04d48c433e675",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[ordinary_transaction_without_token_min-a128d577": "226a1cc335d82d65196fe047563ddda88d770d1fe5f733e1096f2438b6528de7",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_address_has_invalid_crc]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_address_is_a_valid_cbor_but_inv-ea3da215": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_address_is_invalid_cbor]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_address_is_too_long]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_address_is_too_short]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_datum_hash_has_incorrect_length]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_has_both_address_and_address_pa-2efc280f": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_total_is_too_high]": "a38d4a7789e2f335fc1677829b353dabb6e4494600637416d088dd626fda45b1",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[output_with_reward_address]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[plutus_transaction_with_output_contain-74465253": "447d1a645770d1d61cd9304825a9fb04645d625fb7d40ba6422fb85507d3fd68",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[policyids_in_mint_in_wrong_order]": "d424f84873658deef562e5c9f3c792f36aa110d80a1b1acc1c414b146dedc29e",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[policyids_in_multiasset_output_in_wrong_order]": "bf90b6bbe9990c2246c48ade84266cd18dfbe2266aab39195067293ddf72f78f",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[pool_reward_address_belongs_to_differe-e79b6855": "01582a649c3912eb6d16b77f2a0d118733bb1aa40d0ed2c8ba7b99450f2cdef4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[pool_reward_address_is_a_base_address]": "01582a649c3912eb6d16b77f2a0d118733bb1aa40d0ed2c8ba7b99450f2cdef4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[reference_input_is_present]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[repeated_asset_name_in_mint_token_group]": "480cb2d51403cde5d8b8b1cf4787c8e76100234e09358ca36eb7b2790e180c6b",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[repeated_asset_name_in_multiasset_token_group]": "587fc7c4c7bf0dc651cd53a1cfd3ddbebe2c361defa8d0d80c3ae4fe3a6aef7e",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[repeated_policyid_in_mint]": "e270793e7a76b2846c8332e4e662fd993f550d08b935541f2a4631a72f447cbe",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[repeated_policyid_in_multiasset_output]": "e28700611d4cec190f064a1f834e385055549d9da91d8ab6201396cb9d6affed",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[required_signer_with_both_key_path_and-7d9a3c59": "5d13e90a5b710581f5d108ae9d12fa8fc2cc2257eb46964397e4207d31692722",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-02b129f8": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-11c8b442": "62b831912e3f38c26bdec456740f01a6ea76fa240e87129ee5824d3209990aec",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-2d1899d5": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-3f8170f6": "62b831912e3f38c26bdec456740f01a6ea76fa240e87129ee5824d3209990aec",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-60961d51": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-790fc948": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-883e81d5": "344fba027b3f0bd4a1cb4630f1eb0be1f9bc4856f93685fec04d0240a7686307",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-9ae6620c": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-d0eba163": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-e7a533e7": "01582a649c3912eb6d16b77f2a0d118733bb1aa40d0ed2c8ba7b99450f2cdef4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-e908b1a8": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[sample_stake_pool_registration_certifi-f9976ae8": "01582a649c3912eb6d16b77f2a0d118733bb1aa40d0ed2c8ba7b99450f2cdef4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[script_data_hash_has_incorrect_length]": "976777e23d39b0ce653cbab7dfb7f87b824e414b930bd594c704af2cb7b43a93",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[shelley_mainnet_transaction_with_testn-af110e3e": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[shelley_testnet_transaction_with_mainn-ba78ab8f": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[stake_deregistration_account_larger_than_100]": "617fb5575799f6d6a7ef35525f12d8a148be9987e21b4e925836b41413c471bf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[stake_deregistration_certificate_and_w-003a1023": "595cd9af11cbc6c1a464a80c41e8b35659b4fb4a84b0134dc2730625597abab9",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[testnet_protocol_magic_with_mainnet_network_id]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[testnet_transaction_with_mainnet_output]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[total_collateral_is_present]": "e5b8f2de7ef002a36cd8d084e4014a3dfff434fb4c4ed57078346ff7f87d9d81",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[transaction_with_both_auxiliary_data_b-d83df998": "617fb5575799f6d6a7ef35525f12d8a148be9987e21b4e925836b41413c471bf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[transaction_with_both_voting_public_ke-0ded7777": "617fb5575799f6d6a7ef35525f12d8a148be9987e21b4e925836b41413c471bf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[transaction_with_governance_registrati-efb78b43": "617fb5575799f6d6a7ef35525f12d8a148be9987e21b4e925836b41413c471bf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[two_owners_with_path]": "b6224bef0b5f122e4d730e9444785f1ddbe2c57af79ce1e8854107deb63ab759",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[unsupported_address_type]": "9aff42c88eeb4f689978f87cb33ff3ddf6678941b8ea275ee7593f7e1faedbde",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[with_multisig_transaction_signing_mode]": "9f3de00426d0b19931d7e7bc607b5738b2f4d0d2dc696e51c80dd133ab550fad",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[with_ordinary_transaction_signing_mode]": "617fb5575799f6d6a7ef35525f12d8a148be9987e21b4e925836b41413c471bf",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[with_plutus_transaction_signing_mode]": "63d90541736c50e4db223929404c4c900ac52773fb57f2665b6b07871a527604",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_amount_is_too_large]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_contains_both_path_and_key_hash]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_contains_both_path_and_script_hash]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_has_key_hash]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_has_multisig_path]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_has_non_staking_path]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_failed[withdrawal_has_script_hash]": "3fed43e80fb8cb2f2b468035b85c9f5172902c37087fd1c4dea002cfba382fb6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[mainnet_transaction_without_change]": "249cf7c7e9293ec1e970aeb7fd6f1188f196da37240bef1422a73e9fce7a5ad4",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[multisig_transaction_with_a_requ-c2fba589": "aaf5df58c7b9825440ec0a8b78ba506f3f09fbe857dc67e43990c646aace0f58",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[ordinary_transaction_with_a_requ-9728607e": "bc76843298ab33d3cfd2946252abc66abfac608db10cf19cbfe43b8d239be05d",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[ordinary_transaction_with_long_i-708443f3": "59b10e87c3bd2c97283c96863b154c1f242eb0a569a413ccff7941d217104158",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[ordinary_transaction_with_output-9ba7352d": "3d7aa3d3495adcce9f64f313d72ab603ee3b25817f72ebb0ca96d0169ca73800",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[plutus_transaction_with_reference_input]": "e008f928074a083b23e91fde89f9b53b49ea19870199229a1cd403644181cde6",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[plutus_transaction_with_total_co-e846c221": "1b1eb2602b1e6d7e0dfe15e22ce7cd3b16ccd41372e88f189aa5fd1631b547cb",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[transaction_with_cip36_governanc-36bf9253": "fae55547740e58526335381e6cecf83c16f7992f405deebdce94ef3745d5d7be",
+"TT_cardano-test_sign_tx.py::test_cardano_sign_tx_show_details[transaction_with_stake_deregistr-6e84da2f": "4d5905d7446c1088e27c31a81366aaaa1222345945fd1fa066190a3ac21b24e5",
+"TT_eos-test_get_public_key.py::test_eos_get_public_key": "1ae52c69bf8f5d6ded30b23b07ac1dddf4f5b5491d3b528fd51938c6f994ee55",
+"TT_eos-test_signtx.py::test_eos_signtx_buyram": "918381bb52ff9afbe4708365a6cfdd8170b6425b442ece654e6f29ea18f5e03f",
+"TT_eos-test_signtx.py::test_eos_signtx_buyrambytes": "ef8d6ec55432fd65bf8430802e0092959c887ffd5819162bed4cdb16010e5025",
+"TT_eos-test_signtx.py::test_eos_signtx_delegate": "d6aee3fe249d7b3a18706d3d38fbc60ad0760dfab139f5ef05aa9a52c4f34773",
+"TT_eos-test_signtx.py::test_eos_signtx_deleteauth": "15c07a440b5810004d2399d1b5a0c42516fbb274a5e95a0bfa70b03e63e972f5",
+"TT_eos-test_signtx.py::test_eos_signtx_linkauth": "84fb8ad6218ef99f35b3958abe0e047d3e9806a767b7ef1ef3989cd453008dc0",
+"TT_eos-test_signtx.py::test_eos_signtx_newaccount": "ae80fcaf9c313432e7f24d6a4e695da0155979085cb677655c6b40a9172292f8",
+"TT_eos-test_signtx.py::test_eos_signtx_refund": "b2e57cb544e02416ae4e8160f299d2c50d2903911512f0ef913083acfc72b15b",
+"TT_eos-test_signtx.py::test_eos_signtx_sellram": "0e4560a452b58d200c2a333a36060e69d35f1faab2f50f162ab43e9bdfce3223",
+"TT_eos-test_signtx.py::test_eos_signtx_setcontract": "f20cc749f52f34e511d1f919027c2de0a082ebc4be64de79b4ed712843947c9e",
+"TT_eos-test_signtx.py::test_eos_signtx_transfer_token": "d0f26b8d6b6aed9e1262e050f2ee8db982b11917e4c491770e75e48ec9e51280",
+"TT_eos-test_signtx.py::test_eos_signtx_undelegate": "38d6caebbae413d9e5a5f29ffde078e2bf3090fe9339711fb2ceba03448a98f0",
+"TT_eos-test_signtx.py::test_eos_signtx_unknown": "04112c636a5b9f23db814069ab6cb0931bdfa8714a15633e62c8150b5342f0f0",
+"TT_eos-test_signtx.py::test_eos_signtx_unlinkauth": "3f93d26616bc17455302bebe2c72b1a9935425bc1f6118048b6fae27d346c5e6",
+"TT_eos-test_signtx.py::test_eos_signtx_updateauth": "7e549fd8286e0413b6081ba656b87e4785bcf90ee3bde3635e6092c8e14652e5",
+"TT_eos-test_signtx.py::test_eos_signtx_vote": "6651484337dd67fdde8c0022e2b6f9406e2e7c6129c83b73147464e36333fb2b",
+"TT_eos-test_signtx.py::test_eos_signtx_vote_proxy": "bcdaf30ff8dd72bf34bbbb2464536f9e82549b994b6cb22164d43d4c74eb5551",
+"TT_ethereum-test_getaddress.py::test_getaddress[ETC]": "b4ca3d4e2c3e826a6937a9bc307c88b710510991f4e1b0fcaba54ba764ce3cc8",
+"TT_ethereum-test_getaddress.py::test_getaddress[GoChain]": "467a1830ee19241922fcf06d62a378a48b5573059668559b6510ff34e555b2c7",
+"TT_ethereum-test_getaddress.py::test_getaddress[Ledger Live legacy path]": "828c2763dc70416859d17cfe4406469f232f773e2b6499fc867b23cf4326f8ee",
+"TT_ethereum-test_getaddress.py::test_getaddress[Wanchain]": "f0c54df481b872e80c251ac2fa96cbc10df3b0f394e92358f25ea4d3b63a469d",
+"TT_ethereum-test_getaddress.py::test_getaddress[parameters0-result0]": "cc348683ad52857af7d1d06a21cac8b4d48a2a0c7f73b98e92a1962699bf4e8b",
+"TT_ethereum-test_getaddress.py::test_getaddress[parameters1-result1]": "930c3c462ff4f84ab3173b6ae10907a459eb1e59c35e5c55b48073d0d5540a94",
+"TT_ethereum-test_getaddress.py::test_getaddress[parameters2-result2]": "27a12af73a141349dbb2b7ef8cddc408cc1352ef140ccbfe5ba162252352e1ed",
+"TT_ethereum-test_getaddress.py::test_getaddress[parameters3-result3]": "9079c1262d3430fd7bbbc8061e6ce53635eb913935b10aeab46b4509d5baeb37",
+"TT_ethereum-test_getpublickey.py::test_ethereum_getpublickey[Ledger Live legacy path]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters0-result0]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters1-result1]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters2-result2]": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[array_of_structs]": "ed5f9713f768c531956e6643a15c132ce5ec50f8b0db2cd3b66bb93ed779e78b",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[bare_minimum]": "d6a7b9b93f9aec22aeda2ae7b9c197af75d841ac0204fbe5106ceb0c3fa4aaa7",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[basic_data]": "9d8fff61e26bd5d1dedf09361d53ba7420dd59c341509173c0cc78e1a216df5f",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[complex_data]": "5b650c855631cb16a3ba6ff67a3c18ec49945e38460794a99ba2cb3bb70ddc8e",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[full_domain_empty_message]": "f43c95e6f1df42e4717909ea4c209b35a7df2c9c5f3bfae36ae51d613470d0a7",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[injective_testcase]": "eee81511fcf5c02ad56f295b6ad7828ede1f9b0ba348dc7a4aacad1379b06a70",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[struct_list_non_v4]": "9d8fff61e26bd5d1dedf09361d53ba7420dd59c341509173c0cc78e1a216df5f",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[struct_list_v4]": "9d8fff61e26bd5d1dedf09361d53ba7420dd59c341509173c0cc78e1a216df5f",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data[structs_arrays_v4]": "9d8fff61e26bd5d1dedf09361d53ba7420dd59c341509173c0cc78e1a216df5f",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data_cancel": "f96d4a98db012ef1ea0a156b2bf56e165852d7c8b1e418e84a1070463337da0b",
+"TT_ethereum-test_sign_typed_data.py::test_ethereum_sign_typed_data_show_more_button": "6e83493a3cf94fc4f97e70d004dbc7c808f10e7fef6defeda0c875af05db7577",
+"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters0-result0]": "eb132cf1874910be4ebe4f19209b5d09da5cefefbd5151d796e2dd63f139232a",
+"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters1-result1]": "f123d3b95e3e76fe15dbd88d67bbf4bba249b4017ce9f81ebad2f4d501a2a618",
+"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters2-result2]": "fbbbaffe08edf05f2cbbb513b736c594e71ad3c160bfef096a91bcc4995f6abb",
+"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters3-result3]": "d6c0787922e9ced70f6dc44e59c8804ae609175b582f6c7ab1d1f218cfe8fce9",
+"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters4-result4]": "81bb448b6c13ed362721b04f7ee6ef1186f3e05026a5f6513e9eba6c1fad094a",
+"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters5-result5]": "3f492aede4e32e94b18e1ccf53fabea77cf46e02106ae51f9d4b1962de6e2cad",
+"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters6-result6]": "9a49c2e811351a2b5ba4972ef28717ba49671087aba60a491835fcee0d7953d0",
+"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters7-result7]": "a7f60a43462c46724e9a94a356022863db0fa546432be27d3f1d2bf6757788c8",
+"TT_ethereum-test_sign_verify_message.py::test_signmessage[parameters8-result8]": "3c4e13adb03cd3be24bc490e11f7435d37a06f4dc05d0460a67476e55a9b48b5",
+"TT_ethereum-test_sign_verify_message.py::test_verify[parameters0-result0]": "cca7b0b22ab74391be8b5af3a45f33d5ff426a8f9c1f3858bad6d614b1da074d",
+"TT_ethereum-test_sign_verify_message.py::test_verify[parameters1-result1]": "e2e5d06d15a5277c49940c9b2b36d4c4854dde42ec8cd6ce645d8b5122302e56",
+"TT_ethereum-test_sign_verify_message.py::test_verify[parameters2-result2]": "36b1927bbde5392b8da6d3af96271f0a40fefadfcb869b344c7d23d8fa9fd53e",
+"TT_ethereum-test_sign_verify_message.py::test_verify[parameters3-result3]": "c0f2f439a2b112f6a78cd6790ee465bae4fb542596eef8d1f617883f4390d612",
+"TT_ethereum-test_sign_verify_message.py::test_verify[parameters4-result4]": "bf3c6d1c7f21f498c85dd27405e609a18e5c5d59a5f6242335c0c916bd4d09b0",
+"TT_ethereum-test_sign_verify_message.py::test_verify[parameters5-result5]": "4cf4d685b1f8d67da214000f15de3fbbf90ee6f2923eaa28d893dbed357f5319",
+"TT_ethereum-test_sign_verify_message.py::test_verify[parameters6-result6]": "dbc5ebd4e4761123385156bbbed0d4fffd5efff2da2c18dc1e65b487d1adc88c",
+"TT_ethereum-test_sign_verify_message.py::test_verify[parameters7-result7]": "b549108ef7b0b93f197b063016fd8e808c89e49fb5901c8664cd653d820a88da",
+"TT_ethereum-test_sign_verify_message.py::test_verify_invalid": "cca7b0b22ab74391be8b5af3a45f33d5ff426a8f9c1f3858bad6d614b1da074d",
+"TT_ethereum-test_signtx.py::test_data_streaming": "e62485acbfb5f6c7d72df1d2caf4057f0b5df448ccbe5a2c881ea7b3d9f1634d",
+"TT_ethereum-test_signtx.py::test_sanity_checks": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_ethereum-test_signtx.py::test_sanity_checks_eip1559": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_ethereum-test_signtx.py::test_signtx[Auxilium]": "26485927730a69e215ce163b46f08886762e389e8ce72dad5f65ba21ae554d08",
+"TT_ethereum-test_signtx.py::test_signtx[ETC]": "2a6028d3b94229cd25d3007d0794f52820aa1ad063d764e4abe180c5ee39675a",
+"TT_ethereum-test_signtx.py::test_signtx[Ethereum]": "a77b40c0236cd1dde448aaff6b34f47f737e5e4e2c012600e2b516470824d938",
+"TT_ethereum-test_signtx.py::test_signtx[Ledger Live legacy path0]": "b2b0bb8fdd6d1cdc839d366bc8d128b88c12257a037b6c4c3ca8177b851fa0ff",
+"TT_ethereum-test_signtx.py::test_signtx[Ledger Live legacy path1]": "a77b40c0236cd1dde448aaff6b34f47f737e5e4e2c012600e2b516470824d938",
+"TT_ethereum-test_signtx.py::test_signtx[Palm]": "4cbc6afeca0a289f3a512a127e2c64d9c5e50bae105dbed08d864cecb1b2c3ee",
+"TT_ethereum-test_signtx.py::test_signtx[Pirl]": "b00502605a2fbf5208e376635d4d48e4486d0c38fac1caa2de075a36affb8518",
+"TT_ethereum-test_signtx.py::test_signtx[Rinkeby]": "c5d812b421ab4eb7007503c5df157271e7d8539d9dda2ed4a53ce633cc1cc335",
+"TT_ethereum-test_signtx.py::test_signtx[Ropsten]": "c5d812b421ab4eb7007503c5df157271e7d8539d9dda2ed4a53ce633cc1cc335",
+"TT_ethereum-test_signtx.py::test_signtx[Unknown_chain_id_eth_path]": "0c589018beaf595c526c91b1c4b2d7ee07dc0a3a31685530d955a22129edf6d1",
+"TT_ethereum-test_signtx.py::test_signtx[Unknown_chain_id_testnet_path]": "0c589018beaf595c526c91b1c4b2d7ee07dc0a3a31685530d955a22129edf6d1",
+"TT_ethereum-test_signtx.py::test_signtx[data_1]": "ea6a8ac2fb0271e7410f5ead5fd7a3923483980fb2230badc18a88ba256a1043",
+"TT_ethereum-test_signtx.py::test_signtx[data_2_bigdata]": "e2925b7c566ea9f256145ff50cd3baec80994d29824155722b887b777a71cb5e",
+"TT_ethereum-test_signtx.py::test_signtx[known_erc20_token]": "b0d7aa25c1d455156688298a49121a8206aba63865a52c86ada0057de0b34a01",
+"TT_ethereum-test_signtx.py::test_signtx[max_chain_id]": "0c589018beaf595c526c91b1c4b2d7ee07dc0a3a31685530d955a22129edf6d1",
+"TT_ethereum-test_signtx.py::test_signtx[max_chain_plus_one]": "0c589018beaf595c526c91b1c4b2d7ee07dc0a3a31685530d955a22129edf6d1",
+"TT_ethereum-test_signtx.py::test_signtx[max_uint64]": "0c589018beaf595c526c91b1c4b2d7ee07dc0a3a31685530d955a22129edf6d1",
+"TT_ethereum-test_signtx.py::test_signtx[newcontract]": "8d20491d301502c47b9070bdfdaf63b70aa8fa80fb8c01c443a7429a08c9ea57",
+"TT_ethereum-test_signtx.py::test_signtx[nodata_1]": "c4ae169faa500ed8eac882d858b0b83d222ac9a8e78cab123a8b945db788fdd3",
+"TT_ethereum-test_signtx.py::test_signtx[nodata_2_bigvalue]": "92846168581c9c12e4e3239428c3f5677f4f1ff6bdf30ba894555188640287e4",
+"TT_ethereum-test_signtx.py::test_signtx[unknown_erc20_token]": "0d4a6f9a6bd8b02c7c3c9281f4b9e6680c932b2bf7acd031bcc6852caabb273f",
+"TT_ethereum-test_signtx.py::test_signtx[wanchain]": "e6319a5754825d1888b9caa89200ca2f6698d7da03669e38167a0b9426ed0919",
+"TT_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_go_back]": "cb6d2a60c192b972e2cff02c4f7a6396184ba1a46df3c05b947e089f94427f0f",
+"TT_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_scroll_down]": "861ad7ab30bc8ea6edcc8138e86c654d04f9231dfd14ec1ca391820f145f7e57",
+"TT_ethereum-test_signtx.py::test_signtx_data_pagination[input_flow_skip]": "a8310b52786197219e3fb8399b19e624bbb74370a080c410daecc7f7422ea9cf",
+"TT_ethereum-test_signtx.py::test_signtx_eip1559[Ledger Live legacy path]": "66b381da23a9f31f962115de7a8ae95d575eda72f665d2d65f00bead78cdab48",
+"TT_ethereum-test_signtx.py::test_signtx_eip1559[data_1]": "5165979cd94b31b68ca478f2f230ee1470c74e2cf0cc80d53fc0278c41f34d1f",
+"TT_ethereum-test_signtx.py::test_signtx_eip1559[data_2_bigdata]": "1da940fdb1d80374ebb1eb3922ab15bccf54eaec6ed40ce83834a93695fa1311",
+"TT_ethereum-test_signtx.py::test_signtx_eip1559[known_erc20]": "0e43071011c080f3a64130113914a03285f35c0e9c69379f6c94eda48dc9816f",
+"TT_ethereum-test_signtx.py::test_signtx_eip1559[large_chainid]": "c2fa2b3fe49f369b7cf1da456cdd08fc56d232155aa48232ef5ba965df9cafaa",
+"TT_ethereum-test_signtx.py::test_signtx_eip1559[long_fees]": "dd272effd96a8ba69c2ef4ae3369963d03de957830e61de2a3f00e8ca7ba1f42",
+"TT_ethereum-test_signtx.py::test_signtx_eip1559[nodata]": "66b381da23a9f31f962115de7a8ae95d575eda72f665d2d65f00bead78cdab48",
+"TT_ethereum-test_signtx.py::test_signtx_eip1559[unknown_erc20]": "541822da15b3d11952c9329092d38ba363ca021a0193967e441a2feb59b771fb",
+"TT_ethereum-test_signtx.py::test_signtx_eip1559_access_list": "e32e0029dedc39857f3d8eb31ce8cf7a06d32e6ca81df7d67586fce123df4f7d",
+"TT_ethereum-test_signtx.py::test_signtx_eip1559_access_list_larger": "e32e0029dedc39857f3d8eb31ce8cf7a06d32e6ca81df7d67586fce123df4f7d",
+"TT_misc-test_cosi.py::test_cosi_different_key": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_cosi_nonce": "92799c53459f2a735a145bde35943967265d2411e766e5597d7f614f9ef1827c",
+"TT_misc-test_cosi.py::test_cosi_pubkey": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_cosi_sign1": "92799c53459f2a735a145bde35943967265d2411e766e5597d7f614f9ef1827c",
+"TT_misc-test_cosi.py::test_cosi_sign2": "59071f9bac86b8666b28c53178fbe76249af0878a5d9eafe4b40ea7b63a2a9e7",
+"TT_misc-test_cosi.py::test_cosi_sign3": "264dcf0ee58b1cc5a580ab5ab567a7450776c12002a87ea56c071b83a85bfc9c",
+"TT_misc-test_cosi.py::test_invalid_path[m-10018-0]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_invalid_path[m-1]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_invalid_path[m-44h-0h-0h-0-0]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_invalid_path[m-44h-60h-0h-0-0]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_invalid_path[m-44h-60h-1h]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_invalid_path[m-84h-60h-1h-0]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_slip26_paths[42]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_slip26_paths[T1B1]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_slip26_paths[T2B1]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_slip26_paths[T2T1]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_slip26_paths[T3W1]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_slip26_paths[\\x00]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_slip26_paths[\\xfe\\xfe\\xfe\\xfe]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_cosi.py::test_slip26_paths[dog]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_msg_cipherkeyvalue.py::test_decrypt": "4e4eaf26e8f9cb7187049cb0d718e2ad3f2c5d83ab91b3d0ed3257f6271dfe5e",
+"TT_misc-test_msg_cipherkeyvalue.py::test_decrypt_badlen": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_msg_cipherkeyvalue.py::test_encrypt": "dcfe4d2f73405d8a08c006200e75fc84fd77af58e77cdc8a476933e69288868d",
+"TT_misc-test_msg_cipherkeyvalue.py::test_encrypt_badlen": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_misc-test_msg_getecdhsessionkey.py::test_ecdh": "ebe2d05bf37d80f0fe14e83f7a1204b4579bad152633f67ff9189c0b13fe8868",
+"TT_misc-test_msg_getentropy.py::test_entropy[128]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[129]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[16]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[17]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[1]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[20]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[21]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[256]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[257]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[32]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[33]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[3]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[4]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[512]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[513]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[5]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[64]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[65]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[8]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_getentropy.py::test_entropy[9]": "be96d009cc909ae254501f71f85c4babfe1dbffffafe3ebcccf982f0446e8912",
+"TT_misc-test_msg_signidentity.py::test_sign": "d65f89c11a143cec1b4b3964fe6aae093365077ac92816858b94a90038b8fe08",
+"TT_monero-test_getaddress.py::test_monero_getaddress": "54303cfcb7b8b786634eebcb91d259d4770742827acbf6e74b17b3fbe1c65866",
+"TT_monero-test_getwatchkey.py::test_monero_getwatchkey": "8ab0244bf2fb680b0adb321971b7ff45c0ddbd14a91d3528478c2cc50df3bcb1",
+"TT_nem-test_getaddress.py::test_nem_getaddress": "caa19213ab56d490b22adce8ee0686676f5d730b82761d679c663010713dfd10",
+"TT_nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_creation": "1cc17a0ad2d5fca77d056544ae24ef5d3fe9187c175e0aaf10be4738039ecbe8",
+"TT_nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_creation_levy": "9a77433a277bdae17463dd3fd9c8aca93f91b5fa644d77f46fb1a656759b0381",
+"TT_nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_creation_properties": "6f9481b1078250f65068866126e773f321d7eece04e420c02308746b3790068d",
+"TT_nem-test_signtx_mosaics.py::test_nem_signtx_mosaic_supply_change": "ef58c71a2898259787868b40dc8ac964837b170a2565a7450cf56342ea537cfb",
+"TT_nem-test_signtx_multisig.py::test_nem_signtx_aggregate_modification": "68a8f2c2456184207854633a9c74e903fa2e3406c4baaa35cd28a58bd48af342",
+"TT_nem-test_signtx_multisig.py::test_nem_signtx_multisig": "a78303a1fa4caa6f0fa3fd5ecfe763ff4bcedbe77082f9623a8556e3e3534512",
+"TT_nem-test_signtx_multisig.py::test_nem_signtx_multisig_signer": "71e7b6405e9a173094169618e2f7cca55c7ab8451f59e2e30b3915c7eac9982c",
+"TT_nem-test_signtx_others.py::test_nem_signtx_importance_transfer": "a3dc39d3ae0e7dbd1d60b6845699bc0456f57e66f858a2cc94766b703e088f99",
+"TT_nem-test_signtx_others.py::test_nem_signtx_provision_namespace": "691ec372b83a9fbf2ac48b57f9550d4e6cd7978c5c80cc3e66aeeae680d3948a",
+"TT_nem-test_signtx_transfers.py::test_nem_signtx_encrypted_payload": "b7c329975fd8808293dacf0b5d8b38368e1c21b6568edfc64892505af7d7cc1d",
+"TT_nem-test_signtx_transfers.py::test_nem_signtx_known_mosaic": "33e82d1ebdb920fde18c50e94e5e3b2c4f49cbe1762c19e1f087513b45cf7a21",
+"TT_nem-test_signtx_transfers.py::test_nem_signtx_known_mosaic_with_levy": "d765862aff2cd8c49e009c3480eec77e7bffcd48b7ae2684d1229c0b40807818",
+"TT_nem-test_signtx_transfers.py::test_nem_signtx_multiple_mosaics": "dfe67d6dce57d1df25fbaa4761af40c19d59677d0f69e3de2b7bcec0c9497a06",
+"TT_nem-test_signtx_transfers.py::test_nem_signtx_simple": "66c2e015c222a689a695b8e8af2b5039adc8bf00ccdcac633e5eddf5fb0cbe50",
+"TT_nem-test_signtx_transfers.py::test_nem_signtx_unknown_mosaic": "9ac4a2f43df080ed9729ac2929bfd72cdbe6b9405a4b9bc1d26b6d7d5455e5de",
+"TT_nem-test_signtx_transfers.py::test_nem_signtx_xem_as_mosaic": "0deee5cd7b070fa65c3da1e888617c3cc4e1f544a13bf95d19766f5834c0f3e3",
+"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[label-test]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[language-test]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[passphrase_protection-True]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[pin_protection-True]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[u2f_counter-1]": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_dry_run": "3a05e306bd163cf748bf1ff64fa4fb9394688c0f6d8174b62fc19cb4fba42fb6",
+"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_invalid_seed_core": "10ff7f89ac8b90b243aa432f43ecffa7ca394cf6f8acd65d0408b8cdb27354cd",
+"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_seed_mismatch": "489efce4df13f3675171aabbdb45d9338ad24636bb03ad9c106f0e33d240427b",
+"TT_reset_recovery-test_recovery_bip39_dryrun.py::test_uninitialized": "1cbcf9bba947956dbccfb2fa59b4e734a6696f6608c6b772829bfa320789be02",
+"TT_reset_recovery-test_recovery_bip39_t2.py::test_already_initialized": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_reset_recovery-test_recovery_bip39_t2.py::test_tt_nopin_nopassphrase": "a2dc8e3009d8daf02d56ffb54083b8edd0996d4aa174b131ec4ef4d3812a8f82",
+"TT_reset_recovery-test_recovery_bip39_t2.py::test_tt_pin_passphrase": "9f6fcbf7e79bd185c7f77db3e7411e1c5c6e095e2deb83248475068ca635302e",
+"TT_reset_recovery-test_recovery_slip39_advanced.py::test_abort": "27d8a9fca3e35281e82b5dcbdc7e5b09b6ba9b60ad066feaa07cd15bcc200056",
+"TT_reset_recovery-test_recovery_slip39_advanced.py::test_extra_share_entered": "bbc295a9e6931f67dd4e006dd235ca6097f728e8504ca3641e4f2866614f5887",
+"TT_reset_recovery-test_recovery_slip39_advanced.py::test_group_threshold_reached": "5a99501f9c90d2d27797ab75ccd8a5ed492894f358689104792dcef1033cc625",
+"TT_reset_recovery-test_recovery_slip39_advanced.py::test_noabort": "ca215b6b06215d2d931197fa04313f179b08612901877b99a361225d57dc1893",
+"TT_reset_recovery-test_recovery_slip39_advanced.py::test_same_share": "82434e50f2f1cd4d9bb90fbf5ea7c44756a7f434b6abdb3895716cf65446fddb",
+"TT_reset_recovery-test_recovery_slip39_advanced.py::test_secret[shares0-c2d2e26ad06023c60145f1-afc2dad5": "0459af236116c3a1967e90cb4f09ec64faa83bb54b0c194f2d617a48352b3a4a",
+"TT_reset_recovery-test_recovery_slip39_advanced.py::test_secret[shares1-c41d5cf80fed71a008a3a0-eb47093e": "787d718405dbe2455acafd7c08e8531d3d0cdb417505173f62d2f0800a8a5973",
+"TT_reset_recovery-test_recovery_slip39_advanced.py::test_secret_click_info_button[shares0-c2d2-850ffa77": "ed22bc6525d8b485d2afe9c1cc3d8495d1fee75afcd1663dc39e80a0404ab425",
+"TT_reset_recovery-test_recovery_slip39_advanced.py::test_secret_click_info_button[shares1-c41d-ca9ddec8": "f04611de9772fc345072471a4ccc9fcda1e1952baea003b0329b5c3b01d34b5c",
+"TT_reset_recovery-test_recovery_slip39_advanced_dryrun.py::test_2of3_dryrun": "d82a31b085b52eae882ea9f07a319ab711a66b9ba309b3efb5ac2d048912ad10",
+"TT_reset_recovery-test_recovery_slip39_advanced_dryrun.py::test_2of3_invalid_seed_dryrun": "3da7c811bb5d6f39da9c58900d760268f24034ef9d933da42faf327c1d009952",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_1of1": "d30d5c840d1e932547aedf6720e1ea5144455112e760422cab1aec5d6c9c26f6",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_abort": "27d8a9fca3e35281e82b5dcbdc7e5b09b6ba9b60ad066feaa07cd15bcc200056",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_ask_word_number": "a8094f1d078a0eddc097b00e67d27cca9c1df917cc340f666194803e77ad94df",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_noabort": "388ada02eda485cc063f01c34faa2f0d57692396cc128ae749ebb42a555ee7ef",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_recover_with_pin_passphrase": "6fc54a3f796fcde0a15a9ef6d174b6edc864cae67c5ffa3de4e4e88fcc7e7988",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_same_share": "e92799ee818e2bce75bad7de73356a5df74337be64387692eec8fe6a7c775de6",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_secret[shares0-491b795b80fc21ccdf466c0fbc98c8fc]": "56574dc9cafbfd8315b4eca4e0c505bf82d026a9ebb4a6940589a5425634387e",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_secret[shares1-b770e0da1363247652de97a39-a50896b7": "03801f71238abfb2c8f2f31ebbdb24f5f8a9c281331380535e8ddcdc68cdb4db",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_wrong_nth_word[0]": "f5dadcc0f26b23feb57ef9631dc4560630fa1f844d8400995faeb2b60814e348",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_wrong_nth_word[1]": "d3fe8653fcf9f68ce3787df4a174f0821fafd4ce061aa194a046e894b47e43e8",
+"TT_reset_recovery-test_recovery_slip39_basic.py::test_wrong_nth_word[2]": "f247455f45556b7b5b71008703b4aaf6c2b5310ada694fb22e53c8cf753c3018",
+"TT_reset_recovery-test_recovery_slip39_basic_dryrun.py::test_2of3_dryrun": "a6b5e4f08546d0bcdbfa2e798a4b56719743f691da7e6946a71681c0aaec2056",
+"TT_reset_recovery-test_recovery_slip39_basic_dryrun.py::test_2of3_invalid_seed_dryrun": "dc397401ed5d0ea187598080c2799a2c0d0faa428c94b1312bfd62659e987a94",
+"TT_reset_recovery-test_reset_backup.py::test_skip_backup_manual[BackupType.Bip39-backup_flow_bip39]": "bff67c223da54ad64ee60abf1912be025913f94b67728afdc7e600c40de3934c",
+"TT_reset_recovery-test_reset_backup.py::test_skip_backup_manual[BackupType.Slip39_Advanced-bac-f67baa1c": "9ef7bdbe75302b32684eca62183885c26e994d2a32f20cd07823d01a4996ef91",
+"TT_reset_recovery-test_reset_backup.py::test_skip_backup_manual[BackupType.Slip39_Basic-backup-6348e7fe": "4a1959eee0d5af5fb68378702fdef30e3850381a92eb339959bfcc6da2fb03f8",
+"TT_reset_recovery-test_reset_backup.py::test_skip_backup_msg[BackupType.Bip39-backup_flow_bip39]": "98b9c6fa669763f0688be9ef317abf70999c82ac4363b0b09c47dcc6380e904c",
+"TT_reset_recovery-test_reset_backup.py::test_skip_backup_msg[BackupType.Slip39_Advanced-backup-dcbda5cf": "152d2a026a08511ff553e27647131d3ff6fd6d680adfe40b73ca597849d2e7fb",
+"TT_reset_recovery-test_reset_backup.py::test_skip_backup_msg[BackupType.Slip39_Basic-backup_fl-1577de4d": "0b90aaf1f896cc26fba20be86e3e37a949f4f58041a6d2ba3a68e144ecc5ee70",
+"TT_reset_recovery-test_reset_bip39_t2.py::test_already_initialized": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_reset_recovery-test_reset_bip39_t2.py::test_failed_pin": "aee0f776a66f7b7a8b8ebdf7fac6d38c7a7bb28aafa3a7678d4cf610d7b8764d",
+"TT_reset_recovery-test_reset_bip39_t2.py::test_reset_device": "6c401c3c716ac6e9fbf8df3ae8c86d6a01edbe2789b11e3cfff4ce45e83a74ef",
+"TT_reset_recovery-test_reset_bip39_t2.py::test_reset_device_192": "ed68ddd5b20ebd2676bdbe7173263a44bce69c4bbe619bc15cc0e34896a7fac8",
+"TT_reset_recovery-test_reset_bip39_t2.py::test_reset_device_pin": "c2a5f9b1e9f89243503af5e661cf0deaf33daf43fb64706cd089b2e3a5e25a2b",
+"TT_reset_recovery-test_reset_bip39_t2.py::test_reset_failed_check": "fa916d548c9f2091c3ab06972241ec427d2f47e78130c157bbdd05268c40f81b",
+"TT_reset_recovery-test_reset_recovery_bip39.py::test_reset_recovery": "b199a8e4817884b76115ea3cf09ec7368dba08e4c026f1a48df80dae591e92bd",
+"TT_reset_recovery-test_reset_recovery_slip39_advanced.py::test_reset_recovery": "e70655249d26442b9fcf4a0de133f15f108267c03da532aa5df6639dbf2c02c7",
+"TT_reset_recovery-test_reset_recovery_slip39_basic.py::test_reset_recovery": "1985a029684557c92c4413990dc61f062c1c9fd1b9e3fb38793e83d01983879e",
+"TT_reset_recovery-test_reset_slip39_advanced.py::test_reset_device_slip39_advanced": "953c646844e1ad9f2b2e81506f01761bea9b7c31cf06a24ea83de65a92a8013c",
+"TT_reset_recovery-test_reset_slip39_basic.py::test_reset_device_slip39_basic": "ec9373002f8a2d7e9de36f766bb5133a7b30b67daac7aa6e4e8ac034a1d84381",
+"TT_reset_recovery-test_reset_slip39_basic.py::test_reset_device_slip39_basic_256": "f36510a719acbd65d7ce83619cd2b51932b96763b06475fafe32b2dd3efd9177",
+"TT_ripple-test_get_address.py::test_ripple_get_address": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_ripple-test_get_address.py::test_ripple_get_address_other": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_ripple-test_sign_tx.py::test_ripple_sign_invalid_fee": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_ripple-test_sign_tx.py::test_ripple_sign_simple_tx": "9aa45811c9e4055119fb78aa2d69a835f92dcce52496036f8f3cbb9f10743496",
+"TT_stellar-test_stellar.py::test_get_address[parameters0-result0]": "c9f051657d17fa6167ce4e38be664dc287a6d578333d095dc90ee76e93474cba",
+"TT_stellar-test_stellar.py::test_get_address[parameters1-result1]": "f77e8d5bd0e34fef7e4713db30e55603fa68b83a34692f8b8633041d9e1616be",
+"TT_stellar-test_stellar.py::test_get_address[parameters2-result2]": "4d2ed314132535b07936d98d2eb135473226fd40bd44bc7af2f72e9b6b044372",
+"TT_stellar-test_stellar.py::test_get_address[parameters3-result3]": "d74142c160b09f88ce8d616c302d2d02f73ea3937b163cea3cc443a9c8d2e7fa",
+"TT_stellar-test_stellar.py::test_get_address[parameters4-result4]": "3b17a67570f356c8e67d6abef5bc11a7c098d13047c60d6352f27c0b2f8620e7",
+"TT_stellar-test_stellar.py::test_get_address[parameters5-result5]": "67710c8cc50df3f36f7cf1e6ed7cf3eb90543c87d9b568916df0a14648ed25c8",
+"TT_stellar-test_stellar.py::test_get_address[parameters6-result6]": "8273014fae053fb04d22deae2812c2f589e3685d16965dcdc409c775d5e79613",
+"TT_stellar-test_stellar.py::test_get_address[parameters7-result7]": "10bce72201e81771b14c773d4f1a6fa4e1a6a9bb0e3d664694d5bf2c5311ae32",
+"TT_stellar-test_stellar.py::test_get_address[parameters8-result8]": "61791bacdfd3fa81f2784d91dbfe57727fa3016edc0d6c0a64c8889bf2524e78",
+"TT_stellar-test_stellar.py::test_get_address[parameters9-result9]": "0f3f4c9aa52ebdd644c76467f4bf26894e532662ed6ee851cb04981990b287b3",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarAccountMergeOp]": "48b226cc84db72dc6fa364974b6412905c65ed0b45bf87a4d9a1b2d450b99fb5",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarAllowTrustOp-allow]": "5599508f6d55310a3d6607f18d7d35611b77aecec46e6ac50a2a7e23d3be2a0c",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarAllowTrustOp-revoke]": "9d4fbf5c8548cbf8445c61df366503ed96dcd959f33b964a69de982acf6f8277",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarBumpSequenceOp]": "e0184b9b2b05e95a47d9ba178f655ca32a10f8ad2dd356809136ad66f8d11f01",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarChangeTrustOp-add]": "8145cdab088ae1b19b2116d44561dbd7b9615dc5608e050b21816fa2def3a273",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarChangeTrustOp-delete]": "5f514995a3fa6def09e42eea9d6f5d49751a3b2395493e19da7b8afb4d39a22b",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarCreateAccountOp]": "c0267feb91ff75e1368d3e2e7aadac3d582170a0d7c2db371f387fc03b17b3f2",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarCreatePassiveSellOfferOp]": "f99eb5bffeacbac04c4b106019d76de11d266c596fc062a3904b023094422857",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarManageBuyOfferOp]": "fbd162ea4d4a488f17d6234d6333944b992911a021ec7c2f313aeac0f9a72af3",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarManageDataOp]": "643e686723ae01ca2705d1969a98ab3d15781fdbe0fa1a89a1e16c8403a4b644",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarManageSellOfferOp]": "49423485bab6be953dc2c8f0ac7d39cc2bb459ddf434a7a2006bec7fd52a5a0e",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarPathPaymentStrictReceiveOp]": "5799b980838f82a51a876eb1aedc41b05c89cac1101982f68002a979fa3e2e16",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarPathPaymentStrictSendOp]": "210a69f4854c2d1d4fddb8d9a5c1c743759c54ed465c08ef9f8f0710fdce48ce",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarPaymentOp-asset12]": "0212ded260c366396d009e3c4bd8b0620223d0ba53b943b139f6b299ddbab490",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarPaymentOp-asset4]": "6959c6435544727e89f0780830c61e7bc230cc3f5f2273cc32f2e367101b531d",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarPaymentOp-native_asset]": "c159a29ebc4dc2dc65819a689a68f3e765e8d946a69f175b85fef2b2bb2a38b9",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarSetOptionsOp-all]": "53506e58656c101fcc9bc15fc926bfc5cd1193d1d9120ca8afbb81b0c737223c",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarSetOptionsOp-one]": "8a8f1b9a8eb1e7ea05ee4e8d2f927aaf2c6f69954ce1fae9acbd53f7b07891af",
+"TT_stellar-test_stellar.py::test_sign_tx[StellarSetOptionsOp-some]": "54222474804d701bad5644c552a413e72d9c98175daf7e4930bd4913c3d53e7d",
+"TT_stellar-test_stellar.py::test_sign_tx[memo_hash]": "4fe3cc52e8eb3a13f64e4951c0d27720f994cbbd24466b04d0e048148038fbd4",
+"TT_stellar-test_stellar.py::test_sign_tx[memo_id]": "825dc53a26244a62a947c05258984f3050613b9c7c1c1dbe54082e5bf8957db7",
+"TT_stellar-test_stellar.py::test_sign_tx[memo_return]": "8c2b3e22ebf652d341f4247a9e937889f8f0d1c7356748a7a0b9c3bc2400806d",
+"TT_stellar-test_stellar.py::test_sign_tx[memo_text]": "7ee789d23acf0e06d0362973e07a4b8123afd430698d61cf7db027bb420019e1",
+"TT_stellar-test_stellar.py::test_sign_tx[multiple_operations]": "ac0ec48cad1aa9dbd0cfe627da2f791fe88b4a27bce17749e4dfebcae5409c7e",
+"TT_stellar-test_stellar.py::test_sign_tx[source_account]": "6dd83e0f123a5f2956210cb243dbae3b12bda9aaed41941f4bdb48f15bc20bcc",
+"TT_stellar-test_stellar.py::test_sign_tx[timebounds-0-0]": "5b511ca63cda9f1de2527c5f329806a3a275205900d652c59a5c39643f803780",
+"TT_stellar-test_stellar.py::test_sign_tx[timebounds-0-1575234180]": "42430206b96512ca33421a4cc20f394d9994168f3d199ff6f38801464cb9eb33",
+"TT_stellar-test_stellar.py::test_sign_tx[timebounds-461535181-0]": "caf79cdcddaacddce9fbe6bc5c761a6fdef8e9c9d02b9de33f078c7353081f54",
+"TT_stellar-test_stellar.py::test_sign_tx[timebounds-461535181-1575234180]": "c159a29ebc4dc2dc65819a689a68f3e765e8d946a69f175b85fef2b2bb2a38b9",
+"TT_test_autolock.py::test_apply_auto_lock_delay": "086929faced260bc4ea42436974419beac48d03552d137e61206a6fabe2fb948",
+"TT_test_autolock.py::test_apply_auto_lock_delay_out_of_range[0]": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
+"TT_test_autolock.py::test_apply_auto_lock_delay_out_of_range[1]": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
+"TT_test_autolock.py::test_apply_auto_lock_delay_out_of_range[4194304]": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
+"TT_test_autolock.py::test_apply_auto_lock_delay_out_of_range[536871]": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
+"TT_test_autolock.py::test_apply_auto_lock_delay_out_of_range[9]": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
+"TT_test_autolock.py::test_apply_auto_lock_delay_valid[10]": "441ee891dfcaadfe63ec5a36a12becd4456c5bc23a6afbf5d662241b96e8653d",
+"TT_test_autolock.py::test_apply_auto_lock_delay_valid[123]": "86cb1c98c4eee14d9028fef1ef8f1979a991b0c89c5fe2d798b17bd36fbbaf9c",
+"TT_test_autolock.py::test_apply_auto_lock_delay_valid[3601]": "96684140872b227f04ef3d6dbcdaf9cecd4022b1d2c8fe2150b8bb6fcc9b7be8",
+"TT_test_autolock.py::test_apply_auto_lock_delay_valid[536870]": "176d063055b703d95c07191cfd885ff695abdf99341853fe825961f5e7976121",
+"TT_test_autolock.py::test_apply_auto_lock_delay_valid[60]": "971656fc0112c3d34f18a8b094b07900a2b91d35ab816dc9697b8d3ee08bf4f5",
+"TT_test_autolock.py::test_apply_auto_lock_delay_valid[7227]": "17d08b88a90e9980214da7351856114e9bf77bdb92f7f545cfa9e8b6991cff5e",
+"TT_test_autolock.py::test_autolock_cancels_ui": "7840363a8184cde21d3ce943a42835298a2737a4b57d14b62a68100f4713c69d",
+"TT_test_autolock.py::test_autolock_default_value": "c12c4fa76069c70ee9bdbda306c2effc86d7e5d35acb95e06244185bf1ed98e6",
+"TT_test_basic.py::test_device_id_different": "08515af24e5da8f81eedb0d878242f3c25751ff008822fdd61df4bd966104213",
+"TT_test_basic.py::test_device_id_same": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_basic.py::test_features": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_basic.py::test_ping": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_busy_state.py::test_busy_expiry": "976a57f1e7d016f9c753e7a8fea08d1aaa35feb204d9b87d8acf248fa258eed0",
+"TT_test_busy_state.py::test_busy_state": "6d53eeede10cf1864d9c34f52eee70e91f5afc1e91a24794385b0cc4e91130c6",
+"TT_test_cancel.py::test_cancel_message_via_cancel[message0]": "618a74e8d019d9bba5edf93bdb09f55a1f7493148d99c8f3b2c6186f17fa8c8b",
+"TT_test_cancel.py::test_cancel_message_via_cancel[message1]": "618a74e8d019d9bba5edf93bdb09f55a1f7493148d99c8f3b2c6186f17fa8c8b",
+"TT_test_cancel.py::test_cancel_message_via_initialize[message0]": "618a74e8d019d9bba5edf93bdb09f55a1f7493148d99c8f3b2c6186f17fa8c8b",
+"TT_test_cancel.py::test_cancel_message_via_initialize[message1]": "618a74e8d019d9bba5edf93bdb09f55a1f7493148d99c8f3b2c6186f17fa8c8b",
+"TT_test_cancel.py::test_cancel_on_paginated": "ce27f6ff624c617c1e7d4674cbe4634ed1a609d577a215db19fa6c81997ab831",
+"TT_test_debuglink.py::test_softlock_instability": "560fd7bf87ae8797a59318bc6d74414ef702ac46221af062090f2384bd6a1414",
+"TT_test_firmware_hash.py::test_firmware_hash_emu": "9ccf20a5175bc51c8771bd51ad40876acb317869bc4703c0b24c64b663670998",
+"TT_test_firmware_hash.py::test_firmware_hash_hw": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_msg_applysettings.py::test_apply_homescreen_jpeg": "bf50e675a77b4f16108af55338c6abdf0af2cf3dcdfb7837300c8b318787053b",
+"TT_test_msg_applysettings.py::test_apply_homescreen_jpeg_progressive": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
+"TT_test_msg_applysettings.py::test_apply_homescreen_jpeg_wrong_size": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
+"TT_test_msg_applysettings.py::test_apply_homescreen_toif": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
+"TT_test_msg_applysettings.py::test_apply_settings": "cfbbfa072bc825d1a97a199d4703cc1e4d5d9e3ba36e47645bbd23cdebfa7ec9",
+"TT_test_msg_applysettings.py::test_apply_settings_passphrase": "9f1cdd0afa835c0284011ef4e7d9149132dd64f4e37a9655de82f5efcad7db3a",
+"TT_test_msg_applysettings.py::test_apply_settings_passphrase_on_device": "44025f9b6ca5c41f63d2b5ced29ce332433952d4722b463159f1c7ba52b520cf",
+"TT_test_msg_applysettings.py::test_apply_settings_rotation": "0c1a22f5bfcb54781a3b44e3fb8fbb6894f8d3bf558bb51561130602f9f27dcd",
+"TT_test_msg_applysettings.py::test_experimental_features": "5d92f2aab22113384cb601d221b434b9cf74fc5dfdde59858214db7236909ba1",
+"TT_test_msg_applysettings.py::test_label_too_long": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_msg_applysettings.py::test_safety_checks": "3cda68830a0b8742253da415cf699ad58af4160ca2cd8004396235599e49a498",
+"TT_test_msg_backup_device.py::test_backup_bip39": "c342bfb7d31ce2a014a4f46cbfffe7848be0b0f1da30e308fe1a6de885228b22",
+"TT_test_msg_backup_device.py::test_backup_slip39_advanced[click_info]": "25f732a07781a6ced43fc04807005c49b5a02959bdfb09ae3e94cf79d3e6c0fa",
+"TT_test_msg_backup_device.py::test_backup_slip39_advanced[no_click_info]": "73e317af0e0ad8c93673ecd081f5fd4003d4cf10f605020b6da2f778d05131dd",
+"TT_test_msg_backup_device.py::test_backup_slip39_basic[click_info]": "cb4ebf09f468df39fd6257332902fbe77403e590c340c4b6ab469b120f4fbecb",
+"TT_test_msg_backup_device.py::test_backup_slip39_basic[no_click_info]": "1f3b6d302e3fdfe5aeab86bca648d18c2168e2be0669004f87c5ff1ba63f6664",
+"TT_test_msg_backup_device.py::test_interrupt_backup_fails": "b1b812e4ea3974cf4b268a5b72b0d47c32427ccdd3c7615fdc4a6339c0180cda",
+"TT_test_msg_backup_device.py::test_no_backup_fails": "06415ff75b08ef95be26f8d6ac3c29dd37797e48d3d5d604ae0b51d984f93ab8",
+"TT_test_msg_backup_device.py::test_no_backup_show_entropy_fails": "1cbcf9bba947956dbccfb2fa59b4e734a6696f6608c6b772829bfa320789be02",
+"TT_test_msg_change_wipe_code_t2.py::test_set_pin_to_wipe_code": "d3b33e8a9105c20e02234bf90974f82dacbf2fc5f0d4a0ec030a5fefef031608",
+"TT_test_msg_change_wipe_code_t2.py::test_set_remove_wipe_code": "d37cb7b836584ef560373125ad3ee358be447b7541083ec366ca6362eb078fee",
+"TT_test_msg_change_wipe_code_t2.py::test_set_wipe_code_mismatch": "cc4cd5b71ad87d8081a7f558a12cd4afef257ece8bf9ca20a1a21173a5e2f4dc",
+"TT_test_msg_change_wipe_code_t2.py::test_set_wipe_code_to_pin": "484f56f2cc8dbf60d547e404b5557de804b34adef420d13fefa690b1f79a1ff3",
+"TT_test_msg_changepin_t2.py::test_change_failed": "9b7dcdc1def72bf5b74d3a9febccefcedb6d3726a34a6c999d8a33c04fd427da",
+"TT_test_msg_changepin_t2.py::test_change_invalid_current": "f38193f4a87042fdd54310815e5cedfc1eb4b5a01e770cf333b9099ec8d8d2cd",
+"TT_test_msg_changepin_t2.py::test_change_pin": "e3fe3d7f20e99f5d76de99aefcb4fee3c0ffaa0e5e98b3f04cef5f0525395804",
+"TT_test_msg_changepin_t2.py::test_remove_pin": "d556410729bd7f09049a733e5f945e299c9deec14755b9b1aaeffba7a68cde4e",
+"TT_test_msg_changepin_t2.py::test_set_failed": "c827ffbf43cc2ca7da3b92892f985f02a51306c2645266c190b0d9b8169c3b95",
+"TT_test_msg_changepin_t2.py::test_set_pin": "2a576edbaaba4e08c79875a86d980a628b5d1e8e059c6854e74b992689ec82b4",
+"TT_test_msg_loaddevice.py::test_load_device_1": "fe0b267db1d64a397bd2aaaa0db68fa9636d8b4126e9910ef1d00aa5457a38be",
+"TT_test_msg_loaddevice.py::test_load_device_2": "1bf5361f899f585f58abcc1d7459bacfe439c63fb8eb9163589e1877754aac12",
+"TT_test_msg_loaddevice.py::test_load_device_slip39_advanced": "fe0b267db1d64a397bd2aaaa0db68fa9636d8b4126e9910ef1d00aa5457a38be",
+"TT_test_msg_loaddevice.py::test_load_device_slip39_basic": "fe0b267db1d64a397bd2aaaa0db68fa9636d8b4126e9910ef1d00aa5457a38be",
+"TT_test_msg_loaddevice.py::test_load_device_utf": "b13bc19627046f7f853beeed8680f22ef3bf30e8cd5de291baae415889a5a8ef",
+"TT_test_msg_ping.py::test_ping": "7d4ec74913a7875c856e76b977fc51bbceb83ff3e1fe6f181f5f775245895e2c",
+"TT_test_msg_sd_protect.py::test_enable_disable": "281291394deac125a39600cbe887143d6acae06c34204ea2a204e04f7ac4ff9d",
+"TT_test_msg_sd_protect.py::test_refresh": "c4d3fd6a6fa2cd604797213ad78ad7db920baf978ac74c5e6a63efe92eab5c1f",
+"TT_test_msg_sd_protect.py::test_wipe": "75a8d711080e86476ccfa571cd3f34a920f066fd3f68bd6908b9933fa40bf3f2",
+"TT_test_msg_wipedevice.py::test_autolock_not_retained": "b37910800ac26040928f663a85d936425bdb50632b1b0bf7cb8a1d85c6d3776f",
+"TT_test_msg_wipedevice.py::test_wipe_device": "08515af24e5da8f81eedb0d878242f3c25751ff008822fdd61df4bd966104213",
+"TT_test_passphrase_slip39_advanced.py::test_128bit_passphrase": "f023150016d0ab8c5db296ad35f2a626d4d74cc02fffd77f1e9fb1bca5fb8e9f",
+"TT_test_passphrase_slip39_advanced.py::test_256bit_passphrase": "f023150016d0ab8c5db296ad35f2a626d4d74cc02fffd77f1e9fb1bca5fb8e9f",
+"TT_test_passphrase_slip39_basic.py::test_2of5_passphrase": "07f265234a3269c8c99172e2f67abf626e17a542e6f4c00b45c5b685d0e4c240",
+"TT_test_passphrase_slip39_basic.py::test_3of6_passphrase": "07f265234a3269c8c99172e2f67abf626e17a542e6f4c00b45c5b685d0e4c240",
+"TT_test_pin.py::test_correct_pin": "9cf5090190cd84a1825a34531351cfa0fd8c95036d6302c5b3816b8e89607161",
+"TT_test_pin.py::test_exponential_backoff_t2": "aa9ebe473c70fa154bef1640d7d437cd1839595fa9a07864f24f17c34769030f",
+"TT_test_pin.py::test_incorrect_pin_t2": "4bfc39a6ef7cc3c3dcfe2085bf1e16ef1ea82706e942062b7b4afa7694b12c18",
+"TT_test_pin.py::test_no_protection": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_protection_levels.py::test_apply_settings": "e20d4ce99cc22dd4bce638e1110cecd54b28a861756aa342de14b9febfaef6cf",
+"TT_test_protection_levels.py::test_change_pin_t2": "04d2949bc17ca79aecd1311432f5a19ef3ed11c7c748b4a05e72fa2e39ca03be",
+"TT_test_protection_levels.py::test_get_address": "e5d600209fccef3827ec1154d5a892f4c0f9b5ec79e4f87f910e4d7a7bda282d",
+"TT_test_protection_levels.py::test_get_entropy": "b8f51f201f310442d8a004571218176acb9a4c634965148bc6bbd1b95a59dd7b",
+"TT_test_protection_levels.py::test_get_public_key": "e5d600209fccef3827ec1154d5a892f4c0f9b5ec79e4f87f910e4d7a7bda282d",
+"TT_test_protection_levels.py::test_initialize": "1af1f0ee04880b416347dbab985d65153ba95e9420e4e919ea906845e8588a65",
+"TT_test_protection_levels.py::test_passphrase_cached": "870f19b9ce9cec4fccc7aeb9e67283d45bbd98af44f63dcfa258fa34240be966",
+"TT_test_protection_levels.py::test_passphrase_reporting[False]": "f80ea9e052308bbf8609a78c9341d8059f6f632d8bf4910ca1330e2bd43ca93d",
+"TT_test_protection_levels.py::test_passphrase_reporting[True]": "c9fe68c47af793d11599b55da9b870798ac2736b51b2283711e8f9fb86968ed9",
+"TT_test_protection_levels.py::test_ping": "7d4ec74913a7875c856e76b977fc51bbceb83ff3e1fe6f181f5f775245895e2c",
+"TT_test_protection_levels.py::test_sign_message": "c812ef4153efb97eabdb17e14498bf54b4680cc359bcca187be505718b7550ab",
+"TT_test_protection_levels.py::test_signtx": "9f44183ad1361b33bcceaa4e7c4f45751c2481d493732990965ea24ae5c67f7b",
+"TT_test_protection_levels.py::test_unlocked": "e8beab096194df170434fcb4ff29f9d0a7b46a7c879133ceff7a59861d8cb954",
+"TT_test_protection_levels.py::test_verify_message_t2": "72f19e3a72b00a6618e374fe54ef2f016d4888d300e2ce11116bff2d01386ddb",
+"TT_test_protection_levels.py::test_wipe_device": "bc71ba00fd10530c5bee3ae4f4303d938aa80fc94ad2bf6b3d234779361f61d9",
+"TT_test_sdcard.py::test_sd_format": "036c3f93a4a28d34bf91a8d24abc52ff26d9b14c8167f4dfc7b569fb39375c69",
+"TT_test_sdcard.py::test_sd_no_format": "0710d8c40680fc8e96e368ae9978d1f7e0bd8b2f858547b8265c45930f43c959",
+"TT_test_sdcard.py::test_sd_protect_unlock": "f4552a1756f3d788bf0226b5c4607683811fff99e20cdb7c7cc5f454d1412827",
+"TT_test_session.py::test_cannot_resume_ended_session": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_session.py::test_clear_session": "f00466a5d9a6ffb68bdccbdd3c769a3c530ee483701062d919922c034aadebee",
+"TT_test_session.py::test_derive_cardano_empty_session": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_session.py::test_derive_cardano_running_session": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_session.py::test_end_session": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_session.py::test_end_session_only_current": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_session.py::test_session_recycling": "07f265234a3269c8c99172e2f67abf626e17a542e6f4c00b45c5b685d0e4c240",
+"TT_test_session_id_and_passphrase.py::test_cardano_passphrase": "26e3b8bc6b1ba85fc89d5b237096685309a95f73350d2fca646720fb750d0e8f",
+"TT_test_session_id_and_passphrase.py::test_hide_passphrase_from_host": "ccdb34cba3b759d91500b3c2b2ee5d427167d21b6aefa709b659aed298760605",
+"TT_test_session_id_and_passphrase.py::test_max_sessions_with_passphrases": "5c85cb246fe4bb07076ed88f426e6133368f3417472cf2dfbef2daac32a088aa",
+"TT_test_session_id_and_passphrase.py::test_multiple_passphrases": "12231bae2ea96b600c96ade946e5dda29d6625d128906cf14728869c1e697987",
+"TT_test_session_id_and_passphrase.py::test_multiple_sessions": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_test_session_id_and_passphrase.py::test_passphrase_ack_mismatch": "a4ecdfc2bed7623cc1dda09dcefb077c09a8d8e9aec596f94bc14351fe94b50b",
+"TT_test_session_id_and_passphrase.py::test_passphrase_always_on_device": "eb6866deaf1cc5f217e821f4a557b8640375f2c781ee658a70efbaf45d727079",
+"TT_test_session_id_and_passphrase.py::test_passphrase_length": "6e3f406930d3abab6bc28a1c3100fd7589ce61b607b8a1b03e076425e4e494e1",
+"TT_test_session_id_and_passphrase.py::test_passphrase_missing": "870f19b9ce9cec4fccc7aeb9e67283d45bbd98af44f63dcfa258fa34240be966",
+"TT_test_session_id_and_passphrase.py::test_passphrase_on_device": "d6ddadcb8797ce1c41aa35c22eeee0053646a479344756147ab5ca1e6af87c51",
+"TT_test_session_id_and_passphrase.py::test_session_enable_passphrase": "73f03becf4626659e28aa5178e9fb3911bf4a05c7773e7941edf7a40defffe29",
+"TT_test_session_id_and_passphrase.py::test_session_with_passphrase": "6c19243e08a4619f6229838f9cd1cb73b37aa9d383e4b8fb11d16077dc6a79c3",
+"TT_tezos-test_getaddress.py::test_tezos_get_address": "3142992091324d59ab89583d3c3cdb63c115633c8404f464b84eb86148c0a1e8",
+"TT_tezos-test_getpublickey.py::test_tezos_get_public_key": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae",
+"TT_tezos-test_sign_tx.py::test_tezos_kt_remove_delegation": "9f9b82e59e3898e0e4acda21492bd686927d239977071fa1dd8753c8cc6866ad",
+"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_delegation": "46e59e9de90d0182c6b4ca796afb2f06f97899f758d55ee55e901ed0ac8565a4",
+"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_multiple_proposals": "46cda97a0333ec4d30f5ae0b88ee7ec54130e91f1f9ee2c54cb104154b517552",
+"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_origination": "7a73d93083123748773c3a3ba623e5ba7a25424a44b2b47a2541c595e991e75b",
+"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_proposal": "11abc524c17137d4f905ba36525162e355183bc5b8e59d57bd577165535183e8",
+"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_reveal": "13789ebf1b54305e366200e33bd0cd93ed5733d624be00fa80d8e01002e93d3d",
+"TT_tezos-test_sign_tx.py::test_tezos_sign_tx_tranasaction": "33aa6551e484338866ebad6dc6bed340f1fc5b13d89d647e7c29ce68b5ef681a",
+"TT_tezos-test_sign_tx.py::test_tezos_sing_tx_ballot_nay": "e526937f008fec4ad79b7fdfc328f30498728611e395a1ebfa9e5cbad7168322",
+"TT_tezos-test_sign_tx.py::test_tezos_sing_tx_ballot_pass": "ef196800f29b85ff23559774b9aaf8d54f34de82072086a4268f4005033be319",
+"TT_tezos-test_sign_tx.py::test_tezos_sing_tx_ballot_yay": "559b81878d868c95ac40490427f34a3581ec3cc0db91939b47a7e009378653aa",
+"TT_tezos-test_sign_tx.py::test_tezos_smart_contract_delegation": "40495fa3cdc28344964ed1326e4affd89691e64862a4b48009b302c7ab2562a4",
+"TT_tezos-test_sign_tx.py::test_tezos_smart_contract_transfer": "70526a90135e320368b1ef147dc6eae84409143226b4e6276b3840d7cabcb84b",
+"TT_tezos-test_sign_tx.py::test_tezos_smart_contract_transfer_to_contract": "cf949dfe6fe0846c1d9c57e182a4dbfb2d95ff92b23fce02b2cc103b9d530740",
+"TT_webauthn-test_msg_webauthn.py::test_add_remove": "dff3ec462bcbf49ffe089abedce3272e44a72383c83fe67487b3455e3b196e9b",
+"TT_webauthn-test_u2f_counter.py::test_u2f_counter": "08155ee8f075f0983258a1739ec5f548a4e5f16e5415bca5f4e92f316a23c01b",
+"TT_zcash-test_sign_tx.py::test_external_presigned": "7b201d92d16993d244288ab05cef393c059a3a7726a6d66fa4c00a90b4f22859",
+"TT_zcash-test_sign_tx.py::test_one_two": "1a91876fa2d2e501cf971f58f126cf0a3f519ba31996aed5252dda49d00054e3",
+"TT_zcash-test_sign_tx.py::test_refuse_replacement_tx": "3fc8eceefb45620d5802324b364162aee8103cbf1a25581e180b7c86c3df9939",
+"TT_zcash-test_sign_tx.py::test_send_to_multisig": "76d465685deddde0eb8b9227198821fa15505ddf9c28c9b4ede8e684de4c38f8",
+"TT_zcash-test_sign_tx.py::test_spend_multisig": "fdd6eb3bb07fe3070c2c3dd15c0738512f42edf35a94e606a30f420dbe7a3ebe",
+"TT_zcash-test_sign_tx.py::test_spend_v4_input": "56452588ee3e99b5ce65617b747fb3bba152dfeb61953d360b1b9e622e918236",
+"TT_zcash-test_sign_tx.py::test_spend_v5_input": "c9282a79ff6d28ef737e63c3aef862627bc1f2f96a693430358e5f072ce84c5e",
+"TT_zcash-test_sign_tx.py::test_unified_address": "5ccbd857b247dc7e10693617680038f78240c559a7fa67c076e660ca3bdc42d3",
+"TT_zcash-test_sign_tx.py::test_version_group_id_missing": "bd83a31d0fc4c23953dfd0d138e4441984e34698ace96aad5308a4ae51b712ae"
+}
+}
 }
diff --git a/tests/ui_tests/reporting/__main__.py b/tests/ui_tests/reporting/__main__.py
new file mode 100644
index 0000000000..f9aac4bfde
--- /dev/null
+++ b/tests/ui_tests/reporting/__main__.py
@@ -0,0 +1,17 @@
+import click
+
+from . import master_diff
+
+
+@click.group()
+def cli():
+    pass
+
+
+@cli.command(name="master-diff")
+def do_master_diff():
+    master_diff.main()
+
+
+if __name__ == "__main__":
+    cli()
diff --git a/tests/ui_tests/reporting/download.py b/tests/ui_tests/reporting/download.py
index 73484d135e..72806d6067 100644
--- a/tests/ui_tests/reporting/download.py
+++ b/tests/ui_tests/reporting/download.py
@@ -1,9 +1,10 @@
-import json
+from __future__ import annotations
+
 import urllib.error
 import urllib.request
 import zipfile
 from pathlib import Path
-from typing import Dict
+from typing import Any
 
 import requests
 
@@ -27,12 +28,7 @@ def fetch_recorded(hash: str, path: Path) -> None:
     zip_dest.unlink()
 
 
-def fetch_fixtures_master() -> Dict[str, str]:
+def fetch_fixtures_master() -> dict[str, Any]:
     r = requests.get(FIXTURES_MASTER)
     r.raise_for_status()
     return r.json()
-
-
-def fetch_fixtures_current() -> Dict[str, str]:
-    with open(FIXTURES_CURRENT) as f:
-        return json.loads(f.read())
diff --git a/tests/ui_tests/reporting/html.py b/tests/ui_tests/reporting/html.py
index 7f21d9e3d2..20f8b2e46d 100644
--- a/tests/ui_tests/reporting/html.py
+++ b/tests/ui_tests/reporting/html.py
@@ -1,15 +1,29 @@
-import base64
-import filecmp
-from itertools import zip_longest
+from __future__ import annotations
+
+import shutil
 from pathlib import Path
-from typing import Dict, List, Optional
+from typing import Iterable
 
 from dominate import document
 from dominate.tags import a, i, img, table, td, th, tr
 
+from ..common import UI_TESTS_DIR
+
+_IMAGE_DIR = UI_TESTS_DIR / "images"
+
+
+def set_image_dir(path: Path) -> None:
+    global _IMAGE_DIR
+    _IMAGE_DIR = path
+
+
+def store_images(screens: Iterable[Path], hashes: Iterable[str]) -> None:
+    for screen, hash in zip(screens, hashes):
+        shutil.copy(screen, _IMAGE_DIR / f"{hash}.png")
+
 
 def report_links(
-    tests: List[Path], reports_path: Path, actual_hashes: Dict[str, str] = None
+    tests: list[Path], reports_path: Path, actual_hashes: dict[str, str] | None = None
 ) -> None:
     if actual_hashes is None:
         actual_hashes = {}
@@ -31,42 +45,47 @@ def write(fixture_test_path: Path, doc: document, filename: str) -> Path:
     return fixture_test_path / filename
 
 
-def image_column(src: Path, image_width: Optional[int] = None) -> None:
+def image_column(hash: str | None, cur_dir: Path) -> None:
     """Put image into table as one cell."""
     with td():
-        if src:
-            image_raw(src, image_width)
+        if hash:
+            image_link(hash, cur_dir)
         else:
             i("missing")
 
 
-def image_raw(src: Path, image_width: Optional[int] = None) -> None:
-    """Display image on the screen"""
-    # open image file
-    image = src.read_bytes()
-    # encode image as base64
-    image = base64.b64encode(image)
-    # convert output to str
-    image = image.decode()
-    # img(src=src.relative_to(fixture_test_path))
+def _relative_path(cur_dir: Path, path_to: Path) -> str:
+    """Find best relative path to refer to path_to from cur_dir."""
+    cur_dir = cur_dir.resolve()
+    path_to = path_to.resolve()
+    if not cur_dir.is_dir():
+        cur_dir = cur_dir.parent
+
+    common = cur_dir
+    while common not in path_to.parents:
+        common = common.parent
+    ascent = len(cur_dir.parts) - len(common.parts)
+    relpath = path_to.relative_to(common)
+    components = [".."] * ascent + list(relpath.parts)
+    return "/".join(components)
+
+
+def image_link(hash: str, cur_dir: Path, title: str = "") -> None:
+    """Put image into table as one cell."""
+    path = _IMAGE_DIR / f"{hash}.png"
     img(
-        src="data:image/png;base64, " + image,
-        style=f"width: {image_width}px; image-rendering: pixelated;"
-        if image_width
-        else "",
+        src=_relative_path(cur_dir, path),
+        title=title,
+        loading="lazy",
     )
 
 
-def diff_table(
-    left_screens: List[Path],
-    right_screens: List[Path],
-    image_width: Optional[int] = None,
-) -> None:
-    for left, right in zip_longest(left_screens, right_screens):
-        if left and right and filecmp.cmp(right, left):
+def diff_table(diff: Iterable[tuple[str | None, str | None]], cur_dir: Path) -> None:
+    for left, right in diff:
+        if left == right:
             background = "white"
         else:
             background = "red"
         with tr(bgcolor=background):
-            image_column(left, image_width)
-            image_column(right, image_width)
+            image_column(left, cur_dir)
+            image_column(right, cur_dir)
diff --git a/tests/ui_tests/reporting/master_diff.py b/tests/ui_tests/reporting/master_diff.py
new file mode 100644
index 0000000000..55352be514
--- /dev/null
+++ b/tests/ui_tests/reporting/master_diff.py
@@ -0,0 +1,279 @@
+from __future__ import annotations
+
+import shutil
+import tempfile
+from contextlib import contextmanager
+from pathlib import Path
+from typing import Any
+
+from dominate.tags import br, h1, h2, hr, i, p, table, td, th, tr
+
+from ..common import (
+    SCREENS_DIR,
+    FixturesType,
+    get_fixtures,
+    screens_and_hashes,
+    screens_diff,
+)
+from . import download, html
+from .testreport import REPORTS_PATH, document
+
+MASTERDIFF_PATH = REPORTS_PATH / "master_diff"
+IMAGES_PATH = MASTERDIFF_PATH / "images"
+
+
+def _preprocess_master_compat(master_fixtures: dict[str, Any]) -> FixturesType:
+    if all(isinstance(v, str) for v in master_fixtures.values()):
+        # old format, convert to new format
+        new_fixtures = {}
+        for key, val in master_fixtures.items():
+            model, _test = key.split("_", maxsplit=1)
+            groups_by_model = new_fixtures.setdefault(model, {})
+            default_group = groups_by_model.setdefault("device_tests", {})
+            default_group[key] = val
+        return FixturesType(new_fixtures)
+    else:
+        return FixturesType(master_fixtures)
+
+
+def get_diff() -> tuple[dict[str, str], dict[str, str], dict[str, tuple[str, str]]]:
+    master = _preprocess_master_compat(download.fetch_fixtures_master())
+    current = get_fixtures()
+
+    removed = {}
+    added = {}
+    diff = {}
+
+    for model in master.keys() | current.keys():
+        master_groups = master.get(model, {})
+        current_groups = current.get(model, {})
+        for group in master_groups.keys() | current_groups.keys():
+            master_tests = master_groups.get(group, {})
+            current_tests = current_groups.get(group, {})
+
+            def testname(test: str) -> str:
+                assert test.startswith(model + "_")
+                test = test[len(model) + 1 :]
+                return f"{model}-{group}-{test}"
+
+            # removed items
+            removed_here = {
+                testname(test): master_tests[test]
+                for test in (master_tests.keys() - current_tests.keys())
+            }
+            # added items
+            added_here = {
+                testname(test): current_tests[test]
+                for test in (current_tests.keys() - master_tests.keys())
+            }
+            # create the diff from items in both branches
+            diff_here = {}
+            for master_test, master_hash in master_tests.items():
+                full_test_name = testname(master_test)
+                if full_test_name in removed_here:
+                    continue
+                if current_tests.get(master_test) == master_hash:
+                    continue
+                diff_here[full_test_name] = (
+                    master_tests[master_test],
+                    current_tests[master_test],
+                )
+
+            removed.update(removed_here)
+            added.update(added_here)
+            diff.update(diff_here)
+            print(f"{model} {group}")
+            print(f"  removed: {len(removed_here)}")
+            print(f"  added: {len(added_here)}")
+            print(f"  diff: {len(diff_here)}")
+
+    return removed, added, diff
+
+
+def removed(screens_path: Path, test_name: str) -> Path:
+    doc = document(title=test_name, model=test_name[:2])
+    screens, hashes = screens_and_hashes(screens_path)
+    html.store_images(screens, hashes)
+
+    with doc:
+        h1(test_name)
+        p(
+            "This UI test has been removed from fixtures.json.",
+            style="color: red; font-weight: bold;",
+        )
+        hr()
+
+        with table(border=1):
+            with tr():
+                th("Removed files")
+
+            for hash in hashes:
+                with tr():
+                    html.image_column(hash, MASTERDIFF_PATH / "removed")
+
+    return html.write(MASTERDIFF_PATH / "removed", doc, test_name + ".html")
+
+
+def added(screens_path: Path, test_name: str) -> Path:
+    doc = document(title=test_name, model=test_name[:2])
+    screens, hashes = screens_and_hashes(screens_path)
+    html.store_images(screens, hashes)
+
+    with doc:
+        h1(test_name)
+        p(
+            "This UI test has been added to fixtures.json.",
+            style="color: green; font-weight: bold;",
+        )
+        hr()
+
+        with table(border=1):
+            with tr():
+                th("Added files")
+
+            for hash in hashes:
+                with tr():
+                    html.image_column(hash, MASTERDIFF_PATH / "added")
+
+    return html.write(MASTERDIFF_PATH / "added", doc, test_name + ".html")
+
+
+def diff(
+    master_screens_path: Path,
+    current_screens_path: Path,
+    test_name: str,
+    master_hash: str,
+    current_hash: str,
+) -> Path:
+    doc = document(title=test_name, model=test_name[:2])
+    master_screens, master_hashes = screens_and_hashes(master_screens_path)
+    current_screens, current_hashes = screens_and_hashes(current_screens_path)
+    html.store_images(master_screens, master_hashes)
+    html.store_images(current_screens, current_hashes)
+
+    with doc:
+        h1(test_name)
+        p("This UI test differs from master.", style="color: grey; font-weight: bold;")
+        with table():
+            with tr():
+                td("Master:")
+                td(master_hash, style="color: red;")
+            with tr():
+                td("Current:")
+                td(current_hash, style="color: green;")
+        hr()
+
+        with table(border=1, width=600):
+            with tr():
+                th("Master")
+                th("Current branch")
+
+            html.diff_table(
+                screens_diff(master_hashes, current_hashes), MASTERDIFF_PATH / "diff"
+            )
+
+    return html.write(MASTERDIFF_PATH / "diff", doc, test_name + ".html")
+
+
+def index() -> Path:
+    removed = list((MASTERDIFF_PATH / "removed").iterdir())
+    added = list((MASTERDIFF_PATH / "added").iterdir())
+    diff = list((MASTERDIFF_PATH / "diff").iterdir())
+
+    title = "UI changes from master"
+    doc = document(title=title)
+
+    with doc:
+        h1("UI changes from master")
+        hr()
+
+        h2("Removed:", style="color: red;")
+        i("UI fixtures that have been removed:")
+        html.report_links(removed, MASTERDIFF_PATH)
+        br()
+        hr()
+
+        h2("Added:", style="color: green;")
+        i("UI fixtures that have been added:")
+        html.report_links(added, MASTERDIFF_PATH)
+        br()
+        hr()
+
+        h2("Differs:", style="color: grey;")
+        i("UI fixtures that have been modified:")
+        html.report_links(diff, MASTERDIFF_PATH)
+
+    return html.write(MASTERDIFF_PATH, doc, "index.html")
+
+
+def create_dirs() -> None:
+    # delete the reports dir to clear previous entries and create folders
+    shutil.rmtree(MASTERDIFF_PATH, ignore_errors=True)
+    MASTERDIFF_PATH.mkdir(parents=True)
+    (MASTERDIFF_PATH / "removed").mkdir()
+    (MASTERDIFF_PATH / "added").mkdir()
+    (MASTERDIFF_PATH / "diff").mkdir()
+    IMAGES_PATH.mkdir(exist_ok=True)
+
+
+def _get_screen_path(test_name: str) -> Path | None:
+    path = SCREENS_DIR / test_name / "actual"
+    if path.exists():
+        return path
+    path = SCREENS_DIR / test_name / "recorded"
+    if path.exists():
+        print(
+            f"WARNING: no actual screens for {test_name}, recording may be outdated: {path}"
+        )
+        return path
+    print(f"WARNING: missing screens for {test_name}. Did the test run?")
+    return None
+
+
+def create_reports() -> None:
+    removed_tests, added_tests, diff_tests = get_diff()
+
+    @contextmanager
+    def tmpdir():
+        with tempfile.TemporaryDirectory(prefix="trezor-records-") as temp_dir:
+            yield Path(temp_dir)
+
+    for test_name, test_hash in removed_tests.items():
+        with tmpdir() as temp_dir:
+            download.fetch_recorded(test_hash, temp_dir)
+            removed(temp_dir, test_name)
+
+    for test_name, test_hash in added_tests.items():
+        screen_path = _get_screen_path(test_name)
+        if not screen_path:
+            continue
+        added(screen_path, test_name)
+
+    for test_name, (master_hash, current_hash) in diff_tests.items():
+        with tmpdir() as master_root:
+            master_screens = master_root / "downloaded"
+            master_screens.mkdir()
+            try:
+                download.fetch_recorded(master_hash, master_screens)
+            except RuntimeError as e:
+                print("WARNING:", e)
+
+            current_screens = _get_screen_path(test_name)
+            if not current_screens:
+                current_screens = master_root / "empty_current_screens"
+                current_screens.mkdir()
+
+            diff(
+                master_screens,
+                current_screens,
+                test_name,
+                master_hash,
+                current_hash,
+            )
+
+
+def main() -> None:
+    create_dirs()
+    html.set_image_dir(IMAGES_PATH)
+    create_reports()
+    index()
diff --git a/tests/ui_tests/reporting/report_master_diff.py b/tests/ui_tests/reporting/report_master_diff.py
deleted file mode 100644
index 314a8d287c..0000000000
--- a/tests/ui_tests/reporting/report_master_diff.py
+++ /dev/null
@@ -1,206 +0,0 @@
-import shutil
-import sys
-import tempfile
-from contextlib import contextmanager
-from pathlib import Path
-from typing import Dict, Sequence, Tuple
-
-import dominate
-from dominate.tags import br, h1, h2, hr, i, p, table, td, th, tr
-
-# These are imported directly because this script is run directly, isort gets confused by that.
-import download  # isort:skip
-import html  # isort:skip
-
-REPORTS_PATH = Path(__file__).resolve().parent / "reports" / "master_diff"
-RECORDED_SCREENS_PATH = Path(__file__).resolve().parent.parent / "screens"
-
-
-def get_diff(
-    test_prefixes: Sequence[str],
-) -> Tuple[Dict[str, str], Dict[str, str], Dict[str, str]]:
-    master = download.fetch_fixtures_master()
-    current = download.fetch_fixtures_current()
-
-    def matches_prefix(name: str) -> bool:
-        return any(name.startswith(prefix) for prefix in test_prefixes)
-
-    master = {name: value for name, value in master.items() if matches_prefix(name)}
-    current = {name: value for name, value in current.items() if matches_prefix(name)}
-
-    # removed items
-    removed = {test: master[test] for test in (master.keys() - current.keys())}
-    # added items
-    added = {test: current[test] for test in (current.keys() - master.keys())}
-    # items in both branches
-    same = master.items() - removed.items() - added.items()
-    # create the diff
-    diff = dict()
-    for master_test, master_hash in same:
-        if current.get(master_test) == master_hash:
-            continue
-        diff[master_test] = master[master_test], current[master_test]
-
-    return removed, added, diff
-
-
-def removed(screens_path: Path, test_name: str) -> Path:
-    doc = dominate.document(title=test_name)
-    screens = sorted(screens_path.iterdir())
-
-    with doc:
-        h1(test_name)
-        p(
-            "This UI test has been removed from fixtures.json.",
-            style="color: red; font-weight: bold;",
-        )
-        hr()
-
-        with table(border=1):
-            with tr():
-                th("Removed files")
-
-            for screen in screens:
-                with tr():
-                    html.image_column(screen)
-
-    return html.write(REPORTS_PATH / "removed", doc, test_name + ".html")
-
-
-def added(screens_path: Path, test_name: str) -> Path:
-    doc = dominate.document(title=test_name)
-    screens = sorted(screens_path.iterdir())
-
-    with doc:
-        h1(test_name)
-        p(
-            "This UI test has been added to fixtures.json.",
-            style="color: green; font-weight: bold;",
-        )
-        hr()
-
-        with table(border=1):
-            with tr():
-                th("Added files")
-
-            for screen in screens:
-                with tr():
-                    html.image_column(screen)
-
-    return html.write(REPORTS_PATH / "added", doc, test_name + ".html")
-
-
-def diff(
-    master_screens_path: Path,
-    current_screens_path: Path,
-    test_name: str,
-    master_hash: str,
-    current_hash: str,
-) -> Path:
-    doc = dominate.document(title=test_name)
-    master_screens = sorted(master_screens_path.iterdir())
-    current_screens = sorted(current_screens_path.iterdir())
-
-    with doc:
-        h1(test_name)
-        p("This UI test differs from master.", style="color: grey; font-weight: bold;")
-        with table():
-            with tr():
-                td("Master:")
-                td(master_hash, style="color: red;")
-            with tr():
-                td("Current:")
-                td(current_hash, style="color: green;")
-        hr()
-
-        with table(border=1, width=600):
-            with tr():
-                th("Master")
-                th("Current branch")
-
-            html.diff_table(master_screens, current_screens)
-
-    return html.write(REPORTS_PATH / "diff", doc, test_name + ".html")
-
-
-def index() -> Path:
-    removed = list((REPORTS_PATH / "removed").iterdir())
-    added = list((REPORTS_PATH / "added").iterdir())
-    diff = list((REPORTS_PATH / "diff").iterdir())
-
-    title = "UI changes from master"
-    doc = dominate.document(title=title)
-
-    with doc:
-        h1("UI changes from master")
-        hr()
-
-        h2("Removed:", style="color: red;")
-        i("UI fixtures that have been removed:")
-        html.report_links(removed, REPORTS_PATH)
-        br()
-        hr()
-
-        h2("Added:", style="color: green;")
-        i("UI fixtures that have been added:")
-        html.report_links(added, REPORTS_PATH)
-        br()
-        hr()
-
-        h2("Differs:", style="color: grey;")
-        i("UI fixtures that have been modified:")
-        html.report_links(diff, REPORTS_PATH)
-
-    return html.write(REPORTS_PATH, doc, "index.html")
-
-
-def create_dirs() -> None:
-    # delete the reports dir to clear previous entries and create folders
-    shutil.rmtree(REPORTS_PATH, ignore_errors=True)
-    REPORTS_PATH.mkdir()
-    (REPORTS_PATH / "removed").mkdir()
-    (REPORTS_PATH / "added").mkdir()
-    (REPORTS_PATH / "diff").mkdir()
-
-
-def create_reports(test_prefixes: Sequence[str]) -> None:
-    removed_tests, added_tests, diff_tests = get_diff(test_prefixes)
-
-    @contextmanager
-    def tmpdir():
-        with tempfile.TemporaryDirectory(prefix="trezor-records-") as temp_dir:
-            yield Path(temp_dir)
-
-    for test_name, test_hash in removed_tests.items():
-        with tmpdir() as temp_dir:
-            download.fetch_recorded(test_hash, temp_dir)
-            removed(temp_dir, test_name)
-
-    for test_name, test_hash in added_tests.items():
-        path = RECORDED_SCREENS_PATH / test_name / "actual"
-        if not path.exists():
-            raise RuntimeError("Folder does not exist, has it been recorded?", path)
-        added(path, test_name)
-
-    for test_name, (master_hash, current_hash) in diff_tests.items():
-        with tmpdir() as master_screens:
-            download.fetch_recorded(master_hash, master_screens)
-
-            current_screens = RECORDED_SCREENS_PATH / test_name / "actual"
-            if not current_screens.exists():
-                raise RuntimeError(
-                    "Folder does not exist, has it been recorded?", current_screens
-                )
-            diff(
-                master_screens,
-                current_screens,
-                test_name,
-                master_hash,
-                current_hash,
-            )
-
-
-if __name__ == "__main__":
-    create_dirs()
-    create_reports(sys.argv[1:] or [""])
-    index()
diff --git a/tests/ui_tests/reporting/testreport.css b/tests/ui_tests/reporting/testreport.css
index f526d65abc..db9f284f53 100644
--- a/tests/ui_tests/reporting/testreport.css
+++ b/tests/ui_tests/reporting/testreport.css
@@ -14,7 +14,7 @@ tr.bad a, tr.bad a:visited {
     position: fixed;
     top: 50px;
     right: 5px;
-    width: 300px;
+    width: 500px;
     padding: 1em;
 }
 
@@ -39,6 +39,15 @@ tr.bad a, tr.bad a:visited {
     border-color: lightgreen;
 }
 
+#markbox #mark-update {
+    color: green;
+    border-color: darkgreen;
+}
+
+#markbox #mark-update:hover {
+    border-color: lightgreen;
+}
+
 #markbox #mark-bad {
     color: darkred;
     border-color: darkred;
@@ -51,3 +60,8 @@ tr.bad a, tr.bad a:visited {
 .script-hidden {
     display: none;
 }
+
+.model-T1 img, .model-TR img {
+    image-rendering: pixelated;
+    width: 256px;
+}
diff --git a/tests/ui_tests/reporting/testreport.js b/tests/ui_tests/reporting/testreport.js
index 8329146d6e..2b34433a4d 100644
--- a/tests/ui_tests/reporting/testreport.js
+++ b/tests/ui_tests/reporting/testreport.js
@@ -24,8 +24,26 @@ function itemKeyFromIndexEntry(entry) {
 }
 
 
-function markState(state) {
-    window.localStorage.setItem(itemKeyFromOneTest(), state)
+async function markState(state) {
+    if (state === 'update') {
+        let lastIndex = decodeURIComponent(window.location.href).split("/").reverse()[0].lastIndexOf(".")
+        let stem = decodeURIComponent(window.location.href).split("/").reverse()[0].slice(0, lastIndex)
+        await fetch('http://localhost:8000/fixtures.json', {
+            method: 'POST',
+            headers: {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                "test": stem,
+                "hash": document.body.dataset.actualHash
+            })
+         })
+        window.localStorage.setItem(itemKeyFromOneTest(), 'ok')
+    } else {
+        window.localStorage.setItem(itemKeyFromOneTest(), state)
+    }
+
     if (window.nextHref) {
         window.location.assign(window.nextHref)
     } else {
@@ -36,9 +54,9 @@ function markState(state) {
 
 function resetState(whichState) {
     function shouldReset(value) {
-        if (value == whichState) return true
-        if (whichState != "all") return false
-        return (value == "bad" || value == "ok")
+        if (value === whichState) return true
+        if (whichState !== "all") return false
+        return (value === "bad" || value === "ok")
     }
 
     let keysToReset = []
@@ -64,13 +82,13 @@ function findNextForHref(doc, href) {
         let a = tr.querySelector("a")
         if (!a) continue
         if (foundIt) return a.href
-        else if (a.href == href) foundIt = true
+        else if (a.href === href) foundIt = true
     }
 }
 
 
 function openLink(ev) {
-    if (ev.button == 2) {
+    if (ev.button === 2) {
         // let right click through
         return true;
     }
@@ -78,8 +96,7 @@ function openLink(ev) {
     // capture other clicks
     ev.preventDefault()
     let href = ev.target.href
-    let newWindow = window.open(href)
-    newWindow
+    window.open(href)
 }
 
 
@@ -124,7 +141,7 @@ function onLoadTestCase() {
 
 
 function onLoad() {
-    if (window.location.protocol == "file") return
+    if (window.location.protocol === "file") return
 
     for (let elem of document.getElementsByClassName("script-hidden")) {
         elem.classList.remove("script-hidden")
diff --git a/tests/ui_tests/reporting/testreport.py b/tests/ui_tests/reporting/testreport.py
index bf359d2924..a883a3c7d7 100644
--- a/tests/ui_tests/reporting/testreport.py
+++ b/tests/ui_tests/reporting/testreport.py
@@ -1,47 +1,37 @@
-import hashlib
+from __future__ import annotations
+
 import shutil
 from collections import defaultdict
 from datetime import datetime
-from distutils.dir_util import copy_tree
 from pathlib import Path
-from typing import Dict, List, Set
 
 import dominate
 import dominate.tags as t
-from dominate.tags import a, div, h1, h2, hr, p, span, strong, table, th, tr
+from dominate.tags import a, div, h1, h2, hr, i, p, span, strong, table, td, th, tr
 from dominate.util import text
 
+from ..common import UI_TESTS_DIR, TestCase, TestResult
 from . import download, html
 
 HERE = Path(__file__).resolve().parent
-REPORTS_PATH = HERE / "reports" / "test"
-RECORDED_SCREENS_PATH = Path(__file__).resolve().parent.parent / "screens"
+REPORTS_PATH = UI_TESTS_DIR / "reports"
+TESTREPORT_PATH = REPORTS_PATH / "test"
+IMAGES_PATH = TESTREPORT_PATH / "images"
+SCREEN_TEXT_FILE = TESTREPORT_PATH / "screen_text.txt"
 
 STYLE = (HERE / "testreport.css").read_text()
 SCRIPT = (HERE / "testreport.js").read_text()
-SCREENSHOTS_WIDTH_PX_TO_DISPLAY = {
-    "T1": 128 * 2,  # original is 128px
-    "TT": 240,  # original is 240px
-    "TR": 128 * 2,  # original is 128px
-}
 
 # These two html files are referencing each other
 ALL_SCREENS = "all_screens.html"
 ALL_UNIQUE_SCREENS = "all_unique_screens.html"
 
-ACTUAL_HASHES: Dict[str, str] = {}
-
-
-def _image_width(test_name: str) -> int:
-    """Return the width of the image to display for the given test name.
-
-    Is model-specific. Model is at the beginning of each test-case.
-    """
-    return SCREENSHOTS_WIDTH_PX_TO_DISPLAY[test_name[:2]]
-
 
 def document(
-    title: str, actual_hash: str = None, index: bool = False
+    title: str,
+    actual_hash: str | None = None,
+    index: bool = False,
+    model: str | None = None,
 ) -> dominate.document:
     doc = dominate.document(title=title)
     style = t.style()
@@ -56,10 +46,13 @@ def document(
     if index:
         doc.body["data-index"] = True
 
+    if model:
+        doc.body["class"] = f"model-{model}"
+
     return doc
 
 
-def _header(test_name: str, expected_hash: str, actual_hash: str) -> None:
+def _header(test_name: str, expected_hash: str | None, actual_hash: str) -> None:
     h1(test_name)
     with div():
         if actual_hash == expected_hash:
@@ -67,28 +60,43 @@ def _header(test_name: str, expected_hash: str, actual_hash: str) -> None:
                 "This test succeeded on UI comparison.",
                 style="color: green; font-weight: bold;",
             )
+        elif expected_hash is None:
+            p(
+                "This test is new and has no expected hash.",
+                style="color: blue; font-weight: bold;",
+            )
         else:
             p(
                 "This test failed on UI comparison.",
                 style="color: red; font-weight: bold;",
             )
-        p("Expected: ", expected_hash)
+        p("Expected: ", expected_hash or "(new test case)")
         p("Actual: ", actual_hash)
     hr()
 
 
-def clear_dir() -> None:
+def setup(main_runner: bool) -> None:
     """Delete and create the reports dir to clear previous entries."""
-    shutil.rmtree(REPORTS_PATH, ignore_errors=True)
-    REPORTS_PATH.mkdir()
-    (REPORTS_PATH / "failed").mkdir()
-    (REPORTS_PATH / "passed").mkdir()
+    if main_runner:
+        shutil.rmtree(TESTREPORT_PATH, ignore_errors=True)
+        TESTREPORT_PATH.mkdir(parents=True)
+        (TESTREPORT_PATH / "failed").mkdir()
+        (TESTREPORT_PATH / "passed").mkdir()
+        (TESTREPORT_PATH / "new").mkdir()
+        IMAGES_PATH.mkdir(parents=True)
+
+    html.set_image_dir(IMAGES_PATH)
 
 
 def index() -> Path:
     """Generate index.html with all the test results - lists of failed and passed tests."""
-    passed_tests = list((REPORTS_PATH / "passed").iterdir())
-    failed_tests = list((REPORTS_PATH / "failed").iterdir())
+    passed_tests = list((TESTREPORT_PATH / "passed").iterdir())
+    failed_tests = list((TESTREPORT_PATH / "failed").iterdir())
+    new_tests = list((TESTREPORT_PATH / "new").iterdir())
+
+    actual_hashes = {
+        result.test.id: result.actual_hash for result in TestResult.recent_results()
+    }
 
     title = "UI Test report " + datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     doc = document(title=title, index=True)
@@ -120,157 +128,204 @@ def index() -> Path:
                     t.span("marked BAD", style="color: darkred")
                     t.button("clear", onclick="resetState('bad')")
 
-        html.report_links(failed_tests, REPORTS_PATH, ACTUAL_HASHES)
+        html.report_links(failed_tests, TESTREPORT_PATH, actual_hashes)
+
+        h2("New tests", style="color: blue;")
+        html.report_links(new_tests, TESTREPORT_PATH)
 
         h2("Passed", style="color: green;")
-        html.report_links(passed_tests, REPORTS_PATH)
+        html.report_links(passed_tests, TESTREPORT_PATH)
 
-    return html.write(REPORTS_PATH, doc, "index.html")
+    return html.write(TESTREPORT_PATH, doc, "index.html")
 
 
-def all_screens(test_case_dirs: List[Path]) -> Path:
+def all_screens() -> Path:
     """Generate an HTML file for all the screens from the current test run.
 
     Shows all test-cases at one place.
     """
-    title = "All test cases"
-    doc = dominate.document(title=title)
+    recent_results = list(TestResult.recent_results())
+    model = recent_results[0].test.model if recent_results else None
 
+    title = "All test cases"
+    doc = document(title=title, model=model)
     with doc:
         h1("All test cases")
         hr()
 
         count = 0
-        for test_case_dir in test_case_dirs:
-            test_case_name = test_case_dir.name
-            h2(test_case_name, id=test_case_name)
-            actual_dir = test_case_dir / "actual"
-            for png in sorted(actual_dir.rglob("*.png")):
+        result_count = 0
+        for result in recent_results:
+            result_count += 1
+            h2(result.test.id, id=result.test.id)
+            for image in result.images:
                 # Including link to each image to see where else it occurs.
-                png_hash = _img_hash(png)
-                with a(href=f"{ALL_UNIQUE_SCREENS}#{png_hash}"):
-                    html.image_raw(png, _image_width(test_case_name))
+                with a(href=f"{ALL_UNIQUE_SCREENS}#{image}"):
+                    html.image_link(image, TESTREPORT_PATH)
                 count += 1
 
-        h2(f"{count} screens from {len(test_case_dirs)} testcases.")
+        h2(f"{count} screens from {result_count} testcases.")
 
-    return html.write(REPORTS_PATH, doc, ALL_SCREENS)
+    return html.write(TESTREPORT_PATH, doc, ALL_SCREENS)
 
 
-def all_unique_screens(test_case_dirs: List[Path]) -> Path:
+def all_unique_screens() -> Path:
     """Generate an HTML file with all the unique screens from the current test run."""
-    title = "All unique screens"
-    doc = dominate.document(title=title)
+    recent_results = TestResult.recent_results()
+    result_count = 0
+    model = None
+    test_cases: dict[str, list[str]] = defaultdict(list)
+    for result in recent_results:
+        result_count += 1
+        model = result.test.model
+        for image in result.images:
+            test_cases[image].append(result.test.id)
 
+    test_case_pairs = sorted(test_cases.items(), key=lambda x: len(x[1]), reverse=True)
+
+    title = "All unique screens"
+    doc = document(title=title, model=model)
     with doc:
         h1("All unique screens")
         hr()
 
-        screen_hashes: Dict[str, List[Path]] = defaultdict(list)
-        hash_images: Dict[str, Path] = {}
-
-        # Adding all unique images onto the page
-        for test_case_dir in test_case_dirs:
-            actual_dir = test_case_dir / "actual"
-            for png in sorted(actual_dir.rglob("*.png")):
-                png_hash = _img_hash(png)
-                if png_hash not in screen_hashes:
-                    # Adding link to the appropriate hash, where other testcases
-                    # with the same hash (screen) are listed.
-                    with a(href=f"#{png_hash}"):
-                        with span(id=png_hash[:8]):
-                            html.image_raw(png, _image_width(test_case_dir.name))
-
-                screen_hashes[png_hash].append(test_case_dir)
-                hash_images[png_hash] = png
+        for hash, tests in test_case_pairs:
+            # Adding link to the appropriate hash, where other testcases
+            # with the same hash (screen) are listed.
+            with a(href=f"#{hash}"):
+                with span(id="l-" + hash):
+                    html.image_link(
+                        hash, TESTREPORT_PATH, title=f"{len(tests)} testcases)"
+                    )
 
         # Adding all screen hashes together with links to testcases having these screens.
-        for png_hash, test_cases in screen_hashes.items():
-            h2(png_hash)
-            with div(id=png_hash):
-                # Showing the exact image as well (not magnifying it)
-                with a(href=f"#{png_hash[:8]}"):
-                    html.image_raw(hash_images[png_hash])
-                for case in test_cases:
+        for hash, tests in test_case_pairs:
+            h2(hash)
+            with div(id=hash):
+                with a(href=f"#l-{hash}"):
+                    html.image_link(hash, TESTREPORT_PATH)
+                for case in tests:
                     # Adding link to each test-case
-                    with a(href=f"{ALL_SCREENS}#{case.name}"):
-                        p(case.name.split("/")[-1])
+                    with a(href=f"{ALL_SCREENS}#{case}"):
+                        p(case)
 
-        h2(f"{len(screen_hashes)} unique screens from {len(test_case_dirs)} testcases.")
+        h2(f"{len(test_case_pairs)} unique screens from {result_count} testcases.")
 
-    return html.write(REPORTS_PATH, doc, ALL_UNIQUE_SCREENS)
+    return html.write(TESTREPORT_PATH, doc, ALL_UNIQUE_SCREENS)
 
 
-def generate_reports() -> None:
+def screen_text_report() -> None:
+    """Generate a report with text representation of all screens."""
+    recent_results = list(TestResult.recent_results())
+
+    # Creating both a text file (suitable for offline usage)
+    # and an HTML file (suitable for online usage).
+
+    with open(SCREEN_TEXT_FILE, "w") as f2:
+        for result in recent_results:
+            if not result.test.screen_text_file.exists():
+                continue
+            f2.write(f"\n{result.test.id}\n")
+            with open(result.test.screen_text_file, "r") as f:
+                for line in f.readlines():
+                    f2.write(f"\t{line}")
+
+    doc = dominate.document(title="Screen text report")
+    with doc:
+        for result in recent_results:
+            if not result.test.screen_text_file.exists():
+                continue
+            with a(href=f"{ALL_SCREENS}#{result.test.id}"):
+                h2(result.test.id)
+            with open(result.test.screen_text_file, "r") as f:
+                for line in f.readlines():
+                    p(line)
+    html.write(TESTREPORT_PATH, doc, "screen_text.html")
+
+
+def differing_screens() -> None:
+    """Creating an HTML page showing all the unique screens that got changed."""
+    unique_diffs: set[tuple[str | None, str | None]] = set()
+
+    def already_included(left: str | None, right: str | None) -> bool:
+        return (left, right) in unique_diffs
+
+    def include(left: str | None, right: str | None) -> None:
+        unique_diffs.add((left, right))
+
+    # Only going through tests failed in UI comparison,
+    # there are no differing screens in UI-passed tests.
+    recent_ui_failures = list(TestResult.recent_ui_failures())
+
+    model = recent_ui_failures[0].test.model if recent_ui_failures else None
+    doc = document(title="Differing screens", model=model)
+    with doc:
+        with table(border=1, width=600):
+            with tr():
+                th("Expected")
+                th("Actual")
+                th("Testcase (link)")
+
+            for ui_failure in recent_ui_failures:
+                for recorded, actual in ui_failure.diff_lines():
+                    if recorded != actual and not already_included(recorded, actual):
+                        include(recorded, actual)
+                        with tr(bgcolor="red"):
+                            html.image_column(recorded, TESTREPORT_PATH)
+                            html.image_column(actual, TESTREPORT_PATH)
+                            with td():
+                                with a(href=f"failed/{ui_failure.test.id}.html"):
+                                    i(ui_failure.test.id)
+
+    html.write(TESTREPORT_PATH, doc, "differing_screens.html")
+
+
+def generate_reports(do_screen_text: bool = False) -> None:
     """Generate HTML reports for the test."""
+    html.set_image_dir(IMAGES_PATH)
     index()
-
-    # To only get screens from the last running test-cases,
-    # we need to get the list of all directories with screenshots.
-    current_testcases = _get_testcases_dirs()
-    all_screens(current_testcases)
-    all_unique_screens(current_testcases)
+    all_screens()
+    all_unique_screens()
+    if do_screen_text:
+        screen_text_report()
+    differing_screens()
 
 
-def _img_hash(img: Path) -> str:
-    """Return the hash of the image."""
-    content = img.read_bytes()
-    return hashlib.md5(content).hexdigest()
+def _copy_deduplicated(test: TestCase) -> None:
+    """Copy the actual screenshots to the deduplicated dir."""
+    html.store_images(*test.actual_screens)
+    html.store_images(*test.recorded_screens)
 
 
-def _get_testcases_dirs() -> List[Path]:
-    """Get the list of test-cases dirs that the current test was running."""
-    current_testcases = _get_all_current_testcases()
-    all_test_cases_dirs = [
-        case
-        for case in (RECORDED_SCREENS_PATH).iterdir()
-        if case.name in current_testcases
-    ]
-    return sorted(all_test_cases_dirs)
-
-
-def _get_all_current_testcases() -> Set[str]:
-    """Get names of all current test-cases.
-
-    Equals to the names of HTML files in the reports dir.
-    """
-    passed_tests = list((REPORTS_PATH / "passed").glob("*.html"))
-    failed_tests = list((REPORTS_PATH / "failed").glob("*.html"))
-    return {test.stem for test in (passed_tests + failed_tests)}
-
-
-def failed(
-    fixture_test_path: Path, test_name: str, actual_hash: str, expected_hash: str
-) -> Path:
+def failed(result: TestResult) -> Path:
     """Generate an HTML file for a failed test-case.
 
     Compares the actual screenshots to the expected ones.
     """
-    ACTUAL_HASHES[test_name] = actual_hash
-
-    doc = document(title=test_name, actual_hash=actual_hash)
-    recorded_path = fixture_test_path / "recorded"
-    actual_path = fixture_test_path / "actual"
-
     download_failed = False
 
-    if not recorded_path.exists():
-        recorded_path.mkdir()
-    try:
-        download.fetch_recorded(expected_hash, recorded_path)
-    except Exception:
-        download_failed = True
+    if not result.test.recorded_dir.exists():
+        result.test.recorded_dir.mkdir()
 
-    recorded_screens = sorted(recorded_path.iterdir())
-    actual_screens = sorted(actual_path.iterdir())
+    if result.expected_hash:
+        try:
+            download.fetch_recorded(result.expected_hash, result.test.recorded_dir)
+        except Exception:
+            download_failed = True
 
+    _copy_deduplicated(result.test)
+
+    doc = document(
+        title=result.test.id, actual_hash=result.actual_hash, model=result.test.model
+    )
     with doc:
-        _header(test_name, expected_hash, actual_hash)
+        _header(result.test.id, result.expected_hash, result.actual_hash)
 
         with div(id="markbox", _class="script-hidden"):
             p("Click a button to mark the test result as:")
             with div(id="buttons"):
                 t.button("OK", id="mark-ok", onclick="markState('ok')")
+                t.button("OK & UPDATE", id="mark-update", onclick="markState('update')")
                 t.button("BAD", id="mark-bad", onclick="markState('bad')")
 
         if download_failed:
@@ -283,39 +338,39 @@ def failed(
                 th("Expected")
                 th("Actual")
 
-            html.diff_table(
-                recorded_screens,
-                actual_screens,
-                _image_width(test_name),
-            )
+            html.diff_table(result.diff_lines(), TESTREPORT_PATH / "failed")
 
-    return html.write(REPORTS_PATH / "failed", doc, test_name + ".html")
+    return html.write(TESTREPORT_PATH / "failed", doc, result.test.id + ".html")
 
 
-def passed(fixture_test_path: Path, test_name: str, actual_hash: str) -> Path:
+def passed(result: TestResult) -> Path:
     """Generate an HTML file for a passed test-case."""
-    copy_tree(str(fixture_test_path / "actual"), str(fixture_test_path / "recorded"))
-
-    return recorded(fixture_test_path / "actual", test_name, actual_hash)
+    return recorded(result, header="Passed")
 
 
-def recorded(fixture_test_path: Path, test_name: str, actual_hash: str) -> Path:
+def missing(result: TestResult) -> Path:
+    """Generate an HTML file for a newly seen test-case."""
+    return recorded(result, header="New testcase", dir="new")
+
+
+def recorded(result: TestResult, header: str = "Recorded", dir: str = "passed") -> Path:
     """Generate an HTML file for a passed test-case.
 
     Shows all the screens from it in exact order.
     """
-    doc = document(title=test_name)
-    actual_screens = sorted(fixture_test_path.iterdir())
+    _copy_deduplicated(result.test)
+
+    doc = document(title=result.test.id, model=result.test.model)
 
     with doc:
-        _header(test_name, actual_hash, actual_hash)
+        _header(result.test.id, result.actual_hash, result.actual_hash)
 
         with table(border=1):
             with tr():
-                th("Recorded")
+                th(header)
 
-            for screen in actual_screens:
+            for screen in result.images:
                 with tr():
-                    html.image_column(screen, _image_width(test_name))
+                    html.image_column(screen, TESTREPORT_PATH / dir)
 
-    return html.write(REPORTS_PATH / "passed", doc, test_name + ".html")
+    return html.write(TESTREPORT_PATH / dir, doc, result.test.id + ".html")
diff --git a/tests/ui_tests/reporting/reports/.keep b/tests/ui_tests/reports/.keep
similarity index 100%
rename from tests/ui_tests/reporting/reports/.keep
rename to tests/ui_tests/reports/.keep
diff --git a/tests/update_fixtures.py b/tests/update_fixtures.py
new file mode 100755
index 0000000000..2632a49b7b
--- /dev/null
+++ b/tests/update_fixtures.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+import click
+
+from ui_tests import update_fixtures
+
+
+@click.command()
+@click.option("-r", "--remove-missing", is_flag=True, help="Remove missing tests")
+def main(remove_missing: bool) -> None:
+    """Update fixtures file with results from latest test run."""
+    changes_amount = update_fixtures(remove_missing)
+    print(f"Updated fixtures.json with data from {changes_amount} tests.")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/check-bitcoin-only b/tools/check-bitcoin-only
index 110b58fd02..ffaa9bc35e 100755
--- a/tools/check-bitcoin-only
+++ b/tools/check-bitcoin-only
@@ -1,7 +1,7 @@
 #!/bin/sh
 RETURN=0
 
-EXCEPTIONS="decred|omni|ripple|dash|TEXT_MARGIN_LEFT|dash_width|dashlane|flo|mnemonic|meter|refuse|fused|enemy|cinema|syntaxerror|mix|palm|UdesRsK|kcc|derive_cardano|ntity|gather|bmc|cloudflare|rsk7"
+EXCEPTIONS="decred|omni|ripple|dash|TEXT_MARGIN_LEFT|dash_width|dashlane|flo|mnemonic|meter|refuse|fused|enemy|cinema|syntaxerror|mix|palm|UdesRsK|kcc|derive_cardano|ntity|gather|bmc|cloudflare|rsk7|map|oho|mas|uniq|numbers|aves"
 
 # dump all coins except the first 3 (Bitcoin, Testnet, Regtest)
 ALTCOINS=$(./common/tools/cointool.py dump -l -p -t -d trezor1 -d trezor2 | grep '"name"' | cut -d '"' -f 4 | tail -n +4)